diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
index 82746a594..fad9fe837 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
@@ -96,6 +96,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
         startIndex += length;
         length = 8;
         byte[] cardNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
+        log.info("充电桩主动申请启动充电cardNumByteArr:{}", cardNumByteArr);
         String physicsCard = BytesUtil.binary(cardNumByteArr, 16);
 
         // 输入密码  对用户输入的密码进行16 位MD5 加密，采用小写上传
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
index a651d1ec7..8c860e2b4 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
@@ -500,7 +500,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
         startIndex += length;
         length = 8;
         byte[] cardNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length);
-        // byte[] logicCardNum = BytesUtil.checkLengthAndBehindAppendZero(cardNumByteArr, 16);
+        log.info("交易记录确认cardNumByteArr:{}", cardNumByteArr);
         String logicCard = BytesUtil.binary(cardNumByteArr, 16);
         log.info("桩号:{}, 发送交易记录物理卡号:{}", pileSn, logicCard);
 
@@ -622,7 +622,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
                 AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);
                 orderLogic.settleOrder(data, orderBasicInfo);
             } catch (Exception e) {
-                log.error("结算订单发生异常", e);
+                log.error("结算订单发生异常 orderCode:{}", orderBasicInfo.getOrderCode(), e);
             }
 
             // 异步绑定第三方平台优惠券
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
index 46faa38e3..97b9a3838 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java
@@ -374,7 +374,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
         OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data);
         // 计算订单折扣 calculateOrderDiscounts
         // calculateOrderDiscounts(orderBasicInfo, orderDetail);
-        // calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
+        calculateOrderDiscountsV2(orderBasicInfo, orderDetail);
 
         // 更新数据库
         OrderTransactionDTO dto = new OrderTransactionDTO();
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
index 7e7002413..2264f177a 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
@@ -389,7 +389,7 @@
             t6.apply_time AS valleyApplyDate
         FROM
             pile_basic_info t1
-            JOIN pile_billing_template t2 ON t1.station_id = t2.station_id and t2.status = '1'
+            JOIN pile_billing_template t2 ON t1.station_id = t2.station_id and t2.status = '1' and t2.member_flag = '0'
             JOIN pile_billing_detail t3 ON t3.template_code = t2.template_code AND t3.time_type = '1'
             JOIN pile_billing_detail t4 ON t4.template_code = t2.template_code AND t4.time_type = '2'
             JOIN pile_billing_detail t5 ON t5.template_code = t2.template_code AND t5.time_type = '3'
diff --git a/jsowell-ui/vue.config.js b/jsowell-ui/vue.config.js
index 2ec66f69b..89f2d999f 100644
--- a/jsowell-ui/vue.config.js
+++ b/jsowell-ui/vue.config.js
@@ -35,10 +35,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
+        target: `http://localhost:8080`,
         // 更改代理为本地地址
         // target: `http://192.168.2.6:8080`,
-        target: `https://api.jsowellcloud.com`,
+        // target: `https://api.jsowellcloud.com`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",