diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 07e5e5980..44356b74c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -377,7 +377,7 @@ public class WxCouponController extends BaseController { logger.error("有效期错误1"); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); } - } else { + } else if(wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ if (wxCoupon.getValidDays() == null) { logger.error("有效期错误2"); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); @@ -389,6 +389,10 @@ public class WxCouponController extends BaseController { logger.error("券库存有效期不支持停车券"); return new ResultData(ErrorCode.COUPON_STOCK_DATE_NO_CAR); } + if (wxCoupon.getType().equals(EnumCouponType.COUPON_GIFT.getCode())) { + logger.error("券库存有效期不支持礼包券"); + return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); + } wxCoupon.updateTenantInfo(getTenantInfo()); WxCoupon coupon = wxCouponService.findById(wxCoupon); @@ -398,6 +402,9 @@ public class WxCouponController extends BaseController { if(EnumCouponSendType.GIFT.getCode().equals(coupon.getSendType())){ return new ResultData(ErrorCode.COUPON_GIFT_NOTUPD_INVENTORY); } +// if(EnumCouponValidType.FOREVER.getCode().equals(coupon.getValidType())){ +// return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); +// } if ((wxCoupon.getValidEndDate() != null && coupon.getValidEndDate() != null && DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate())) && wxCoupon.getInventory().equals(coupon.getInventory())) || diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java index 6b2c77c38..2a6b4ddba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java @@ -7,7 +7,6 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponSendConfig; import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumValidStatus; import com.iformall.service.WxCouponSendConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023042700002_wx_coupon_gift_goods.sql b/mallinkAdmin/src/main/resources/db/migration/V2023042700002_wx_coupon_gift_goods.sql index d75977afb..f99e0f9b3 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023042700002_wx_coupon_gift_goods.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023042700002_wx_coupon_gift_goods.sql @@ -102,110 +102,6 @@ UPDATE `mallink`.`wx_coupon_99` set `sold_start_time` = `valid_start_date`, `sol -UPDATE `mallink`.`wx_coupon_0` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_1` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_2` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_3` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_4` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_5` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_6` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_7` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_8` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_9` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_10` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_11` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_12` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_13` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_14` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_15` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_16` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_17` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_18` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_19` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_20` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_21` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_22` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_23` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_24` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_25` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_26` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_27` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_28` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_29` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_30` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_31` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_32` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_33` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_34` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_35` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_36` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_37` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_38` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_39` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_40` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_41` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_42` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_43` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_44` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_45` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_46` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_47` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_48` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_49` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_50` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_51` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_52` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_53` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_54` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_55` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_56` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_57` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_58` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_59` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_60` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_61` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_62` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_63` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_64` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_65` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_66` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_67` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_68` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_69` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_70` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_71` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_72` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_73` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_74` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_75` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_76` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_77` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_78` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_79` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_80` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_81` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_82` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_83` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_84` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_85` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_86` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_87` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_88` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_89` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_90` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_91` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_92` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_93` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_94` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_95` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_96` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_97` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_98` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`wx_coupon_99` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; - - - - UPDATE `mallink`.`wx_coupon_0` set `sold_start_time` = `valid_start_date`, `sold_end_time` = `valid_end_date` where `type` = 11; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023042700004_wx_order_snapshot_gift_goods.sql b/mallinkAdmin/src/main/resources/db/migration/V2023042700004_wx_order_snapshot_gift_goods.sql index 20d722ece..8dae22026 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023042700004_wx_order_snapshot_gift_goods.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023042700004_wx_order_snapshot_gift_goods.sql @@ -102,110 +102,6 @@ UPDATE `mallink`.`order_snapshot_99` set `sold_start_time` = `valid_start_date`, -UPDATE `mallink`.`order_snapshot_0` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_1` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_2` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_3` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_4` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_5` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_6` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_7` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_8` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_9` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_10` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_11` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_12` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_13` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_14` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_15` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_16` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_17` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_18` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_19` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_20` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_21` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_22` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_23` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_24` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_25` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_26` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_27` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_28` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_29` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_30` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_31` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_32` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_33` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_34` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_35` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_36` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_37` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_38` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_39` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_40` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_41` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_42` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_43` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_44` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_45` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_46` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_47` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_48` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_49` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_50` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_51` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_52` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_53` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_54` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_55` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_56` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_57` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_58` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_59` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_60` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_61` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_62` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_63` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_64` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_65` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_66` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_67` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_68` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_69` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_70` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_71` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_72` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_73` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_74` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_75` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_76` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_77` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_78` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_79` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_80` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_81` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_82` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_83` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_84` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_85` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_86` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_87` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_88` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_89` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_90` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_91` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_92` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_93` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_94` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_95` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_96` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_97` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_98` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; -UPDATE `mallink`.`order_snapshot_99` set `valid_start_date` = null, `valid_end_date` = null where `type` = 12; - - - - UPDATE `mallink`.`order_snapshot_0` set `sold_start_time` = `valid_start_date`, `sold_end_time` = `valid_end_date` where `type` = 11; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023042700005_wx_coupon_order_expired_time.sql b/mallinkAdmin/src/main/resources/db/migration/V2023042700005_wx_coupon_order_expired_time.sql new file mode 100644 index 000000000..08f64b427 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023042700005_wx_coupon_order_expired_time.sql @@ -0,0 +1,200 @@ +ALTER TABLE `mallink`.`wx_coupon_order_0` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_1` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_2` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_3` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_4` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_5` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_6` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_7` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_8` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_9` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_10` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_11` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_12` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_13` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_14` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_15` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_16` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_17` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_18` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_19` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_20` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_21` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_22` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_23` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_24` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_25` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_26` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_27` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_28` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_29` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_30` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_31` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_32` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_33` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_34` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_35` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_36` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_37` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_38` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_39` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_40` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_41` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_42` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_43` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_44` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_45` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_46` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_47` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_48` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_49` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_50` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_51` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_52` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_53` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_54` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_55` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_56` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_57` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_58` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_59` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_60` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_61` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_62` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_63` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_64` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_65` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_66` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_67` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_68` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_69` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_70` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_71` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_72` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_73` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_74` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_75` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_76` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_77` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_78` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_79` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_80` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_81` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_82` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_83` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_84` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_85` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_86` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_87` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_88` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_89` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_90` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_91` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_92` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_93` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_94` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_95` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_96` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_97` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_98` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; +ALTER TABLE `mallink`.`wx_coupon_order_99` +MODIFY COLUMN `expired_time` datetime(0) COMMENT '该订单对应券的实际过期时间' AFTER `order_id`; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 17c55bf18..d0c973127 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -324,7 +324,7 @@ public class WxCouponController extends BaseController { logger.error("有效期错误1"); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); } - } else { + } else if(wxCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ if (wxCoupon.getValidDays() == null) { logger.error("有效期错误2"); return new ResultData(ErrorCode.COUPON_VALID_DATE_ERR); @@ -335,30 +335,47 @@ public class WxCouponController extends BaseController { logger.error("券库存有效期不支持停车券"); return new ResultData(ErrorCode.COUPON_STOCK_DATE_NO_CAR); } + if (wxCoupon.getType().equals(EnumCouponType.COUPON_GIFT.getCode())) { + logger.error("券库存有效期不支持礼包券"); + return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); + } wxCoupon.updateTenantInfo(getTenantInfo()); WxCoupon coupon = wxCouponService.findById(wxCoupon); - if (coupon != null) { - if ((wxCoupon.getValidEndDate() != null && coupon.getValidEndDate() != null && DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate())) - && wxCoupon.getInventory().equals(coupon.getInventory())) - || - (wxCoupon.getValidDays() != null && coupon.getValidDays() != null && wxCoupon.getInventory().equals(coupon.getInventory()) && - wxCoupon.getValidDays().equals(coupon.getValidDays())) - ) { - return new ResultData(ErrorCode.COUPON_STOCK_VALID_DATE_SETTING_ERR); - } + if (coupon == null) { + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + } + if(EnumCouponSendType.GIFT.getCode().equals(coupon.getSendType())){ + return new ResultData(ErrorCode.COUPON_GIFT_NOTUPD_INVENTORY); + } +// if(EnumCouponValidType.FOREVER.getCode().equals(coupon.getValidType())){ +// return new ResultData(ErrorCode.COUPON_VALID_NOT_SUPPORTED); +// } + if ((wxCoupon.getValidEndDate() != null && coupon.getValidEndDate() != null && DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate())) + && wxCoupon.getInventory().equals(coupon.getInventory())) + || + (wxCoupon.getValidDays() != null && coupon.getValidDays() != null && wxCoupon.getInventory().equals(coupon.getInventory()) && + wxCoupon.getValidDays().equals(coupon.getValidDays())) + ) { + return new ResultData(ErrorCode.COUPON_STOCK_VALID_DATE_SETTING_ERR); + } - if (wxCoupon.getValidEndDate() != null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())) { - return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); - } - if (wxCoupon.getInventory() != null && wxCoupon.getInventory().intValue() < coupon.getInventory().intValue()) { - return new ResultData(ErrorCode.COUPON_STOCK_INV_ERR); - } + if (wxCoupon.getValidEndDate() != null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())) { + return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); + } + if (wxCoupon.getInventory() != null && wxCoupon.getInventory().intValue() < coupon.getInventory().intValue()) { + return new ResultData(ErrorCode.COUPON_STOCK_INV_ERR); + } - if (wxCoupon.getValidDays() != null && coupon.getValidDays() != null && wxCoupon.getValidDays().intValue() < coupon.getValidDays().intValue()) { - return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); - } + if (wxCoupon.getValidDays() != null && coupon.getValidDays() != null && wxCoupon.getValidDays().intValue() < coupon.getValidDays().intValue()) { + return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); + } + wxCoupon.setSalePrice(coupon.getSalePrice()); + if(!wxCouponService.validCouponDate(wxCoupon)) { + return new ResultData(ResultData.ERROR,"券有效结束日期必须在30天以内。"); } + wxCoupon.setSalePrice(null); + redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); ResultData result = wxCouponService.updateCouponStockAndEndTime(wxCoupon); CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 453f9e290..131fe8d1e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -365,7 +365,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); } - } else { + } else if(wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ if (wxCouponOrderCVo.getExpiredTime().before(now)) { logger.error("此券已过期:" + couponOrderIdStr); return new ResultData(ErrorCode.COUPON_IS_EXPIRED); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index f7f4c9ba2..04a549592 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -524,7 +524,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); } - } else { + } else if(wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ if (wxCouponOrderCVo.getExpiredTime().before(now)) { logger.error("此券已过期:" + couponOrderIdStr); return new ResultData(ErrorCode.COUPON_IS_EXPIRED); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java index ed389e20c..4ea34a3a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/OrderSnapshot.java @@ -11,7 +11,6 @@ import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.douyin.web.bean.GoodsTemplateGet; import com.iformall.enums.EnumCouponType; -import com.iformall.enums.EnumValidStatus; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import lombok.Data; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 7afa44620..126d53af5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -8,8 +8,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.douyin.web.bean.GoodsTemplateGet; import com.iformall.enums.EnumCouponType; -import com.iformall.enums.EnumValidStatus; -import com.iformall.utils.Constant; +import com.iformall.enums.EnumCouponValidType; import com.iformall.utils.DateUtils; import cn.afterturn.easypoi.excel.annotation.Excel; @@ -505,12 +504,14 @@ public class WxCoupon extends TenantEntity { public Date getOuterRealValidDate(Date curr) { Date valid_date = null; - if (this.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode())) { + if (this.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { valid_date = this.getValidEndDate(); - } else { + } else if (this.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())) { int limit_days = this.getValidDays(); valid_date = DateUtils.getTimeAfterDays(limit_days, curr); - } + } else { + //永久有效 + } return valid_date; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java index 7f7688a75..d62501caa 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponValidType.java @@ -6,7 +6,7 @@ package com.iformall.enums; public enum EnumCouponValidType { // 1-时间范围 ;2-领取后时长; - + FOREVER(0, "永久有效"), BETWEEN_TWO_TIME(1, "时间范围"), DAYS_AFTER_RECEIVING(2, "领取后天数"), ; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumValidStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumValidStatus.java deleted file mode 100644 index c0dd4c12a..000000000 --- a/mallinkService/src/main/java/com/iformall/enums/EnumValidStatus.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.iformall.enums; - -/** - * Created by Stormeye on 2018/08/09. - */ -public enum EnumValidStatus { - - // 1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days) - - VALID_RANGE(1, "时间范围"), - VALID_DAYS(2, "领取后几日有效") - ; - - public static EnumValidStatus getEnum(Integer code) { - for (EnumValidStatus value : values()) { - if (value.getCode().equals(code)) { - return value; - } - } - return null; - } - - private Integer code; - private String message; - - EnumValidStatus(Integer code, String message) { - this.code = code; - this.message = message; - } - - public Integer getCode() { - return code; - } - - public String getMessage() { - return message; - } -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 581a19e47..81c6987de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -639,6 +639,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return vo; } } + if(EnumCouponValidType.BETWEEN_TWO_TIME.getCode().equals(wxCoupon.getValidType())){ + if(endTime != null && endTime.after(wxCoupon.getValidEndDate())){ + vo.toCouponChannnelVo(null,channelId); + vo.setErrorMsg("活动结束时间不得晚于有效期结束时间"); + return vo; + } + } if(null != channelPrice) { if (wxCoupon.getSalePrice() <= 0 && channelPrice > 0) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index d67a09ed7..26070886a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1577,7 +1577,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); } - } else { + } else if(wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ if (wxCouponOrderCVo.getExpiredTime().before(now)) { throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED); } @@ -2656,10 +2656,20 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } // 4 券已过期 - if (couponOrderCVo.getExpiredTime().before(curDate)) { - logger.error("此券已过期:" + couponOrderCVo.getId()); - throw new MallinkException(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); - } + if (couponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())){ +// && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { + if (couponOrderCVo.getValidStartDate().after(curDate)) { + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); + } + if (couponOrderCVo.getValidEndDate().before(curDate)) { + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); + } + + } else if(couponOrderCVo.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ + if (couponOrderCVo.getExpiredTime().before(curDate)) { + throw new MallinkException(ErrorCode.COUPON_IS_EXPIRED); + } + } // 6. 生成优惠券抵扣信息 retObj.put(WxPayConstant.COUPON_ID, couponOrderCVo.getId().toString()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index eaa963992..f948a409e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -530,16 +530,41 @@ public class WxCouponServiceImpl implements WxCouponService { record.setCoverPicture(JSONArray.toJSONString(strList)); } } + //可配送商品永久有效 + if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(record.getType())){ + record.setValidDays(EnumCouponValidType.FOREVER.getCode()); + } + //券礼包有效期=售卖时间 + if(EnumCouponType.COUPON_GIFT.getCode().equals(record.getType())){ + record.setValidDays(EnumCouponValidType.BETWEEN_TWO_TIME.getCode()); + record.setValidStartDate(record.getSoldStartTime()); + record.setValidEndDate(record.getSoldEndTime()); + } if (record.getValidType() != null) { - if (record.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())) { + if (record.getValidType().equals(EnumCouponValidType.FOREVER.getCode())){ + record.setValidStartDate(null); + record.setValidEndDate(null); + record.setValidDays(null); + }else if( record.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())) { record.setValidStartDate(null); record.setValidEndDate(null); } else if (record.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { record.setValidDays(null); + + if(record.getSoldStartTime() != null && record.getSoldEndTime() != null){ + if(record.getValidStartDate().before(record.getSoldStartTime())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "有效时间需在售卖期之后"); + } + if(record.getValidEndDate().before(record.getSoldEndTime())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "有效时间需在售卖期之后"); + } + } + } else { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "请填写有效时间类型"); } + if(!this.validCouponDate(record)) { return new ResultData(ResultData.ERROR,"券有效结束日期必须在售卖30天以内。"); } @@ -1335,7 +1360,7 @@ public class WxCouponServiceImpl implements WxCouponService { if(!wxCoupon.getValidEndDate().equals(oldCoupon.getValidEndDate())) { bChanged = true; } - } else { + } else if(oldCoupon.getValidType().equals(EnumCouponValidType.DAYS_AFTER_RECEIVING.getCode())){ if(wxCoupon.getValidDays()