From e6682c9434f133a25660110e39a1f0f993267a65 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 27 七月 2023 14:03:55 +0800
Subject: [PATCH] 提交更新

---
 src/main/java/com/boying/controller/phone/YCPayController.java |   72 +++++++++++++++++++++++++++++------
 1 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 802e7f5..f31113e 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -8,17 +8,19 @@
 import com.boying.service.*;
 import com.boying.util.DateUtilOther;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author kdq
@@ -38,6 +40,7 @@
     private final TicketBlackService ticketBlackService;
     private final SystemConfigProperties systemConfigProperties;
     private final WhiteListService whiteListService;
+    private final EnterParkService enterParkService;
 
     /**
      * 鏌ヨ璁㈠崟鎺ュ彛
@@ -61,6 +64,7 @@
      */
     @PostMapping("park")
     public Object park(Long id){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
         OutPark outPark =  outParkService.getById(id);
         if(outPark.getPrice()==0){
             updateOutPark(outPark.getId(),"03");
@@ -91,14 +95,20 @@
             }
         }
         if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 0){
-            return R.ok("璺宠浆閭偍鏀粯", "http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671&params={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
+            String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+outPark.getCarNo()+",鐢宠缂磋垂2------銆媆n";
+            writeTxt(logs);
+           // "http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671&params={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}"
+            return R.ok("璺宠浆閭偍鏀粯","https://openpayment.psbc.com/h5/static/router.html?rurl=router&router=psbc&appid=CUP14094502391&params={\"payMode\":\"B\",\"payItemNo\":\"41304508000500\",\"userNo\":"+id+"}");
+          //  return R.ok("璺宠浆閭偍鏀粯","http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671&params={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
         }else if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 1){
             return R.failed("宸茬即璐�");
         }
 
         if(StringUtils.isBlank(outPark.getPayCode())){
+            String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+outPark.getCarNo()+",鐢宠缂磋垂------銆媆n";
+            writeTxt(logs);
             addOrderRecord(outPark);
-            return R.ok("璺宠浆閭偍鏀粯", "http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671&params={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
+            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 {
             return R.failed("鍑洪敊");
         }
@@ -112,15 +122,17 @@
     @GetMapping("/result")
     public Object result(Long queryId,int success,int msg){
         OutPark byId = outParkService.getById(queryId);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
         if(byId == null){
             return R.failed("鏈煡璇㈠埌璁㈠崟");
         }else {
             //淇敼璁㈠崟鐘舵�� 0鎴愬姛
             if(success==0){
                 updateOrderRecord(queryId,"03");
+                String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+byId.getCarNo()+",缂磋垂鎴愬姛------銆媆n";
+                writeTxt(logs);
                 return R.ok(null,"鍥炶皟鎴愬姛");
             }else {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
                 String logs = sdf.format(new Date())+" 鍑哄満id涓猴細"+queryId+",缂磋垂澶辫触------銆媆n";
                 logs += "鍥炴墽鍘熷洜锛�"+msg+",\n";
                 writeTxt(logs);
@@ -131,17 +143,20 @@
 
     /**
      * 瀵硅处鎺ュ彛
-     * @param checkDate,tranDate,fileName
+     * @param
      * @return
      */
-    @GetMapping("/checkbill")
-    public Object checkbill(String checkDate,String tranDate,String fileName){
+    @PostMapping ("/checkbill")
+    public Object checkbill(@RequestBody Map params){
+        String checkDate = (String) params.get("checkDate");
+        String tranDate = (String) params.get("tranDate");
+        String fileName = (String) params.get("fileName");
         checkDate=checkDate.replaceAll("-","");
-        String name = "E:\\Bank_PSBC_"+checkDate+".txt";
+        String name = "E:\\ycCheckBill\\Bank_PSBC_"+checkDate+".txt";
         File file = new File(name);
         Boolean aBoolean = judeFileExists(file);
         if(aBoolean){
-            return R.ok();
+            return R.ok(null,"鏌ヨ鏂囦欢鎴愬姛");
         }else {
             return R.failed(null,"鏂囦欢涓嶅瓨鍦�");
         }
@@ -163,6 +178,8 @@
             }
             if(status.equals("03")){
                 orderRecord.setStatus(1);
+                //娴嬭瘯鐜锛屾殏鏃舵妸寮�绁ㄨ缃负2
+                orderRecord.setTicketStatus(2);
             }
             if(status.equals("04")||status.equals("05")||status.equals("06")){
                 orderRecord.setStatus(2);
@@ -238,8 +255,11 @@
 
     //鎻掑叆鍋滆溅璁㈠崟璁板綍
     public void addOrderRecord(OutPark outPark){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+        String logs = sdf.format(new Date())+" 杞︾墝鍙蜂负锛�"+outPark.getCarNo()+",鍒涘缓璁㈠崟------銆媆n";
+        writeTxt(logs);
         outPark.setPayCode(outPark.getId()+"");
-        outParkService.saveOrUpdate(outPark);
+        outParkService.updateById(outPark);
         Park park = parkService.getById(outPark.getParkId());
         OrderRecord orderRecord = new OrderRecord();
         orderRecord.setAddress(park.getName());
@@ -251,6 +271,16 @@
         orderRecord.setType(1);
         orderRecord.setTicketStatus(0);
         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);
     }
 
@@ -285,4 +315,20 @@
             System.out.println("鎵撳嵃閿欒");
         }
     }
+
+    public static void main(String[] args) {
+        Path path = Paths.get("E:\\ycCheckBill\\Bank_PSBC_20350421.txt");
+        try {
+            List<String>  lines = Files.readAllLines(path);
+            String s = lines.get(0);
+            String[] split = s.split("\\|");
+
+
+            for (String line : lines) {
+                System.out.println(line);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

--
Gitblit v1.9.1