From f34fe134a52a9dcb46053518fc1d8c1ef486b7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 3 Jul 2024 19:19:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/artificer/service/impl/OrdersServiceImpl.java | 2 +- .../bl/order/service/impl/UserPackageOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 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 90ff12c..9220d00 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 @@ -5067,7 +5067,7 @@ public class OrdersServiceImpl extends ServiceImpl implements //修改订单下所有加钟的状态为待评价 UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("parent_id", orders.getOrdersId()); - updateWrapper.notIn("status", "1,4"); + updateWrapper.notIn("status", 1,4); Orders orders2 = new Orders(); orders2.setStatus(3); baseMapper.update(orders2,updateWrapper); diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java index af6d2b3..cc92bfa 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageOrderServiceImpl.java @@ -171,7 +171,7 @@ public class UserPackageOrderServiceImpl extends ServiceImpl CouponUserList = Lists.newArrayList(); String couponIds = userPackageOrder.getCouponId(); - if(couponIds.length()>0){ + if(couponIds!=null && couponIds.length()>0){ if(canCouponMoney.compareTo(BigDecimal.ZERO)==0){ return Result.error("此次购买的服务不支持优惠券！"); }