diff --git a/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java b/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java index bf135899..aa7ae559 100644 --- a/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java +++ b/hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java @@ -55,7 +55,6 @@ public class SynchronizeCNPC { String token = data.getString("token"); Calendar instance = Calendar.getInstance(); - instance.add(Calendar.DATE, 1); instance.add(Calendar.MINUTE, -10); Map bodyMap = new HashMap<>(); diff --git a/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java index b3c43317..647c5f84 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java @@ -135,19 +135,18 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService { map.put("status", "1"); map.put("couponCodeId", code.getId()); List list = highUserCouponService.getUserCouponList(map); - for (HighUserCoupon userCoupon : list) { - userCoupon.setStatus(2); - userCoupon.setConsumeTime(useTime); - - HighChildOrder order = highOrderService.getChildOrderByUserGoods(userCoupon.getUserId(), 1, userCoupon.getCouponId()); - if (order == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); + if (list.size() > 0) { + for (HighUserCoupon userCoupon : list) { + HighChildOrder order = highOrderService.getChildOrderByUserGoods(userCoupon.getUserId(), 1, userCoupon.getCouponId()); + if (order == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); + } + userCoupon.setConsumeTime(useTime); + userCoupon.setStatus(2); // 状态 0:已过期 1:未使用 2:已使用 + highUserCouponService.updateUserCoupon(userCoupon); + + highOrderService.childOrderComplete(order.getId()); } - userCoupon.setConsumeTime(new Date()); - userCoupon.setStatus(2); // 状态 0:已过期 1:未使用 2:已使用 - highUserCouponService.updateUserCoupon(userCoupon); - - highOrderService.childOrderComplete(order.getId()); } } }