From 5d7c58dfa04648e5831a66a87597ccb5581a7f16 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期四, 30 三月 2023 15:13:03 +0800
Subject: [PATCH] 默认变更列表

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

diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 8d18b3b..53481b7 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -6,6 +6,7 @@
 import com.boying.common.SystemConfigProperties;
 import com.boying.entity.*;
 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;
@@ -44,7 +45,13 @@
      */
     @GetMapping("/getByQueryId")
     public Object getByQueryId(Long queryId){
+        if(queryId == null){
+            return R.failed("鍙傛暟涓虹┖");
+        }
         OutPark byId = outParkService.getById(queryId);
+        if(byId.getTime() > 0){
+            byId.setTimeStr(DateUtilOther.millisToDayHrMinSec(new Double(byId.getTime()).longValue()));
+        }
         return R.ok(byId,"璇锋眰鎴愬姛");
     }
 
@@ -80,7 +87,10 @@
             }
         }
         if(outPark.getStatus() == 0){
-            return R.ok("璺宠浆閭偍鏀粯", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+outPark.getPayCode());
+//            return R.ok("璺宠浆閭偍鏀粯", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+outPark.getPayCode());
+           // return R.ok("璺宠浆閭偍鏀粯", "http://wxtest.smeia.cn/h5/?appid=CUP11234601101&params={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"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(outPark.getStatus() == 1){
             return R.failed("宸茬即璐�");
         }else {
@@ -102,7 +112,7 @@
             //淇敼璁㈠崟鐘舵�� 0鎴愬姛
             if(success==0){
                 updateOrderRecord(queryId,"03");
-                return R.ok(null,"璇锋眰鎴愬姛");
+                return R.ok(null,"鍥炶皟鎴愬姛");
             }else {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
                 String logs = sdf.format(new Date())+" 鍑哄満id涓猴細"+queryId+",缂磋垂澶辫触------銆媆n";
@@ -110,7 +120,7 @@
                 writeTxt(logs);
             }
         }
-        return R.ok(byId,"璇锋眰鎴愬姛");
+        return R.ok(byId,"鍥炶皟鎴愬姛");
     }
 
     /**

--
Gitblit v1.9.1