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 7f5485c41..d42a7738f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -76,6 +76,16 @@ public class WxCouponController extends BaseController { if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); } + if(wxCoupon.getTargetAd() != null && wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()){ + Integer[] typeArray = { + EnumCouponType.COUPON_MANJIAN.getCode(), + EnumCouponType.COUPON_DAIJIN.getCode(), + EnumCouponType.COUPON_LIPIN.getCode(), + EnumCouponType.COUPON_TINGCHE.getCode(), + EnumCouponType.COUPON_MULTIMCH.getCode()}; + + wxCoupon.setTypes(Arrays.asList(typeArray)); + } return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } @@ -96,7 +106,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_LIPIN.getCode(), EnumCouponType.COUPON_TINGCHE.getCode(), EnumCouponType.COUPON_MULTIMCH.getCode(), - EnumCouponType.COUPON_PRESS.getCode()}; + EnumCouponType.COUPON_PRESS.getCode(), + EnumCouponType.COUPON_PREORDER.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ diff --git a/mallinkAdmin/src/main/resources/db/migration/V202011300001__commodityPresell.sql b/mallinkAdmin/src/main/resources/db/migration/V202011300001__commodityPresell.sql index 842b922bd..38d7986b0 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202011300001__commodityPresell.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202011300001__commodityPresell.sql @@ -17,602 +17,602 @@ where mui.is_admin = 1 and mur.role_id is not null GROUP BY mur.role_id; ALTER TABLE `wx_coupon_0` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_1` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_2` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_3` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_4` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_5` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_6` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_7` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_8` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_9` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_10` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_11` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_12` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_13` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_14` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_15` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_16` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_17` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_18` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_19` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_20` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_21` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_22` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_23` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_24` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_25` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_26` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_27` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_28` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_29` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_30` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_31` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_32` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_33` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_34` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_35` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_36` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_37` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_38` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_39` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_40` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_41` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_42` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_43` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_44` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_45` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_46` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_47` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_48` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_49` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_50` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_51` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_52` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_53` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_54` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_55` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_56` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_57` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_58` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_59` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_60` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_61` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_62` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_63` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_64` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_65` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_66` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_67` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_68` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_69` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_70` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_71` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_72` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_73` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_74` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_75` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_76` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_77` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_78` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_79` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_80` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_81` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_82` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_83` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_84` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_85` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_86` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_87` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_88` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_89` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_90` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_91` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_92` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_93` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_94` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_95` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_96` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_97` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_98` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; ALTER TABLE `wx_coupon_99` -ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型9)' AFTER `price`, -ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型9)' AFTER `tail_price`, +ADD COLUMN `tail_price` int(11) COMMENT '尾款(适用于类型10)' AFTER `price`, +ADD COLUMN `orig_price` int(11) COMMENT '原价(适用于类型10)' AFTER `tail_price`, ADD COLUMN `pick_start_date` datetime(0) COMMENT '提货日期-开始' AFTER `valid_days`, ADD COLUMN `pick_end_date` datetime(0) COMMENT '提货日期-结束' AFTER `pick_start_date`; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 786ab95ea..7a76ad2f0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -93,7 +93,8 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_LIPIN.getCode(), EnumCouponType.COUPON_TINGCHE.getCode(), EnumCouponType.COUPON_MULTIMCH.getCode(), - EnumCouponType.COUPON_PRESS.getCode()}; + EnumCouponType.COUPON_PRESS.getCode(), + EnumCouponType.COUPON_PREORDER.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 6814bde71..a209a94cd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponOrderCVo; +import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; import com.iformall.enums.EnumCreditLockedStatus; import com.iformall.exception.MallinkException; @@ -257,15 +258,28 @@ public class WxCouponOrderController extends BaseController { } Date now = new Date(); - if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { - if (wxCouponOrderCVo.getValidStartDate().after(now)) { - logger.error("此券有效期未开始:" + couponOrderIdStr); - return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); - } - if (wxCouponOrderCVo.getValidEndDate().before(now)) { - logger.error("此券有效期已结束:" + couponOrderIdStr); - return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); + if (wxCouponOrderCVo.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())){ +// && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { + if(wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){ + if (wxCouponOrderCVo.getPickStartDate().after(now)) { + logger.error("此券有效期未开始:" + couponOrderIdStr); + return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); + } + if (wxCouponOrderCVo.getPickEndDate().before(now)) { + logger.error("此券有效期已结束:" + couponOrderIdStr); + return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); + } + }else{ + if (wxCouponOrderCVo.getValidStartDate().after(now)) { + logger.error("此券有效期未开始:" + couponOrderIdStr); + return new ResultData(ErrorCode.COUPON_ORDER_IS_EARLIER_THAN_VALIDDATE); + } + if (wxCouponOrderCVo.getValidEndDate().before(now)) { + logger.error("此券有效期已结束:" + couponOrderIdStr); + return new ResultData(ErrorCode.COUPON_ORDER_IS_LATER_THAN_VALIDDATE); + } } + } else { if (wxCouponOrderCVo.getExpiredTime().before(now)) { logger.error("此券已过期:" + couponOrderIdStr); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 8ee5d3ed1..a88626ce3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import com.iformall.enums.EnumCouponType; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -244,8 +245,9 @@ public class WxCouponController extends BaseController { } private void updateActivityStatus(WxCouponCVo wxCouponCVo) { - if (wxCouponCVo.getTargetAd() != null && - wxCouponCVo.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) { + if (wxCouponCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) || + (wxCouponCVo.getTargetAd() != null && wxCouponCVo.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) + ) { Date now = new Date(); if (wxCouponCVo.getBeginTime().getTime() > now.getTime()) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 892772140..a1a6b54cb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -17,6 +17,7 @@ import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.enums.EnumCouponChannelActivityStatus; import com.iformall.enums.EnumCouponOrderStatus; import com.iformall.enums.EnumCouponOrderValidStatus; +import com.iformall.enums.EnumCouponType; import com.iformall.service.MemCouponFromDspService; import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxCouponService; @@ -155,6 +156,10 @@ public class WxCouponOrderController extends BaseController { wxCouponOrderCVo.setSalePrice(wxCouponCVo.getSalePrice()); wxCouponOrderCVo.setUsePrice(wxCouponCVo.getUsePrice()); wxCouponOrderCVo.setPrice(wxCouponCVo.getPrice()); + + wxCouponOrderCVo.setTailPrice(wxCouponCVo.getTailPrice()); + wxCouponOrderCVo.setOrigPrice(wxCouponCVo.getOrigPrice()); + wxCouponOrderCVo.setUnit(wxCouponCVo.getUnit()); wxCouponOrderCVo.setDetail(wxCouponCVo.getDetail()); wxCouponOrderCVo.setRemark(wxCouponCVo.getRemark()); @@ -163,8 +168,12 @@ public class WxCouponOrderController extends BaseController { wxCouponOrderCVo.setValidEndDate(wxCouponCVo.getValidEndDate()); wxCouponOrderCVo.setAutoRefund(wxCouponCVo.getAutoRefund()); + wxCouponOrderCVo.setPickStartDate(wxCouponCVo.getPickStartDate()); + wxCouponOrderCVo.setPickEndDate(wxCouponCVo.getPickEndDate()); + Date now = new Date(); - if (wxCouponOrderCVo.getValidStartDate() != null && wxCouponOrderCVo.getValidEndDate() != null ) { + if (wxCouponOrderCVo.getValidStartDate() != null && wxCouponOrderCVo.getValidEndDate() != null + && !wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { if (wxCouponOrderCVo.getValidStartDate().getTime() > now.getTime()) { wxCouponOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); } else if (wxCouponOrderCVo.getValidEndDate().getTime() < now.getTime()) { @@ -173,6 +182,18 @@ public class WxCouponOrderController extends BaseController { wxCouponOrderCVo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); } } + if(wxCouponOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) + && wxCouponOrderCVo.getPickStartDate() != null && wxCouponOrderCVo.getPickEndDate() != null){ +// wxCouponOrderCVo.setValidStartDate(wxCouponOrderCVo.getPickStartDate()); +// wxCouponOrderCVo.setValidEndDate(wxCouponOrderCVo.getPickEndDate()); + if (wxCouponOrderCVo.getPickStartDate().getTime() > now.getTime()) { + wxCouponOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); + } else if (wxCouponOrderCVo.getPickEndDate().getTime() < now.getTime()) { + wxCouponOrderCVo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); + } else { + wxCouponOrderCVo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); + } + } return new ResultData(wxCouponOrderCVo); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 31f912b9d..674f1116d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -354,7 +354,8 @@ public class WxOrderController extends BaseController { Date now = new Date(); - if (wxOrderCVo.getValidStartDate() != null && wxOrderCVo.getValidEndDate() != null ) { + if (wxOrderCVo.getValidStartDate() != null && wxOrderCVo.getValidEndDate() != null + && !wxOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())) { if (wxOrderCVo.getValidStartDate().getTime() > now.getTime()) { wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); } else if (wxOrderCVo.getValidEndDate().getTime() < now.getTime()) { @@ -363,6 +364,18 @@ public class WxOrderController extends BaseController { wxOrderCVo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); } } + if(wxOrderCVo.getType().equals(EnumCouponType.COUPON_PREORDER.getCode()) + && wxOrderCVo.getPickStartDate() != null && wxOrderCVo.getPickEndDate() != null){ +// wxOrderCVo.setValidStartDate(wxOrderCVo.getPickStartDate()); +// wxOrderCVo.setValidEndDate(wxOrderCVo.getPickEndDate()); + if (wxOrderCVo.getPickStartDate().getTime() > now.getTime()) { + wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.PREPARED.getCode()); + } else if (wxOrderCVo.getPickEndDate().getTime() < now.getTime()) { + wxOrderCVo.setValidStatus(EnumCouponOrderValidStatus.ENDED.getCode()); + } else { + wxOrderCVo.setValidStatus(EnumCouponChannelActivityStatus.STARTED.getCode()); + } + } return new ResultData(wxOrderCVo); } diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 3be7dad59..5bf051b72 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -416,7 +416,8 @@ public class PosServiceImpl implements PosService { if (!(couponType.getCode().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_LIPIN.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_PRESS.getCode()) || - couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode())) + couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()) || + couponType.getCode().equals(EnumCouponType.COUPON_PREORDER.getCode())) ) { logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage()); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); @@ -454,7 +455,8 @@ public class PosServiceImpl implements PosService { if (!(couponType.getCode().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_LIPIN.getCode()) || couponType.getCode().equals(EnumCouponType.COUPON_PRESS.getCode()) || - couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode())) + couponType.getCode().equals(EnumCouponType.COUPON_GROUP.getCode()) || + couponType.getCode().equals(EnumCouponType.COUPON_PREORDER.getCode())) ) { logger.error(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT.getMessage()); throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); 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 aa3b8a83a..f1f77aa98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -110,9 +110,9 @@ public class WxCoupon extends TenantEntity { @Excel(name="面额(分)",width = 20,orderNum = "2") private Integer price; - @io.swagger.annotations.ApiModelProperty(value="尾款(适用于类型9)",name="tailPrice") + @io.swagger.annotations.ApiModelProperty(value="尾款(适用于类型10)",name="tailPrice") private Integer tailPrice; - @io.swagger.annotations.ApiModelProperty(value="原价(适用于类型9)",name="origPrice") + @io.swagger.annotations.ApiModelProperty(value="原价(适用于类型10)",name="origPrice") private Integer origPrice; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 910aeeff3..0a1a3935e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -2,6 +2,7 @@ package com.iformall.domain.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.iformall.common.SortColumn; import com.iformall.domain.po.WxCouponOrder; import lombok.Data; import lombok.EqualsAndHashCode; @@ -58,6 +59,36 @@ public class WxCouponOrderCVo extends WxCouponOrder { private Integer usePrice; @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="尾款(适用于类型10)",name="tailPrice") + private Integer tailPrice; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="原价(适用于类型10)",name="origPrice") + private Integer origPrice; + + @TableField(exist = false) + @SortColumn(column = "tail_price") + private String tailPriceStr; + + @TableField(exist = false) + @SortColumn(column = "orig_price") + private String origPriceStr; + + public String getTailPriceStr() { + if(tailPrice!=null) { + tailPriceStr = new BigDecimal(tailPrice).divide(new BigDecimal(100)).toString(); + } + return tailPriceStr; + } + + public String getOrigPriceStr() { + if(origPrice!=null) { + origPriceStr = new BigDecimal(origPrice).divide(new BigDecimal(100)).toString(); + } + return origPriceStr; + } + @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") private Integer unit; @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") @@ -70,6 +101,14 @@ public class WxCouponOrderCVo extends WxCouponOrder { private Date validStartDate; @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="pickStartDate") + private Date pickStartDate; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="pickEndDate") + private Date pickEndDate; + @io.swagger.annotations.ApiModelProperty(value="内容类型(0:小程序页面类型,1:富文本类型)",name="contentType") private Integer contentType; @io.swagger.annotations.ApiModelProperty(value="富文本内容",name="html") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index f87eabcb4..b9846e2cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -48,6 +48,13 @@ public class WxOrderCouponVo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") private Date validEndDate; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="pickStartDate") + private Date pickStartDate; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="pickEndDate") + private Date pickEndDate; + @io.swagger.annotations.ApiModelProperty(value="券包中券ID-产品ID将来的产品都会放在coupon表里",name="couponOrderId") private Long couponOrderId; @io.swagger.annotations.ApiModelProperty(value="0: 未使用 1: 已核销 2:已过期 3:已退款",name="couponOrderStatus") @@ -68,6 +75,14 @@ public class WxOrderCouponVo extends TenantEntity { private Integer usePrice; @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="尾款(适用于类型10)",name="tailPrice") + private Integer tailPrice; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="原价(适用于类型10)",name="origPrice") + private Integer origPrice; + @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") private Integer unit; @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") 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 2faa64fbb..e0e33a11c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -308,7 +308,11 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { channelId.equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.getCode()) // 积分商城 ){ // 默认投放结束时间为有效时间之后 - beginTime = new Date(); + if(wxCoupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){ + beginTime = wxCoupon.getValidStartDate(); + }else{ + beginTime = new Date(); + } endTime = wxCoupon.getValidEndDate(); } 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 758545dd7..a525b35a0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -290,6 +290,12 @@ public class WxCouponServiceImpl implements WxCouponService { if (StringUtils.isNotEmpty(record.getPriceStr())) { record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).intValue()); } + if (StringUtils.isNotEmpty(record.getTailPriceStr())) { + record.setTailPrice(new BigDecimal(record.getTailPriceStr()).multiply(new BigDecimal(100)).intValue()); + } + if (StringUtils.isNotEmpty(record.getOrigPriceStr())) { + record.setOrigPrice(new BigDecimal(record.getOrigPriceStr()).multiply(new BigDecimal(100)).intValue()); + } if (StringUtils.isNotEmpty(record.getSubsidyNumStr())) { record.setSubsidyNum(new BigDecimal(record.getSubsidyNumStr()).multiply(new BigDecimal(100)).intValue()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 58256a9db..d8f3d3a75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -452,7 +452,7 @@ public class WxOrderServiceImpl implements WxOrderService { /** * 用户正在参加的新手活动 * - * @param user + * @param * @return */ public int countCouponConditionType1(String subTenantId,Long cuserId) { @@ -1016,7 +1016,12 @@ public class WxOrderServiceImpl implements WxOrderService { if (coupon.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode()) || coupon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) { - valid_date = coupon.getValidEndDate(); + + if( coupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){ + valid_date = coupon.getPickEndDate(); + }else{ + valid_date = coupon.getValidEndDate(); + } if (coupon.getSalePrice() > 0 && !coupon.checkIsCard()) { if (payOrder != null && payOrder.getShareAmount() != null) { // 分账有价券核销有效期不能大于分账过期时间 @@ -1163,7 +1168,11 @@ public class WxOrderServiceImpl implements WxOrderService { Date valid_date = null; int limit_days = Constant.WX_LIMIT_DAYS; if (coupon.getValidType().equals(EnumValidStatus.VALID_RANGE.getCode())) { - valid_date = coupon.getValidEndDate(); + if( coupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){ + valid_date = coupon.getPickEndDate(); + }else{ + valid_date = coupon.getValidEndDate(); + } } else { limit_days = coupon.getValidDays(); valid_date = DateUtils.getTimeAfterDays(limit_days, curr); diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index b1952f141..cb22ecc73 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -190,7 +190,7 @@ - + @@ -295,7 +295,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 3b9597f26..ef6c97fe5 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -23,7 +23,7 @@ - + @@ -349,7 +349,7 @@ - and c.`type` < 7 + and ( c.`type` < 7 or c.`type` = 10 ) @@ -606,7 +606,7 @@ - + @@ -654,7 +654,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 0955c40a0..5a49f043f 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -881,6 +881,12 @@ and c.id = #{couponId} + + and c.title like concat('%', #{title},'%') + + + and c.`type` = #{type} + and c.business = #{business} @@ -1031,7 +1037,7 @@ co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.pay_vendor, - c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund + c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund @@ -1065,6 +1071,10 @@ + + + + @@ -1072,6 +1082,9 @@ + + + o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, - c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date, + c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num @@ -305,11 +305,16 @@ + + + + + @@ -332,7 +337,7 @@ o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, - c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date + c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date