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<ShopSto
         queryWrapper.eq("store_id", storeId);
         queryWrapper.eq("category", category);
         queryWrapper.orderByAsc("template_id");
-        ShopStorePrinterTemplate shopStorePrinterTemplate = getOne(queryWrapper);
+        ShopStorePrinterTemplate shopStorePrinterTemplate = findOne(queryWrapper);
         if (shopStorePrinterTemplate == null || shopStorePrinterTemplate.getTemplate_id() <= 0) {
             queryWrapper.clear();
             queryWrapper.eq("store_id", 0);// 公共下单模版
             queryWrapper.eq("category", category);
             queryWrapper.orderByAsc("template_id");
-            shopStorePrinterTemplate = getOne(queryWrapper);
+            shopStorePrinterTemplate = findOne(queryWrapper);
         }
 
         return shopStorePrinterTemplate;
diff --git a/mall-shop/src/main/resources/bootstrap-dev.yml b/mall-shop/src/main/resources/bootstrap-dev.yml
index 5b605e6b..df898aa0 100644
--- a/mall-shop/src/main/resources/bootstrap-dev.yml
+++ b/mall-shop/src/main/resources/bootstrap-dev.yml
@@ -167,6 +167,7 @@ lakala:
     client_secret: XPa1HB5d55Ig0qV8
     user_no: 29153396
     ratio: 70.00
+    activity_id: 687
     wx_fee: 0.6 # 微信手续费 6/1000
     api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
     api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
diff --git a/mall-shop/src/main/resources/bootstrap-local.yml b/mall-shop/src/main/resources/bootstrap-local.yml
index 20482fdc..068533cb 100644
--- a/mall-shop/src/main/resources/bootstrap-local.yml
+++ b/mall-shop/src/main/resources/bootstrap-local.yml
@@ -167,6 +167,7 @@ lakala:
     client_secret: XPa1HB5d55Ig0qV8
     user_no: 29153396
     split_lowest_ratio: 70.00
+    activity_id: 687
     wx_fee: 0.6 # 微信手续费 6/1000
     api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
     api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml
index 73ba3975..2afba650 100644
--- a/mall-shop/src/main/resources/bootstrap-prod.yml
+++ b/mall-shop/src/main/resources/bootstrap-prod.yml
@@ -171,10 +171,11 @@ lakala:
   tk:
     #服务地址
     server_url: https://tkapi.lakala.com
-    client_id: lsycs
-    client_secret: XPa1HB5d55Ig0qV8
-    user_no: 29153396
+    client_id: gpff
+    client_secret: uRjvaJkWS1A0VsAv
+    user_no: 22874827
     split_lowest_ratio: 70.00
+    activity_id: 208
     wx_fee: 0.25 # 微信手续费 6/1000
     api_pub_key_path: payKey/lakala/prod/tk_api_public_key.txt
     api_pri_key_path: payKey/lakala/prod/tk_api_private_key.txt
@@ -204,6 +205,7 @@ lakala:
 #    client_secret: XPa1HB5d55Ig0qV8
 #    user_no: 29153396
 #    split_lowest_ratio: 70.00
+#    activity_id: 687
 #    wx_fee: 0.6 # 微信手续费 6/1000
 #    api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
 #    api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
diff --git a/mall-shop/src/main/resources/bootstrap-test.yml b/mall-shop/src/main/resources/bootstrap-test.yml
index deb7cc43..71c0b2d9 100644
--- a/mall-shop/src/main/resources/bootstrap-test.yml
+++ b/mall-shop/src/main/resources/bootstrap-test.yml
@@ -171,6 +171,7 @@ lakala:
     client_secret: XPa1HB5d55Ig0qV8
     user_no: 29153396
     ratio: 70.00
+    activity_id: 687
     wx_fee: 0.6 # 微信手续费 6/1000
     api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
     api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
diff --git a/mall-shop/src/main/resources/bootstrap-uat.yml b/mall-shop/src/main/resources/bootstrap-uat.yml
index deb7cc43..71c0b2d9 100644
--- a/mall-shop/src/main/resources/bootstrap-uat.yml
+++ b/mall-shop/src/main/resources/bootstrap-uat.yml
@@ -171,6 +171,7 @@ lakala:
     client_secret: XPa1HB5d55Ig0qV8
     user_no: 29153396
     ratio: 70.00
+    activity_id: 687
     wx_fee: 0.6 # 微信手续费 6/1000
     api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
     api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt