diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023031100001__upd_Template.sql b/mallinkAdmin/src/main/resources/db/migration/V2023031100001__upd_Template.sql index 9ecf687e0..cfcc02740 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023031100001__upd_Template.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023031100001__upd_Template.sql @@ -11,11 +11,53 @@ update wx_template_msg set sync_status = 1 where template_id is not null and tem --初始化微信订阅消息 --demo -INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78904, '789', NULL, '', 4, '{"index": ["thing13", "date5", "thing12", "thing1", "thing11"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); -INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78905, '789', NULL, '', 5, '{"index": ["thing1", "date3", "thing4", "thing5"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); -INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78950, '789', NULL, '', 50, '{"index": ["character_string1", "character_string2", "time4", "thing3"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); -INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78951, '789', NULL, '', 51, '{"index": ["thing1", "time3", "time4", "thing5"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +--INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78904, '789', NULL, '', 4, '{"index": ["thing13", "date5", "thing12", "thing1", "thing11"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +--INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78905, '789', NULL, '', 5, '{"index": ["thing1", "date3", "thing4", "thing5"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +--INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78950, '789', NULL, '', 50, '{"index": ["character_string1", "character_string2", "time4", "thing3"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +--INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78951, '789', NULL, '', 51, '{"index": ["thing1", "time3", "time4", "thing5"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +--INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78952, '789', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); + +--上线后执行 INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (78952, '789', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (100352, '1003', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (100852, '1008', '1028', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (100952, '1009', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (101052, '1010', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (101252, '1012', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (101352, '1013', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (101952, '1019', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (102052, '1020', '1028', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (102452, '1024', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (102652, '1026', '1025', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (102752, '1027', '1025', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (102952, '1029', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (103552, '1035', '1037', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (103652, '1036', '1037', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (101252, '1012', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (103852, '1038', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (103952, '1039', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104052, '1040', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104152, '1041', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104252, '1042', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104352, '1043', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104452, '1044', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104552, '1045', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104652, '1046', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104752, '1047', '1048', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (104952, '1049', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105052, '1050', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105152, '1051', '1037', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105352, '1053', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105452, '1054', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105552, '1055', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105652, '1056', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105752, '1057', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105852, '1058', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (105952, '1059', '1052', '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (106052, '1060', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (106152, '1061', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (106252, '1062', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); +INSERT INTO `mallink`.`wx_template_msg`(`id`, `tenant_id`, `parent_tenant_id`, `template_id`, `type`, `custom_param`, `create_date`, `update_date`) VALUES (106352, '1063', NULL, '', 52, '{"index": ["thing7", "amount1", "amount2", "date4", "thing6"], "emphasis": ""}', '2023-03-12 00:00:00', '2023-03-12 00:00:00'); --上线后执行 diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql b/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql index 68bd3e086..d66e97838 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql @@ -7,7 +7,7 @@ ADD COLUMN `refund_status` smallint(2) NOT NULL DEFAULT 0 COMMENT '退款状态' ADD COLUMN `refund_remark` varchar(255) AFTER `refund_status`; - +--上线后执行 INSERT INTO `wx_flow_config` (`id`, `parent_id`, `tenant_id`,`parent_tenant_id`, `name`, `type`, `model_id`, `sort`) select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000)) id, (select id from wx_flow_config where name = '营销审批' and tenant_id = '789') parent_id, diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index bdad6f5f0..46268bb8c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -36,10 +36,8 @@ public class WxCardSpendVo extends WxCardSpend { @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") @Excel(name = "消费商户", width = 20, orderNum = "6") private String merchantName; - @Excel(name = "补贴额(包含通道费)", width = 20, orderNum = "15") @io.swagger.annotations.ApiModelProperty(value="补贴额(包含通道费)",name="subsidy") private Integer subsidy; - @Excel(name = "线上补贴额/实收补贴额(通道费扣除)", width = 20, orderNum = "16") @io.swagger.annotations.ApiModelProperty(value="线上补贴额/实收补贴额(通道费扣除)",name="realSubsidy") private Integer realSubsidy; @io.swagger.annotations.ApiModelProperty(value="补贴状态(0:未补贴, 1:已补贴)",name="status") @@ -59,4 +57,5 @@ public class WxCardSpendVo extends WxCardSpend { private Date couponOnlineEndDate; @TableField(exist = false) private WxCardInfo wxCardInfo; + }