From d8a8ffcf8bb3632e0982b946a2e0c343c75180e1 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 17 九月 2020 00:07:59 +0800
Subject: [PATCH] 加入微信扫码支付
---
service-front/src/main/java/com/java110/front/controller/PaymentController.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/PaymentController.java b/service-front/src/main/java/com/java110/front/controller/PaymentController.java
index 9d4dda8..b66eb48 100644
--- a/service-front/src/main/java/com/java110/front/controller/PaymentController.java
+++ b/service-front/src/main/java/com/java110/front/controller/PaymentController.java
@@ -1,11 +1,12 @@
package com.java110.front.controller;
-import com.java110.front.smo.payment.IToNotifySMO;
-import com.java110.front.smo.payment.IToPaySMO;
-import com.java110.front.smo.payment.IToPayTempCarInoutSMO;
import com.java110.core.base.controller.BaseController;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.front.smo.payment.IRentingToPaySMO;
+import com.java110.front.smo.payment.IToNotifySMO;
+import com.java110.front.smo.payment.IToPaySMO;
+import com.java110.front.smo.payment.IToPayTempCarInoutSMO;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
@@ -31,6 +32,9 @@
private IToPaySMO toPaySMOImpl;
@Autowired
+ private IRentingToPaySMO rentingToPaySMOImpl;
+
+ @Autowired
private IToPayTempCarInoutSMO toPayTempCarInoutSMOImpl;
@Autowired
@@ -46,8 +50,8 @@
public ResponseEntity<String> toPay(@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)){
+ String appId = request.getHeader("APP_ID");
+ if (StringUtil.isEmpty(appId)) {
appId = request.getHeader("APP-ID");
}
@@ -68,7 +72,7 @@
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)){
+ if (StringUtil.isEmpty(appId)) {
appId = request.getHeader("APP-ID");
}
IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
@@ -89,9 +93,29 @@
logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
- return toNotifySMOImpl.toNotify(postInfo,request);
+ return toNotifySMOImpl.toNotify(postInfo, request);
}
+ /**
+ * <p>鍑虹缁熶竴涓嬪崟鍏ュ彛</p>
+ *
+ * @param request
+ * @throws Exception
+ */
+ @RequestMapping(path = "/rentingToPay", method = RequestMethod.POST)
+ public ResponseEntity<String> rentingToPay(@RequestBody String postInfo, HttpServletRequest request) {
+ 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 rentingToPaySMOImpl.toPay(newPd);
+ }
+
}
--
Gitblit v1.8.0