From bb2123904d8d524fda5d3d712164a33441532bf0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 21 Nov 2022 18:08:06 +0800 Subject: [PATCH] //coupon brand --- .../V2022111600001__add_mall_permission.sql | 7 +- .../V2022112100001__add_coupon_brand.sql | 200 ++++++++++++++++++ .../java/com/iformall/domain/po/WxCoupon.java | 3 + .../main/resources/mapper/WxCouponMapper.xml | 12 +- 4 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022112100001__add_coupon_brand.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql index 116a0096b..baf83f7d2 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2022111600001__add_mall_permission.sql @@ -1,4 +1,9 @@ INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (648, '抖音平台券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinPlatCoupon', NULL, 0, 648); INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (649, '抖音品牌券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinBrandCoupon', NULL, 0, 649); -INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (101, '抖音集团版', 101, 12, '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 610, 615, 622, 648, 649, 676, 711, 901, 902, 904, 907, 61501, 61502]'); +INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (101, '抖音集团版', 101, 12, '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 615, 622, 648, 649, 676, 680, 711, 901, 902, 904, 907, 61501, 61502]'); + + +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (650, '抖音平台券', 602, 'Y', NULL, 1, NULL, NULL, 'douyinSubPlatCoupon', NULL, 0, 650); + +INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (102, '抖音集团子版', 102, 12, '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 224, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 508, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 615, 622, 647, 650, 676, 680, 711, 901, 902, 904, 907, 5310, 5320, 61501, 61502]'); diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022112100001__add_coupon_brand.sql b/mallinkAdmin/src/main/resources/db/migration/V2022112100001__add_coupon_brand.sql new file mode 100644 index 000000000..c559df8bd --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022112100001__add_coupon_brand.sql @@ -0,0 +1,200 @@ +ALTER TABLE `mallink`.`wx_coupon_0` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_1` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_2` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_3` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_4` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_5` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_6` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_7` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_8` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_9` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_10` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_11` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_12` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_13` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_14` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_15` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_16` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_17` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_18` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_19` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_20` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_21` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_22` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_23` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_24` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_25` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_26` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_27` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_28` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_29` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_30` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_31` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_32` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_33` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_34` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_35` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_36` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_37` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_38` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_39` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_40` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_41` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_42` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_43` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_44` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_45` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_46` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_47` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_48` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_49` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_50` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_51` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_52` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_53` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_54` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_55` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_56` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_57` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_58` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_59` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_60` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_61` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_62` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_63` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_64` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_65` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_66` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_67` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_68` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_69` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_70` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_71` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_72` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_73` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_74` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_75` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_76` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_77` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_78` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_79` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_80` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_81` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_82` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_83` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_84` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_85` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_86` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_87` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_88` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_89` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_90` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_91` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_92` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_93` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_94` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_95` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_96` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_97` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_98` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; +ALTER TABLE `mallink`.`wx_coupon_99` +ADD COLUMN `brand` bigint(20) COMMENT '品牌' AFTER `make_merchant_id`; \ No newline at end of file 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 b39c51cdb..c0016d9b4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -255,6 +255,9 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="直连收款门店",name="makeMerchantId") private Long makeMerchantId; + @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") + private Long brand; + @io.swagger.annotations.ApiModelProperty(value="第三方商品Id",name="goodsId") private String goodsId; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 9e3af5585..4ce873f6d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -6,6 +6,7 @@ + @@ -72,6 +73,7 @@ + @@ -121,7 +123,7 @@ - c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`make_merchant_id`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`, + c.`id`,c.`tenant_id`,c.`parent_tenant_id`,c.`make_merchant_id`,c.`brand`,c.`type`,c.`cover_img`,c.`cover_picture`,c.`detail_picture`, c.`title`,c.`sub_title`,c.`item_group`,c.`sale_price`,c.`freight_price`,c.`use_price`,c.`use_limit_rule`,c.`use_limit_quantity`,c.`send_type`, c.`valid_type`,c.`valid_start_date`,c.`valid_end_date`,c.pick_start_date,c.pick_end_date,c.`valid_days`,c.`detail`,c.`price`,c.tail_price,c.orig_price,c.`unit`,c.`remain_inventory`,c.`inventory`, c.`remark`,c.`status`,c.`create_date`,c.`update_date`,c.`business`,c.`sub_business`,c.`support_transfer`,c.`subsidy_num`,c.`subsidy_type`, @@ -147,6 +149,14 @@ and `parent_tenant_id` = #{parentTenantId} + + and `make_merchant_id` = #{makeMerchantId} + + + + and `brand` = #{brand} + + and `type` = #{type}