From 6aec7b24dd7450606c354cf7501f207702822127 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Fri, 20 Aug 2021 17:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E6=88=90=E5=8A=9F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B0=83=E7=94=A8=E6=A1=A9=E4=BD=99=E9=A2=9D=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/data/down/StartChargingData.java   |  1 -
 .../main/resources/mapper/XhpcHelpMapper.xml  |  4 +--
 .../controller/WxPaymentController.java       | 35 ++++++++++++++++++-
 .../XhpcUserAccountStatementMapper.java       |  9 +++++
 .../mapper/XhpcUserAccountStatementMapper.xml |  6 ++++
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java
index aedb1c3c..33907028 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/down/StartChargingData.java
@@ -5,7 +5,6 @@ import javax.validation.constraints.NotBlank;
 
 public class StartChargingData {
 
-    @NotBlank(message = "订单流水号不能为空")
     private String orderNo; //交易流水号
     @NotBlank(message = "桩号不能为空")
     private String pileNo; //桩号
diff --git a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml
index 95b19d9d..16affdf4 100644
--- a/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml
+++ b/xhpc-modules/xhpc-general/src/main/resources/mapper/XhpcHelpMapper.xml
@@ -58,14 +58,12 @@
     </select>
 
     <select id="selectTitleId" resultType="map">
-
         select help_id as helpId,title
         from xhpc_help
-        where type=#{type}
+        where type=#{type} and status=0 and del_flag=0
     </select>
 
     <select id="selectDetails" resultType="map">
-
         select title,cast(content as char) as content
         from xhpc_help
         where help_id=#{helpId}
diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
index 833e9cae..063ebc66 100644
--- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
+++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
@@ -1,10 +1,13 @@
 package com.xhpc.payment.controller;
 
+import com.xhpc.common.api.PowerPileService;
 import com.xhpc.common.core.constant.HttpStatus;
 import com.xhpc.common.core.constant.StatusConstants;
+import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.common.core.utils.WXPayUtil;
 import com.xhpc.common.core.web.domain.AjaxResult;
+import com.xhpc.common.data.down.StartChargingData;
 import com.xhpc.payment.domain.XhpcAppUser;
 import com.xhpc.payment.domain.XhpcRechargeOrder;
 import com.xhpc.payment.domain.XhpcUserAccountStatement;
@@ -22,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -60,6 +64,15 @@ public class WxPaymentController {
     @Autowired
     private Environment environment;
 
+    @Autowired
+    private PowerPileService powerPileService;
+
+    private int number;
+
+    @PostConstruct
+    public  void init(){
+        number =1;
+    }
 
     @PostMapping("/payment")
     @ApiOperation(value = "微信支付")
@@ -349,10 +362,17 @@ public class WxPaymentController {
         Map<String, Object> appUserInfo = xhpcUserAccountStatementMapper.appUserInfo(xhpcRechargeOrder.getUserId());
         if (StringUtils.isNotNull(appUserInfo)) {
             String balance = StringUtils.valueOf(appUserInfo.get("balance"));
+            BigDecimal money = BigDecimal.valueOf(Double.valueOf(balance)).add(xhpcRechargeOrder.getAmount());
+            //判断用户是否在充电中
+            String serialMumber = xhpcUserAccountStatementMapper.getUserHistotyChargeOrder(xhpcRechargeOrder.getUserId());
+            if(!"".equals(serialMumber) && serialMumber !=null){
+                    //充电中
+                    postRefreshBalance(money, serialMumber);
+            }
             //增加用户余额
             XhpcAppUser xhpcAppUser = new XhpcAppUser();
             xhpcAppUser.setAppUserId(xhpcRechargeOrder.getUserId());
-            xhpcAppUser.setBalance(BigDecimal.valueOf(Double.valueOf(balance)).add(xhpcRechargeOrder.getAmount()));
+            xhpcAppUser.setBalance(money);
             xhpcUserAccountStatementMapper.updateAppUserBalance(xhpcAppUser);
             XhpcUserAccountStatement xhpcUserAccountStatement = new XhpcUserAccountStatement();
             xhpcUserAccountStatement.setType(StatusConstants.FLOWING_WATER_RECHARGE_TYPE);
@@ -365,6 +385,19 @@ public class WxPaymentController {
         }
     }
 
+    private void postRefreshBalance(BigDecimal money, String serialMumber) {
+        StartChargingData startChargingData =new StartChargingData();
+        startChargingData.setPileNo(serialMumber.substring(0,16));
+        startChargingData.setGunId(serialMumber.substring(16));
+        String s1 =money.multiply(new BigDecimal(100)).toString();
+        startChargingData.setBalance(Double.valueOf(s1).intValue());
+        R r = powerPileService.refreshBalance(startChargingData);
+        if(r.getCode() !=200){
+            //创建定时任务
+
+        }
+    }
+
     /**
      * 回调Api
      */
diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java
index d0e5ef0e..0c0bdfe4 100644
--- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java
+++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/mapper/XhpcUserAccountStatementMapper.java
@@ -63,4 +63,13 @@ public interface XhpcUserAccountStatementMapper {
      * @return
      */
     public List<Map<String, Object>> list(@Param("appUserId") Long appUserId);
+
+
+    /**
+     * 实时订单获取终端号
+     * @param userId
+     * @return
+     */
+    String getUserHistotyChargeOrder(@Param("userId") Long userId);
+
 }
diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml
index 6a5f541c..ae215e7b 100644
--- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml
+++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcUserAccountStatementMapper.xml
@@ -171,4 +171,10 @@
         </if>
         ORDER BY xuas.create_time DESC
     </select>
+    <select id="getUserHistotyChargeOrder" resultType="String">
+         select
+            serial_number as serialMumber
+         from xhpc_terminal
+         where terminal_id =(select terminal_id from xhpc_charge_order where user_id = #{userId} and status=0 and del_flag =0 limit 1)
+    </select>
 </mapper> 
\ No newline at end of file