From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app
---
src/main/java/com/boying/controller/phone/FFPayController.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/FFPayController.java b/src/main/java/com/boying/controller/phone/FFPayController.java
index 4ba73e3..2b63c31 100644
--- a/src/main/java/com/boying/controller/phone/FFPayController.java
+++ b/src/main/java/com/boying/controller/phone/FFPayController.java
@@ -20,8 +20,11 @@
import javax.persistence.criteria.Root;
import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
import java.io.UnsupportedEncodingException;
import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -190,16 +193,23 @@
@PostMapping("result")
public String result(HttpServletRequest request,String payKey,String payerTypeCode,String payerNum,String payCode,Double amt,String status,String errorInfo,String sign,String signType) throws Exception{
System.out.println(payCode+"-------"+status);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
+ String s = "payCode===="+payCode+",\n";
try {
+ s += sdf.format(new Date())+"寮�濮嬭蛋鍥炶皟鎺ュ彛------>\n";
+ writeTxt(s);
updateOrderRecord(payCode,status);
}catch (Exception e){
-
+ s += "鏇存柊璁㈠崟璁板綍鍑哄紓甯�------>";
+ writeTxt(s);
}
return "success";
}
//鏇存柊璁㈠崟璁板綍
public void updateOrderRecord(String payCode,String status){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
+ String s = sdf.format(new Date())+"鏇存柊璁㈠崟璁板綍锛歱ayCode===="+payCode+",status==="+status+",\n";
Specification<OrderRecord> specification = new Specification<OrderRecord>() {
@Override
public Predicate toPredicate(Root<OrderRecord> root, CriteriaQuery<?> cq, CriteriaBuilder cb) {
@@ -207,12 +217,15 @@
list.add(cb.equal(root.get("payCode").as(String.class), payCode));
Predicate[] arr = new Predicate[list.size()];
cq.where(list.toArray(arr));
+ cq.orderBy(cb.desc(root.get("createTime")));
return null;
}
};
List<OrderRecord> all = orderRecordService.findAll(specification);
- if(all.size()==1){
+ s += "鏌ヨ鍒拌鍗曡褰曚负锛�"+all.size()+"鏉★紝\n";
+ if(all.size()>=1){
OrderRecord orderRecord = all.get(0);
+ s += "鏌ヨ鍒拌鍗曚负锛�"+orderRecord.getId()+"锛孿n";
if(status.equals("01")){
orderRecord.setStatus(0);
}
@@ -226,9 +239,12 @@
if(orderRecord.getType()==0){
updateTicket(orderRecord.getQueryId(),status);
}else{
+ s += "淇敼鍑哄満琛細"+orderRecord.getQueryId()+"锛宻tatus==="+status+",\n";
+ writeTxt(s);
updateOutPark(orderRecord.getQueryId(),status);
}
}
+ writeTxt(s);
}
//鏇存柊缃氬崟鐨勭姸鎬�
@@ -306,13 +322,24 @@
// }
public void updateOutPark(Long outParkId,String status){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH_mm_ss");
+ String s = sdf.format(new Date())+"寮�濮嬩慨鏀瑰嚭鍦鸿〃-----銆媆n";
+ s+= "outparkId==="+outParkId+",status==="+status+",\n";
OutPark outPark = (OutPark) outParkService.findById(outParkId);
if(outPark!=null){
+ s += "鎵惧埌鍑哄満鏁版嵁锛�"+outPark.getId()+",\n";
+ writeTxt(s);
if(status.equals("03")){
+ s += "鍑哄満鏁版嵁淇敼----銆�";
+ writeTxt(s);
outPark.setStatus(1);
outParkService.save(outPark);
}
+ }else {
+ s += "鏈壘鍒板嚭鍦烘暟鎹�-----銆�";
+ writeTxt(s);
}
+
}
//鍒犻櫎杩涘仠杞﹀満鐨勬暟鎹�
@@ -336,9 +363,14 @@
//鐢熸垚鐢靛瓙缂存鐮�
@PostMapping("park")
public Object park(Long id){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+ String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
+ logs += "鍑哄満琛╥d涓猴細"+id+",\n";
OutPark outPark = (OutPark) outParkService.findById(id);
if(outPark.getPrice()==0){
updateOutPark(outPark.getId(),"03");
+ logs += "鏀粯閲戦涓�0,\n";
+ writeTxt(logs);
return error("鏈鍋滆溅鏃犻渶鏀粯璐圭敤");
}
@@ -356,13 +388,17 @@
List<WhiteList> all = whiteListService.findAll(specification);
for(WhiteList w : all){
if(w.getType()==0){
+ logs+=outPark.getCarNo()+"鍦ㄧ櫧鍚嶅崟,\n";
updateOutPark(outPark.getId(),"03");
+ writeTxt(logs);
return error("鏈鍋滆溅鏃犻渶鏀粯璐圭敤!");
}else{
if(w.getParkId()!=null){
if(w.getEndTime()!=null){
if(w.getParkId()==outPark.getParkId()&&new Date().getTime()<w.getEndTime().getTime()){
+ logs+=outPark.getCarNo()+"鍦ㄧ壒娈婅鍒欑櫧鍚嶅崟,\n";
updateOutPark(outPark.getId(),"03");
+ writeTxt(logs);
return error("鏈鍋滆溅鏃犻渶鏀粯璐圭敤!");
}
}
@@ -378,7 +414,8 @@
s.append("&payKey=df937eda27cb4a59a12347966678e232");//璐㈡斂缁欑殑
s.append("&payerName="+outPark.getCarNo());
s.append("&payerNum="+ outPark.getCode());//璁㈠崟鍙�
- s.append("&payerTypeCode=1304062100000001");////璐㈡斂缁欑殑
+ //s.append("&payerTypeCode=1304062100000001");////璐㈡斂缁欑殑
+ s.append("&payerTypeCode=072101");////璐㈡斂缁欑殑
s.append("&reserve1=");
s.append("&reserve2=");
s.append("&reserve3=");
@@ -396,6 +433,8 @@
sbf.append("&signType=MD5");
String s1 = httpsRequest(ip+"/pay/inpay","POST",sbf.toString());
if(s1.equals("error")){
+ logs += "鐢熸垚鎵ф硶鐢靛瓙缂存鐮佸け璐ワ紝璇疯仈绯荤鐞嗗憳,\n";
+ writeTxt(logs);
return error("鐢熸垚鎵ф硶鐢靛瓙缂存鐮佸け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
JSONObject jsonObject = JSON.parseObject(s1);
@@ -404,15 +443,20 @@
if(eInfo.equals("姝よ鍗曞凡杩囨湡")){
outPark.setCode(System.currentTimeMillis()+"");
outParkService.save(outPark);
+ logs += "姝よ鍗曞凡杩囨湡,\n";
+ writeTxt(logs);
return park(id);
}else{
+ logs += "姝よ鍗曟湁寮傚父閿欒,\n";
+ writeTxt(logs);
return error(eInfo);
}
}else{
String payCode = jsonObject.get("payCode").toString();
+ logs += "payCode: "+payCode+",\n";
outPark.setPayCode(payCode);
outParkService.save(outPark);
-
+ writeTxt(logs);
addOrderRecord(outPark);
return success("鐢熸垚鍋滆溅鐢靛瓙缂存鐮�","https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+payCode);
}
@@ -422,6 +466,7 @@
//鎻掑叆鍋滆溅璁㈠崟璁板綍
public void addOrderRecord(OutPark outPark){
Park park = (Park) parkService.findById(outPark.getParkId());
+
OrderRecord orderRecord = new OrderRecord();
orderRecord.setAddress(park.getName());
orderRecord.setCarNo(outPark.getCarNo());
@@ -446,4 +491,25 @@
orderRecordService.save(orderRecord);
}
+
+ private void writeTxt( String txt)
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ try
+ {
+ FileWriter f = new FileWriter(systemConfigProperties.getLogPath()+"鏀粯鏃ュ織"+sdf.format(new Date())+".txt",true);
+ BufferedWriter bw=new BufferedWriter(f);
+ bw.write(txt);
+ bw.newLine();
+ bw.close();
+ }
+ catch(Exception e)
+ {
+ System.out.println("鎵撳嵃閿欒");
+ }
+ }
+
+
+
+
}
--
Gitblit v1.9.1