diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 098a3d205..0b9cc44a1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -55,7 +55,6 @@ public class WxBillAllController extends BaseController { public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); wxBillAll.updateTenantInfo(getTenantInfo()); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillAll); if (null == wxBillAll) { wxBillAll = new WxBillAll(); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021110800001__addSaleType.sql b/mallinkAdmin/src/main/resources/db/migration/V2021110800001__addSaleType.sql new file mode 100644 index 000000000..075d21dfd --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2021110800001__addSaleType.sql @@ -0,0 +1,10 @@ + +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (680, '抖音列表投放', 606, 'Y', NULL, 1, NULL, NULL, 'dyxcx', NULL, 0, 680); + + +INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (11, '抖音尊享', 11, 12, '[1, 2, 4, 5, 6, 50, 105, 106, 201, 202, 211, 212, 221, 222, 409, 411, 416, 501, 502, 504, 505, 506, 511, 512, 591, 592, 595, 602, 606, 610, 613, 641, 680, 711, 901, 902, 903, 931, 932]'); + + + +ALTER TABLE `mallink`.`wx_pay_account` +ADD COLUMN `plat` smallint(3) NOT NULL DEFAULT 1 COMMENT 'app平台 1:微信 2:阿里 3:头条' AFTER `private_cert_path`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java index 785008a11..f47386180 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccount.java @@ -65,4 +65,6 @@ public class WxPayAccount extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="apiv3 商户apiclient_cert.pem",name="privateCertPath") private String privateCertPath; + @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") + private Integer plat; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java index cdd967c50..4b31320aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayAccountBill.java @@ -54,5 +54,4 @@ public class WxPayAccountBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="手续费费率",name="serviceChargeRate") private Integer serviceChargeRate; - }