| @@ -150,7 +150,8 @@ public class WxCouponController extends BaseController { | |||||
| EnumCouponType.COUPON_DOUYIN.getCode(), | EnumCouponType.COUPON_DOUYIN.getCode(), | ||||
| EnumCouponType.COUPON_PRESS.getCode(), | EnumCouponType.COUPON_PRESS.getCode(), | ||||
| EnumCouponType.COUPON_PREORDER.getCode(), | EnumCouponType.COUPON_PREORDER.getCode(), | ||||
| EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()}; | |||||
| EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(), | |||||
| EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode()}; | |||||
| wxCoupon.setTypes(Arrays.asList(typeArray)); | wxCoupon.setTypes(Arrays.asList(typeArray)); | ||||
| @@ -1 +1,3 @@ | |||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60201, '抖音到家券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinToHomeCoupon', NULL, 0, 60201); | INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60201, '抖音到家券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinToHomeCoupon', NULL, 0, 60201); | ||||
| INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (60202, '抖音代金券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinVoucherCoupon', NULL, 0, 60202); | |||||
| @@ -103,7 +103,8 @@ public class WxCouponController extends BaseController { | |||||
| EnumCouponType.COUPON_DOUYIN.getCode(), | EnumCouponType.COUPON_DOUYIN.getCode(), | ||||
| EnumCouponType.COUPON_PRESS.getCode(), | EnumCouponType.COUPON_PRESS.getCode(), | ||||
| EnumCouponType.COUPON_PREORDER.getCode(), | EnumCouponType.COUPON_PREORDER.getCode(), | ||||
| EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()}; | |||||
| EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(), | |||||
| EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode(),}; | |||||
| wxCoupon.setTypes(Arrays.asList(typeArray)); | wxCoupon.setTypes(Arrays.asList(typeArray)); | ||||
| wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); | wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| @@ -154,6 +154,7 @@ public enum EnumCouponChannelType { | |||||
| codes.add(EnumCouponType.COUPON_DOUYIN_PLAT.getCode()); | codes.add(EnumCouponType.COUPON_DOUYIN_PLAT.getCode()); | ||||
| codes.add(EnumCouponType.COUPON_DOUYIN_BRAND.getCode()); | codes.add(EnumCouponType.COUPON_DOUYIN_BRAND.getCode()); | ||||
| codes.add(EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()); | codes.add(EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode()); | ||||
| codes.add(EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode()); | |||||
| } | } | ||||
| return codes; | return codes; | ||||
| } | } | ||||
| @@ -33,6 +33,7 @@ public enum EnumCouponType { | |||||
| COUPON_DOUYIN_BRAND(68, "抖音集团品牌券",true), | COUPON_DOUYIN_BRAND(68, "抖音集团品牌券",true), | ||||
| COUPON_DOUYIN_GO_HOME(69, "抖音到家券",true), | COUPON_DOUYIN_GO_HOME(69, "抖音到家券",true), | ||||
| COUPON_DOUYIN_DAIJIN(70, "抖音代金券",true), | |||||
| CARD_MULTIMCH(100, "消费卡",false), | CARD_MULTIMCH(100, "消费卡",false), | ||||
| ; | ; | ||||
| @@ -97,6 +98,7 @@ public enum EnumCouponType { | |||||
| typeList.add(COUPON_DOUYIN_PLAT.getCode()); | typeList.add(COUPON_DOUYIN_PLAT.getCode()); | ||||
| typeList.add(COUPON_DOUYIN_BRAND.getCode()); | typeList.add(COUPON_DOUYIN_BRAND.getCode()); | ||||
| typeList.add(COUPON_DOUYIN_GO_HOME.getCode()); | typeList.add(COUPON_DOUYIN_GO_HOME.getCode()); | ||||
| typeList.add(COUPON_DOUYIN_DAIJIN.getCode()); | |||||
| return typeList; | return typeList; | ||||
| } | } | ||||