From 630cb0babb264657d8a07476e328654573620f8c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 15 一月 2022 13:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/controller/app/PaymentController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java b/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java
index cac290e..eab4595 100644
--- a/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java
+++ b/service-api/src/main/java/com/java110/api/controller/app/PaymentController.java
@@ -68,6 +68,9 @@
private IOweFeeToNotifySMO oweFeeToNotifySMOImpl;
@Autowired
+ private ITempCarFeeToNotifySMO tempCarFeeToNotifySMOImpl;
+
+ @Autowired
private IToQrPayOweFeeSMO toQrPayOweFeeSMOImpl;
@Autowired
private IToPayInGoOutSMO toPayInGoOutSMOImpl;
@@ -114,7 +117,7 @@
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
"", "", "", pd.getSessionId(),
- appId,pd.getHeaders());
+ appId, pd.getHeaders());
return toPayOweFeeSMOImpl.toPay(newPd);
}
@@ -135,7 +138,7 @@
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
"", "", "", pd.getSessionId(),
- appId,pd.getHeaders());
+ appId, pd.getHeaders());
return toPayTempCarFeeSMOImpl.toPay(newPd);
}
@@ -239,8 +242,8 @@
String preStr = buildSignString(params);
- paramIn.put("preSign",preStr);
- paramIn.put("sign",sign);
+ paramIn.put("preSign", preStr);
+ paramIn.put("sign", sign);
//鍒ゆ柇绛惧悕鏄惁鐩哥瓑
// 鏀跺埌閫氱煡鍚庤寰楄繑鍥濻UCCESS
@@ -291,8 +294,8 @@
String preStr = buildSignString(params);
- paramIn.put("preSign",preStr);
- paramIn.put("sign",sign);
+ paramIn.put("preSign", preStr);
+ paramIn.put("sign", sign);
return oweFeeToNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
}
@@ -320,7 +323,7 @@
public ResponseEntity<String> tempCarFeeNotifyUrl(@RequestBody String postInfo, HttpServletRequest request) {
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
- return oweFeeToNotifySMOImpl.toNotify(postInfo, request);
+ return tempCarFeeToNotifySMOImpl.toNotify(postInfo, request);
}
/**
--
Gitblit v1.8.0