From a71d96f0ea6b24f073ed4c4ab26ff63bcfd91ea6 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期一, 12 六月 2023 11:41:56 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/job/PayResult2Scheduled.java | 2 +-
src/main/java/com/boying/controller/phone/EticketController.java | 30 +++++++++++++++---------------
src/main/java/com/boying/controller/phone/PayController.java | 4 ++--
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/EticketController.java b/src/main/java/com/boying/controller/phone/EticketController.java
index 4b68085..29bbde2 100644
--- a/src/main/java/com/boying/controller/phone/EticketController.java
+++ b/src/main/java/com/boying/controller/phone/EticketController.java
@@ -35,7 +35,7 @@
SimpleDateFormat sdf2 = new SimpleDateFormat("hh:mm:ss");
String format = sdf.format(new Date());
String format2 = sdf2.format(new Date());
- String idStr = 146920+"";
+ String idStr = 25238+"";
String dateStr = DateUtil.currentSeconds()+"";
String l = idStr + dateStr;
@@ -57,7 +57,7 @@
directTicket.setIssuedate(format);
directTicket.setIssuetime(format2);
directTicket.setPayerpartytype("1");
- directTicket.setPayer("鍐�A0CM05");
+ directTicket.setPayer("鍐�DM118N");
directTicket.setAmt(3);
directTicket.setUsername("寮犲▏");
directTicket.setChecker("涔斿畞");
@@ -89,19 +89,19 @@
}
/**
- * ReturnData(code=1, msg=鑾峰彇鎴愬姛, total=0, data=[{randomnumber=407348, einvoicefilename=, einvoiceid=3649845000-32211031, einvoicenumber=0005489463, eticketnum=171041683249011, state=0, einvoicecode=13011223}], singleData=null)
- * bizcode:171041683249011
- * einvoicecode:13011223
- * einvoicenumber:0005489463
- * randomnumber:407348
- * einvoiceid:3649845000-32211031
- * einvoicefilename:
+ * ReturnData(code=1, msg=鑾峰彇鎴愬姛, total=0, data=[{randomnumber=859719, einvoicefilename=130113230001813560, einvoiceid=0653181000-32311031, einvoicenumber=0001813560, eticketnum=252381686303715, state=1, einvoicecode=13011323}], singleData=null)
+ * bizcode:252381686303715
+ * einvoicecode:13011323
+ * einvoicenumber:0001813560
+ * randomnumber:859719
+ * einvoiceid:0653181000-32311031
+ * einvoicefilename:130113230001813560
*/
}
- public static void main91(String[] args) {
+ public static void main(String[] args) {
Map<String,Object> map1 = new HashMap<>();
- map1.put("bizcode","1469201684477973");
+ map1.put("bizcode","252381686303715");
RestTemplate restTemplate = new RestTemplate();
ResponseEntity<ReturnData> entity = restTemplate.postForEntity("http://10.255.200.204:7991/search/meinvoicestatus", HTTPEntityUtil.setEntity(map1), ReturnData.class);
System.out.println(entity.getBody());
@@ -110,12 +110,12 @@
}
- public static void main(String[] args) {
+ public static void main91(String[] args) {
Map<String,Object> map1 = new HashMap<>();
map1.put("einvoicecode", "13011323");
- map1.put("einvoicenumber","0001479604");
- map1.put("bizcode", "1469201684477973");
- map1.put("randomnumber","279929");
+ map1.put("einvoicenumber","0001813560");
+ map1.put("bizcode", "252381686303715");
+ map1.put("randomnumber","859719");
map1.put("billfiletype",1);
SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
RestTemplate restTemplate = new RestTemplate();
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index f774b51..03b4ff2 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -417,9 +417,9 @@
writeTxt(logs);
return R.failed("鏈綒鍗曟棤闇�鏀粯璐圭敤");
}
- if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getStatus() == 0){
+ if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getPayStatus() == 0){
return R.ok("鐢熸垚鐢靛瓙缃氬崟缂存鐮�", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+ticket.getPayCode());
- }else if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getStatus() == 1){
+ }else if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getPayStatus() == 1){
return R.failed("宸茬即璐�");
}
if(StringUtils.isBlank(ticket.getPayCode())){
diff --git a/src/main/java/com/boying/job/PayResult2Scheduled.java b/src/main/java/com/boying/job/PayResult2Scheduled.java
index aa6814e..ba64efd 100644
--- a/src/main/java/com/boying/job/PayResult2Scheduled.java
+++ b/src/main/java/com/boying/job/PayResult2Scheduled.java
@@ -45,7 +45,7 @@
taskFlag = true;
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Ticket::getStatus,0)
+ .eq(Ticket::getPayStatus,0)
.ne(Ticket::getMoney,0)
.isNotNull(Ticket::getPayCode)
.orderByDesc(Ticket::getCreateTime);
--
Gitblit v1.9.1