From c7ebd82d644bfac518ced7a33f01dd2c438e89d0 Mon Sep 17 00:00:00 2001 From: Jack <46790855@qq.com> Date: Wed, 30 Jul 2025 16:04:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8D=A1=E6=8B=89=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/shop/lakala/service/impl/LklTkServiceImpl.java | 5 ++++- .../service/impl/ShopStorePrinterTemplateServiceImpl.java | 4 ++-- mall-shop/src/main/resources/bootstrap-dev.yml | 1 + mall-shop/src/main/resources/bootstrap-local.yml | 1 + mall-shop/src/main/resources/bootstrap-prod.yml | 8 +++++--- mall-shop/src/main/resources/bootstrap-test.yml | 1 + mall-shop/src/main/resources/bootstrap-uat.yml | 1 + 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java index df6e7db2..7e52c789 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java @@ -68,6 +68,9 @@ public class LklTkServiceImpl { @Value("${lakala.tk.notify_pub_key_path}") private String notifyPubKeyPath; + @Value("${lakala.tk.activity_id}") + private Integer activityId; + @Value("${lakala.tk.wx_fee}") private String wxFee; @@ -435,7 +438,7 @@ public class LklTkServiceImpl { // 费率和设备、活动 JSONObject bizContent = new JSONObject(); - bizContent.put("activityId", 687); + bizContent.put("activityId", activityId); bizContent.put("termNum", "1"); bizContent.put("mcc", "12015"); // 超市的 code bizContent.put("fees", new JSONArray() {{ diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java index e2e796a3..f1d85b91 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStorePrinterTemplateServiceImpl.java @@ -33,13 +33,13 @@ public class ShopStorePrinterTemplateServiceImpl extends BaseServiceImpl