From c31617ed7f351bc7502e4338f48536efb2e8cc97 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 13 Nov 2023 16:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuint/api/fuyou/service/impl/FyPayServiceImpl.java | 10 ++++++++++
 .../fuint/business/userManager/entity/UserBalance.java |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index 1aad0682a..9b8a03a3a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -5,8 +5,10 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.fuint.api.fuyou.entity.Builder;
 import com.fuint.api.fuyou.entity.Const;
+import com.fuint.api.fuyou.entity.MerchantConfig;
 import com.fuint.api.fuyou.entity.Message;
 import com.fuint.api.fuyou.service.FyPayService;
+import com.fuint.api.fuyou.service.MerchantConfigService;
 import com.fuint.api.fuyou.util.Utils;
 import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.entity.LJOrder;
@@ -89,6 +91,8 @@ public class FyPayServiceImpl implements FyPayService {
         return resMap;
     }
 
+    @Autowired
+    private MerchantConfigService merchantConfigService;
 
     @Override
     public Map<String, String> queryOrder(Map<String, String> map1) throws Exception {
@@ -99,6 +103,7 @@ public class FyPayServiceImpl implements FyPayService {
             String payType = map1.get("payType");
             String insCd = map1.get("insCd");
             String mchntCd = map1.get("mchntCd");
+            Double allAmount = Double.valueOf(map1.get("allAmount"));
             Map<String, String> map = Builder.buildFuiou30();
             map.put("mchnt_order_no",orderNo);
             map.put("order_type",payType);
@@ -118,6 +123,7 @@ public class FyPayServiceImpl implements FyPayService {
                 List<OilOrder> list = oilOrderService.selectOilOrder(orderNo);
                 LJOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo);
                 CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
+                MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1");
                 Date date = new Date();
                 if (reqMap.get("trans_stat").equals("SUCCESS")){
                     if (!ObjectUtil.isEmpty(oilOrder)){
@@ -137,6 +143,10 @@ public class FyPayServiceImpl implements FyPayService {
                             oilOrderService.updateOilOrder(order);
                         }
                     }
+//                    修改商户账号余额信息
+                    Double amount = merchantConfig.getAmount();
+                    merchantConfig.setAmount(amount+allAmount);
+                    merchantConfigService.updateMerch(merchantConfig);
                     resMap.put("msg","success");
                 }else if (reqMap.get("trans_stat").equals("USERPAYING")){
                     resMap.put("msg","unpaid");
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
index 6eba2296f..f992da4d2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/UserBalance.java
@@ -33,7 +33,7 @@ public class UserBalance extends BaseEntity implements Serializable {
     /**
      * 所属连锁店id
      */
-    private Integer chainStorId;
+    private Integer chainStoreId;
     /**
      * 所属店铺id
      */