'提交diam'

dev-discount
199901012 4 years ago
parent dbace0790d
commit eca508b130
  1. 1
      hai-schedule/src/main/java/com/hai/schedule/SynchronizeCNPC.java
  2. 7
      hai-service/src/main/java/com/hai/service/impl/HighCouponCodeServiceImpl.java

@ -55,7 +55,6 @@ public class SynchronizeCNPC {
String token = data.getString("token"); String token = data.getString("token");
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.add(Calendar.DATE, 1);
instance.add(Calendar.MINUTE, -10); instance.add(Calendar.MINUTE, -10);
Map<String,Object> bodyMap = new HashMap<>(); Map<String,Object> bodyMap = new HashMap<>();

@ -135,15 +135,13 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService {
map.put("status", "1"); map.put("status", "1");
map.put("couponCodeId", code.getId()); map.put("couponCodeId", code.getId());
List<HighUserCoupon> list = highUserCouponService.getUserCouponList(map); List<HighUserCoupon> list = highUserCouponService.getUserCouponList(map);
if (list.size() > 0) {
for (HighUserCoupon userCoupon : list) { for (HighUserCoupon userCoupon : list) {
userCoupon.setStatus(2);
userCoupon.setConsumeTime(useTime);
HighChildOrder order = highOrderService.getChildOrderByUserGoods(userCoupon.getUserId(), 1, userCoupon.getCouponId()); HighChildOrder order = highOrderService.getChildOrderByUserGoods(userCoupon.getUserId(), 1, userCoupon.getCouponId());
if (order == null) { if (order == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到订单");
} }
userCoupon.setConsumeTime(new Date()); userCoupon.setConsumeTime(useTime);
userCoupon.setStatus(2); // 状态 0:已过期 1:未使用 2:已使用 userCoupon.setStatus(2); // 状态 0:已过期 1:未使用 2:已使用
highUserCouponService.updateUserCoupon(userCoupon); highUserCouponService.updateUserCoupon(userCoupon);
@ -151,6 +149,7 @@ public class HighCouponCodeServiceImpl implements HighCouponCodeService {
} }
} }
} }
}
@Override @Override
public HighCouponCode getCouponCodeByOrderId(Long childOrderId) { public HighCouponCode getCouponCodeByOrderId(Long childOrderId) {

Loading…
Cancel
Save