From 3917f60fe4be036591878298d2f7e35e8eaa810e Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 9 Mar 2023 15:56:03 +0800 Subject: [PATCH] //coupon --- .../resources/db/migration/V2023030800001__coupon_press.sql | 4 +++- .../main/java/com/iformall/controller/WxCouponController.java | 2 +- .../src/main/java/com/iformall/common/SysConfigConstant.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql index 8aa35064d..6bfe1e53f 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030800001__coupon_press.sql @@ -2,4 +2,6 @@ ALTER TABLE `mallink`.`wx_coupon_password` ADD COLUMN `pay_password` varchar(50) COMMENT '支付密码' AFTER `password`; -INSERT INTO `mallink`.`sys_config`(`id`, `config_item_key`, `config_item_remark`, `create_date`, `update_date`, `status`) VALUES (7, 'cardIsNeedPassword', '实体购物卡是否需要密码', '2023-03-08 10:49:15', '2023-03-08 10:49:15', 0); +INSERT INTO `mallink`.`sys_config`(`id`, `config_item_key`, `config_item_remark`, `create_date`, `update_date`, `status`) VALUES (7, 'cardIsNeedPassword', '实体购物卡是否需要密码,0-不需要,1-需要', '2023-03-08 10:49:15', '2023-03-08 10:49:15', 0); + +INSERT INTO `mallink`.`sys_config`(`id`, `config_item_key`, `config_item_remark`, `create_date`, `update_date`, `status`) VALUES (8, 'couponListShowSelled', '券列表是否显示已售数量,0-不显示,1-显示', '2023-03-08 10:49:15', '2023-03-08 10:49:15', 0); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 555183587..8263955c7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -295,7 +295,7 @@ public class WxCouponController extends BaseController { couponMap.put(cc.getId(), cc); } //如果配置显示已售数量 - SysConfig config = sysConfigService.getByKey(SysConfigConstant.coupon_detail_show_selled, this.getTenantInfo()); + SysConfig config = sysConfigService.getByKey(SysConfigConstant.coupon_list_show_selled, this.getTenantInfo()); StringBuffer sb = new StringBuffer("["); for (int i = 0 ; i < couponChannelList.size() ; i ++) { Long ccid = couponChannelList.get(i); diff --git a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java index 0be4f4577..9a43875ae 100644 --- a/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java +++ b/mallinkService/src/main/java/com/iformall/common/SysConfigConstant.java @@ -6,5 +6,7 @@ public class SysConfigConstant { public static final String card_vierfy_seconds_key="cardVierfySeconds"; public static final String default_merchant_b_user = "defaultMerchantBUserId"; public static final String coupon_detail_show_selled = "couponDetailShowSelled"; + public static final String coupon_list_show_selled = "couponListShowSelled"; public static final String card_is_need_password = "cardIsNeedPassword"; + }