From 8e1bf81d55d7192db7b657fa8a2455cbc7e8185d Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 12 Jul 2024 17:31:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/service/impl/OrdersServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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<OrdersDao, Orders> implements
         List<CouponUser> 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<OrdersDao, Orders> implements
                     //获取原优惠券
                     List<String> 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<OrdersDao, Orders> implements
                     //获取并判断代金券信息
                     List<CouponUser> 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<OrdersDao, Orders> 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后点击完成！");
                 }
             }
             //修改技师销量