解决冲突

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.set(Calendar.DATE, 1);
                 instance.add(Calendar.MINUTE, -10);
 
                 Map<String,Object> bodyMap = new HashMap<>();

hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java

@@ -144,6 +144,7 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService {
                     userCoupon.setConsumeTime(useTime);
                     userCoupon.setStatus(2);  // 状态  0:已过期  1：未使用  2：已使用
                     highUserCouponService.updateUserCoupon(userCoupon);
+
                     highOrderService.childOrderComplete(order.getId());
                 }
             }