From 8c38c034ff9e608598309e1005abebcda882c613 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期六, 11 一月 2020 22:22:30 +0800
Subject: [PATCH] 优化 微信回调参数处理

---
 AppFrontService/src/main/java/com/java110/app/controller/PaymentController.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AppFrontService/src/main/java/com/java110/app/controller/PaymentController.java b/AppFrontService/src/main/java/com/java110/app/controller/PaymentController.java
index 42a8029..40959b9 100644
--- a/AppFrontService/src/main/java/com/java110/app/controller/PaymentController.java
+++ b/AppFrontService/src/main/java/com/java110/app/controller/PaymentController.java
@@ -1,9 +1,13 @@
 package com.java110.app.controller;
 
 import com.java110.app.smo.complaint.ISaveComplaintSMO;
+import com.java110.app.smo.payment.IToNotifySMO;
+import com.java110.app.smo.payment.IToPaySMO;
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
+import com.java110.core.context.PageData;
 import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.util.PayUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +18,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Map;
 
 /**
  * 鏀粯 澶勭悊绫�
@@ -23,7 +30,11 @@
 public class PaymentController extends BaseController {
     private final static Logger logger = LoggerFactory.getLogger(PaymentController.class);
 
+    @Autowired
+    private IToPaySMO toPaySMOImpl;
 
+    @Autowired
+    private IToNotifySMO toNotifySMOImpl;
 
     /**
      * <p>缁熶竴涓嬪崟鍏ュ彛</p>
@@ -33,7 +44,12 @@
      */
     @RequestMapping(path = "/toPay", method = RequestMethod.POST)
     public ResponseEntity<String> toPay(@RequestBody String postInfo, HttpServletRequest request) {
-        return null;
+        IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+        /*IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);*/
+        IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
+                "", "", "", pd.getSessionId(),
+                request.getHeader("APP_ID"));
+        return toPaySMOImpl.toPay(newPd);
     }
 
 
@@ -45,7 +61,12 @@
      */
     @RequestMapping(path = "/notify", method = RequestMethod.POST)
     public ResponseEntity<String> notify(@RequestBody String postInfo, HttpServletRequest request) {
-        return null;
+
+        logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
+
+        return toNotifySMOImpl.toNotify(postInfo,request);
+
+
     }
 
 }

--
Gitblit v1.8.0