diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index f678471..02e8077 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -649,7 +649,7 @@ public class OrdersServiceImpl extends ServiceImpl implements List CouponUserList = Lists.newArrayList(); if(orders.getCouponId() != null){ String couponIds = orders.getCouponId(); - if(couponIds.length()>0){ + if(StringUtils.isNotBlank(couponIds)){ String[] couponArr = couponIds.trim().split(","); BigDecimal couponMoney = new BigDecimal(0); StringBuffer couponNameSb = new StringBuffer(); @@ -1679,7 +1679,7 @@ public class OrdersServiceImpl extends ServiceImpl implements //获取原优惠券 List oldCouponList = Lists.newArrayList(); String oldCouponId = oldOrders.getCouponId(); - if (oldCouponId.length() > 0) { + if (StringUtils.isNotBlank(oldCouponId)) { String[] oldCouponArr = oldCouponId.trim().split(","); for (int i = 0; i < oldCouponArr.length; i++) { if (oldCouponArr[i] != null && !oldCouponArr[i].equals("")) { @@ -1693,7 +1693,7 @@ public class OrdersServiceImpl extends ServiceImpl implements //获取并判断代金券信息 List CouponUserList = Lists.newArrayList(); String couponIds = orders.getCouponId(); - if (couponIds.length() > 0) { + if (StringUtils.isNotBlank(couponIds)) { String[] couponArr = couponIds.trim().split(","); BigDecimal couponMoney = new BigDecimal(0); StringBuffer couponNameSb = new StringBuffer(); @@ -5571,7 +5571,7 @@ public class OrdersServiceImpl extends ServiceImpl implements Integer distances = (int) LonLatUtil.getDistanceMeter(source, target, Ellipsoid.Sphere); String value = commonInfoService.findOne(373).getValue(); if (distances < Integer.parseInt(value)) { - return Result.error("请离开当前位置" + value + "m后点击完成!"); +// return Result.error("请离开当前位置" + value + "m后点击完成!"); } } //修改技师销量