From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/controller/app/PaymentController.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java b/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java
old mode 100644
new mode 100755
index 0a8ff7a..e93c4cb
--- a/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java
+++ b/service-front/src/main/java/com/java110/front/controller/app/PaymentController.java
@@ -63,6 +63,10 @@
@Autowired
private IToQrPayOweFeeSMO toQrPayOweFeeSMOImpl;
+ @Autowired
+ private IToPayInGoOutSMO toPayInGoOutSMOImpl;
+ @Autowired
+ private IToPayBackCitySMO toPayBackCitySMOImpl;
/**
* <p>缁熶竴涓嬪崟鍏ュ彛</p>
@@ -80,8 +84,7 @@
}
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
- "", "", "", pd.getSessionId(),
- appId);
+ "", "", "", pd.getSessionId(), appId, pd.getPayerObjId(), pd.getPayerObjType(), pd.getEndTime());
return toPaySMOImpl.toPay(newPd);
}
@@ -106,6 +109,46 @@
return toPayOweFeeSMOImpl.toPay(newPd);
}
+ /**
+ * <p>缁熶竴涓嬪崟鍏ュ彛</p>
+ *
+ * @param request
+ * @throws Exception
+ */
+ @RequestMapping(path = "/toQrInGoOutPay", method = RequestMethod.POST)
+ public ResponseEntity<String> toQrInGoOutPay(@RequestBody String postInfo, HttpServletRequest request) {
+ IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+ /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+ String appId = request.getHeader("APP_ID");
+ if (StringUtil.isEmpty(appId)) {
+ appId = request.getHeader("APP-ID");
+ }
+
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
+ "", "", "", pd.getSessionId(),
+ appId);
+ return toPayInGoOutSMOImpl.toPay(newPd);
+ }
+ /**
+ * <p>缁熶竴涓嬪崟鍏ュ彛</p>
+ *
+ * @param request
+ * @throws Exception
+ */
+ @RequestMapping(path = "/toQrBackCityPay", method = RequestMethod.POST)
+ public ResponseEntity<String> toQrBackCityPay(@RequestBody String postInfo, HttpServletRequest request) {
+ IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+ /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+ String appId = request.getHeader("APP_ID");
+ if (StringUtil.isEmpty(appId)) {
+ appId = request.getHeader("APP-ID");
+ }
+
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
+ "", "", "", pd.getSessionId(),
+ appId);
+ return toPayBackCitySMOImpl.toPay(newPd);
+ }
/**
* <p>缁熶竴涓嬪崟鍏ュ彛</p>
*
@@ -173,8 +216,9 @@
public ResponseEntity<String> oweFeeNotify(@RequestBody String postInfo, HttpServletRequest request) {
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
- return oweFeeToNotifySMOImpl.toNotify(postInfo,request);
+ return oweFeeToNotifySMOImpl.toNotify(postInfo, request);
}
+
/**
* <p>鏀粯鍥炶皟Api</p>
*
--
Gitblit v1.8.0