From bb344d8e73bf3a6825f21584609649cb5d5042f5 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 05 六月 2023 18:05:37 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/job/YCGetEticketScheduled.java | 6 +++++-
src/main/java/com/boying/job/YCEticketScheduled.java | 35 +++++++++++++++++++++++++++++++----
2 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/job/YCEticketScheduled.java b/src/main/java/com/boying/job/YCEticketScheduled.java
index 0c390fd..fbc019b 100644
--- a/src/main/java/com/boying/job/YCEticketScheduled.java
+++ b/src/main/java/com/boying/job/YCEticketScheduled.java
@@ -15,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -44,7 +45,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("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
@@ -53,6 +54,7 @@
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(OrderRecord::getTicketStatus, 2)
+ .eq(OrderRecord::getType,1)
.isNotNull(OrderRecord::getEinvoicecode)
.orderByDesc(OrderRecord::getCreateTime);
List<OrderRecord> list = orderRecordService.list(wrapper);
@@ -71,6 +73,32 @@
public void doTicket(OrderRecord orderRecord){
String urlIp = systemConfigProperties.getIp4();
+ String urlRoad = systemConfigProperties.getMEINVOICESTATUS();
+ Map<String,Object> map1 = new HashMap<>();
+ map1.put("bizcode",orderRecord.getBizCode());
+ RestTemplate restTemplate = new RestTemplate();
+ ResponseEntity<ReturnData> entity = restTemplate.postForEntity(urlIp+urlRoad, HTTPEntityUtil.setEntity(map1), ReturnData.class);
+ SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
+ String txt = sdf3.format(new Date())+"鐢宠寮�绁ㄧ即娆剧爜涓猴細"+orderRecord.getPayCode()+",\n";
+ if(entity.getBody().getCode() == 1){
+ System.out.println(entity.getBody());
+ //鐢宠鎴愬姛锛屽幓鑾峰彇寮�绁ㄦ枃浠�
+ txt += entity.getBody()+",\n";
+ Object o = entity.getBody().getData().get(0);
+ String s = JSON.toJSONString(o);
+ Map<String,Object> mapTypes = (Map)JSON.parse(s);
+ txt += mapTypes+",\n";
+ writeTxt(txt);
+ doTicketGet(mapTypes,orderRecord);
+ }else {
+ System.out.println(entity.getBody());
+ txt += "鏌ヨ鏈夎锛�"+entity.getBody()+"\n";
+ writeTxt(txt);
+ }
+ }
+
+ public void doTicketGet(Map<String,Object> map,OrderRecord orderRecord){
+ String urlIp = systemConfigProperties.getIp4();
String urlRoad = systemConfigProperties.getGETEINVOICEBYBIZCODE();
Map<String,Object> map1 = new HashMap<>();
map1.put("einvoicecode", orderRecord.getEinvoicecode());
@@ -88,16 +116,15 @@
Object o1 = entity.getBody().getData().get(0);
String s1 = JSON.toJSONString(o1);
EticketFile eticketFile = JSONObject.parseObject(s1, EticketFile.class);
- System.out.println(eticketFile);
+ // System.out.println(eticketFile);
txt += eticketFile+"\n";
FileInfo fileInfo = FileUtil.generateBase64StringToFile(eticketFile.getEinvoicefile(), 1,1);
if(fileInfo != null){
- System.out.println(fileInfo);
fileInfoService.saveOrUpdate(fileInfo);
orderRecord.setFileId(fileInfo.getId());
orderRecord.setTicketStatus(1);
orderRecordService.saveOrUpdate(orderRecord);
- txt += fileInfo+"\n";
+ txt += fileInfo.getFileName()+"\n";
writeTxt(txt);
}
}else {
diff --git a/src/main/java/com/boying/job/YCGetEticketScheduled.java b/src/main/java/com/boying/job/YCGetEticketScheduled.java
index 8c35dcd..9c18d85 100644
--- a/src/main/java/com/boying/job/YCGetEticketScheduled.java
+++ b/src/main/java/com/boying/job/YCGetEticketScheduled.java
@@ -17,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -37,7 +38,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("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
@@ -46,6 +47,7 @@
QueryWrapper<OrderRecord> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(OrderRecord::getTicketStatus, 2)
+ .eq(OrderRecord::getType,1)
.orderByDesc(OrderRecord::getCreateTime);
List<OrderRecord> list = orderRecordService.list(wrapper);
if (list.size() > 0) {
@@ -98,6 +100,7 @@
directTicket.setChecker("涔斿畞");
directTicket.setPayinfo(json);
directTicket.setState(1);
+ directTicket.setBilltypeid("1252");
String jsonStr = JSON.toJSONString(directTicket, SerializerFeature.WriteDateUseDateFormat);
Map<String, Object> map = JSON.parseObject(jsonStr, new TypeReference<Map<String, Object>>() {});
@@ -119,6 +122,7 @@
orderRecord.setEinvoiceid((String) mapTypes.get("einvoiceid"));
orderRecord.setEinvoicefilename((String) mapTypes.get("einvoicefilename"));
orderRecord.setBillfiletype(1);
+ orderRecord.setBizCode(l);
txt += orderRecord+",\n";
writeTxt(txt);
--
Gitblit v1.9.1