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("此次购买的服务不支持优惠券!"); }