From 4ea4e1ab62279d4fc1f846eff83bf7d2d2dd4912 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 21 四月 2023 14:04:25 +0800
Subject: [PATCH] 默认变更列表
---
src/main/java/com/boying/job/PayResultScheduled.java | 2 +-
src/main/java/com/boying/controller/phone/YCPayController.java | 43 ++++++++++++++++++++++++++++++++-----------
src/main/java/com/boying/job/GetEticketScheduled.java | 2 +-
src/main/java/com/boying/job/EticketScheduled.java | 2 +-
4 files changed, 35 insertions(+), 14 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..ac244ab 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
@@ -91,14 +93,16 @@
}
}
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¶ms={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
+ // "http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671¶ms={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}"
+ return R.ok("璺宠浆閭偍鏀粯","https://openpayment.psbc.com/h5/static/router.html?rurl=router&router=psbc&appid=CUP14094502391¶ms={\"payMode\":\"B\",\"payItemNo\":\"41304508000500\",\"userNo\":"+id+"}");
+ // return R.ok("璺宠浆閭偍鏀粯","http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671¶ms={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
}else if(StringUtils.isNotBlank(outPark.getPayCode()) && outPark.getStatus() == 1){
return R.failed("宸茬即璐�");
}
if(StringUtils.isBlank(outPark.getPayCode())){
addOrderRecord(outPark);
- return R.ok("璺宠浆閭偍鏀粯", "http://wxtest.smeia.cn/h5/static/router.html?rurl=router&router=psbc&appid=CUP16522400671¶ms={\"payMode\":\"B\",\"payItemNo\":\"41301106100124\",\"userNo\":"+id+"}");
+ return R.ok("璺宠浆閭偍鏀粯","https://openpayment.psbc.com/h5/static/router.html?rurl=router&router=psbc&appid=CUP14094502391¶ms={\"payMode\":\"B\",\"payItemNo\":\"41304508000500\",\"userNo\":"+id+"}");
}else {
return R.failed("鍑洪敊");
}
@@ -131,17 +135,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 +170,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);
@@ -285,4 +294,16 @@
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);
+ for (String line : lines) {
+ System.out.println(line);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
diff --git a/src/main/java/com/boying/job/EticketScheduled.java b/src/main/java/com/boying/job/EticketScheduled.java
index 059aa00..22737de 100644
--- a/src/main/java/com/boying/job/EticketScheduled.java
+++ b/src/main/java/com/boying/job/EticketScheduled.java
@@ -43,7 +43,7 @@
private FileInfoService fileInfoService;
private Boolean taskFlag = false;
- @Scheduled(cron = "0/10 * * * * ?")
+ // @Scheduled(cron = "0/10 * * * * ?")
public void execute() throws Exception {
if(taskFlag == true){
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
diff --git a/src/main/java/com/boying/job/GetEticketScheduled.java b/src/main/java/com/boying/job/GetEticketScheduled.java
index c4b12d3..0fd02e2 100644
--- a/src/main/java/com/boying/job/GetEticketScheduled.java
+++ b/src/main/java/com/boying/job/GetEticketScheduled.java
@@ -39,7 +39,7 @@
private SystemConfigProperties systemConfigProperties;
private Boolean taskFlag = false;
- @Scheduled(cron = "0 0/1 * * * ?")
+ //@Scheduled(cron = "0 0/1 * * * ?")
public void execute() throws Exception {
if (taskFlag == true) {
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
diff --git a/src/main/java/com/boying/job/PayResultScheduled.java b/src/main/java/com/boying/job/PayResultScheduled.java
index e6ae708..44eab42 100644
--- a/src/main/java/com/boying/job/PayResultScheduled.java
+++ b/src/main/java/com/boying/job/PayResultScheduled.java
@@ -36,7 +36,7 @@
Boolean taskFlag = false;
- @Scheduled(cron = "0/2 * * * * ?")
+ //@Scheduled(cron = "0/2 * * * * ?")
public void execute() throws Exception {
if(taskFlag == true){
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
--
Gitblit v1.9.1