diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022080800001_wx_coupon.sql b/mallinkAdmin/src/main/resources/db/migration/V2022080800001_wx_coupon.sql new file mode 100644 index 000000000..acd91f72e --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022080800001_wx_coupon.sql @@ -0,0 +1,200 @@ +ALTER TABLE `mallink`.`wx_coupon_0` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_1` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_2` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_3` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_4` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_5` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_6` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_7` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_8` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_9` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_10` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_11` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_12` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_13` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_14` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_15` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_16` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_17` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_18` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_19` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_20` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_21` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_22` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_23` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_24` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_25` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_26` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_27` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_28` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_29` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_30` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_31` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_32` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_33` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_34` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_35` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_36` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_37` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_38` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_39` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_40` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_41` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_42` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_43` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_44` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_45` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_46` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_47` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_48` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_49` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_50` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_51` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_52` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_53` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_54` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_55` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_56` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_57` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_58` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_59` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_60` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_61` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_62` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_63` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_64` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_65` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_66` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_67` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_68` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_69` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_70` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_71` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_72` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_73` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_74` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_75` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_76` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_77` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_78` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_79` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_80` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_81` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_82` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_83` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_84` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_85` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_86` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_87` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_88` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_89` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_90` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_91` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_92` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_93` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_94` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_95` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_96` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_97` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_98` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; +ALTER TABLE `mallink`.`wx_coupon_99` +ADD COLUMN `merchant_type` tinyint(1) AFTER `source_type`; 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 220c2618d..5db7bac06 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -194,6 +194,9 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType") private Integer sourceType; + @io.swagger.annotations.ApiModelProperty(value="EnumCouponMerchantType",name="merchantType") + private Integer merchantType; + @TableField(exist = false) private String merchantParams; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponMerchantType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponMerchantType.java new file mode 100644 index 000000000..c25236ecc --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponMerchantType.java @@ -0,0 +1,37 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumCouponMerchantType { + + // + ONE_MERCHANT(1, "单商户"), + MULTIPLE_MERCHANT(2, "多商户") + ; + + public static EnumCouponMerchantType getEnum(Integer code) { + for (EnumCouponMerchantType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumCouponMerchantType(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/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 6768d11a9..adbede63c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -436,6 +436,11 @@ public class WxCouponServiceImpl implements WxCouponService { return resultData; } List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); + if(merchantParamList != null && merchantParamList.size() == 1){ + record.setMerchantType(EnumCouponMerchantType.ONE_MERCHANT.getCode()); + }else if(merchantParamList != null && merchantParamList.size() > 1){ + record.setMerchantType(EnumCouponMerchantType.MULTIPLE_MERCHANT.getCode()); + } final IdWorker idWorker = IdWorker.get(); if (record.getId() == null) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index b44eeecd3..becbd510d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -55,6 +55,7 @@ + @@ -107,6 +108,7 @@ + @@ -115,7 +117,7 @@ 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`, c.`press_limit_num`, c.`press_limit_hours`, c.`auto_refund`,c.`credit_price`,c.`credit_refund`,c.`put_apply_status`,c.`stock_apply_status`,c.`cancle_apply_status`, - c.`conditions`,c.approval_type,c.content_type,c.source_type,c.password_support,c.gift_list,c.product_type,c.category_id + c.`conditions`,c.approval_type,c.content_type,c.source_type,c.merchant_type,c.password_support,c.gift_list,c.product_type,c.category_id @@ -294,6 +296,10 @@ and `source_type` = #{sourceType} + + and `merchant_type` = #{merchantType} + + and JSON_CONTAINS(gift_list,json_array(#{giftList})) @@ -353,7 +359,7 @@ select c.id,c.type,c.cover_img,c.title,c.sub_title,c.item_group,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,c.business,c.subsidy_type,c.source_type,c.content_type,c.gift_list,c.support_transfer,c.subsidy_num + c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund,c.business,c.subsidy_type,c.source_type,c.merchant_type,c.content_type,c.gift_list,c.support_transfer,c.subsidy_num from wx_coupon c where c.id = #{id} and c.`tenant_id` = #{tenantId} @@ -388,7 +394,7 @@ @@ -634,6 +640,10 @@ and c.`source_type` = #{sourceType} + + and c.`merchant_type` = #{merchantType} + + and cm.`merchant_id` = #{merchantId} @@ -730,6 +740,7 @@ + @@ -781,6 +792,7 @@ +