From 15b3290a092ea16be998d5ce3c1df06ec3752bb5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期二, 15 八月 2023 10:37:54 +0800
Subject: [PATCH] 提交更新

---
 src/main/java/com/boying/controller/phone/YCPayController.java |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index f31113e..fb7ea9c 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -107,6 +107,18 @@
         if(StringUtils.isBlank(outPark.getPayCode())){
             String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+outPark.getCarNo()+",鐢宠缂磋垂------銆媆n";
             writeTxt(logs);
+            List<EnterPark> byCarNo = enterParkService.findByCarNo(outPark.getCarNo(),outPark.getParkId());
+            if(byCarNo.size()>0){
+                EnterPark enterPark = byCarNo.get(0);
+                if(enterPark != null && enterPark.getIsPay() == 1){
+                    if(outPark.getPrice()==enterPark.getPrice()){
+                        return R.failed("宸茬即璐�");
+                    }else {
+                        outPark.setPrice(outPark.getPrice()-enterPark.getPrice());
+                        outParkService.updateById(outPark);
+                    }
+                }
+            }
             addOrderRecord(outPark);
             return R.ok("璺宠浆閭偍鏀粯","https://openpayment.psbc.com/h5/static/router.html?rurl=router&router=psbc&appid=CUP14094502391&params={\"payMode\":\"B\",\"payItemNo\":\"41304508000500\",\"userNo\":"+id+"}");
         }else {
@@ -131,6 +143,12 @@
                 updateOrderRecord(queryId,"03");
                 String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+byId.getCarNo()+",缂磋垂鎴愬姛------銆媆n";
                 writeTxt(logs);
+                List<EnterPark> byCarNo = enterParkService.findByCarNo(byId.getCarNo(),byId.getParkId());
+                if(byCarNo.size()>0){
+                    EnterPark enterPark = byCarNo.get(0);
+                    enterPark.setIsPay(1);
+                    enterParkService.updateById(enterPark);
+                }
                 return R.ok(null,"鍥炶皟鎴愬姛");
             }else {
                 String logs = sdf.format(new Date())+" 鍑哄満id涓猴細"+queryId+",缂磋垂澶辫触------銆媆n";
@@ -259,9 +277,16 @@
         String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+outPark.getCarNo()+",鍒涘缓璁㈠崟------銆媆n";
         writeTxt(logs);
         outPark.setPayCode(outPark.getId()+"");
+        List<EnterPark> byCarNo = enterParkService.findByCarNo(outPark.getCarNo(),outPark.getParkId());
         outParkService.updateById(outPark);
         Park park = parkService.getById(outPark.getParkId());
         OrderRecord orderRecord = new OrderRecord();
+        if(byCarNo.size() >0){
+            EnterPark enterPark = byCarNo.get(0);
+            if(enterPark != null && enterPark.getImgId() != null){
+                orderRecord.setImgInId(enterPark.getImgId());
+            }
+        }
         orderRecord.setAddress(park.getName());
         orderRecord.setCarNo(outPark.getCarNo());
         orderRecord.setCode(outPark.getCode());
@@ -273,13 +298,6 @@
         orderRecord.setPayCode(outPark.getPayCode());
         if(outPark.getImgId() != null){
             orderRecord.setImgOutId(outPark.getImgId());
-        }
-        List<EnterPark> byCarNo = enterParkService.findByCarNo(outPark.getCarNo(),outPark.getParkId());
-        if(byCarNo.size() >0){
-            EnterPark enterPark = byCarNo.get(0);
-            if(enterPark != null && enterPark.getImgId() != null){
-                orderRecord.setImgInId(enterPark.getImgId());
-            }
         }
         orderRecordService.saveOrUpdate(orderRecord);
     }

--
Gitblit v1.9.1