From cddcf22a61489ee9c2dfee169d817ccd66f95430 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 02:23:43 +0800
Subject: [PATCH] 优化代码

---
 service-front/src/main/java/com/java110/front/controller/app/PaymentController.java |   90 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 85 insertions(+), 5 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..7729259
--- 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
@@ -15,6 +15,7 @@
  */
 package com.java110.front.controller.app;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.base.controller.BaseController;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
@@ -63,6 +64,10 @@
 
     @Autowired
     private IToQrPayOweFeeSMO toQrPayOweFeeSMOImpl;
+    @Autowired
+    private IToPayInGoOutSMO toPayInGoOutSMOImpl;
+    @Autowired
+    private IToPayBackCitySMO toPayBackCitySMOImpl;
 
     /**
      * <p>缁熶竴涓嬪崟鍏ュ彛</p>
@@ -80,8 +85,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);
     }
 
@@ -104,6 +108,48 @@
                 "", "", "", pd.getSessionId(),
                 appId);
         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);
     }
 
     /**
@@ -139,9 +185,25 @@
         logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + postInfo);
 
         return toNotifySMOImpl.toNotify(postInfo, request);
-
-
     }
+
+    /**
+     * <p>鏀粯鍥炶皟Api</p>
+     *
+     * @param request
+     * @throws Exception
+     */
+    @RequestMapping(path = "/notifyChinaUms", method = RequestMethod.POST)
+    public ResponseEntity<String> notifyChinaUms(HttpServletRequest request) {
+        JSONObject paramIn = new JSONObject();
+        for(String key :request.getParameterMap().keySet()){
+            paramIn.put(key,request.getParameter(key));
+        }
+        logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + paramIn.toJSONString());
+
+        return toNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
+    }
+
 
     /**
      * <p>鍑虹缁熶竴涓嬪崟鍏ュ彛</p>
@@ -164,6 +226,23 @@
     }
 
     /**
+     * <p>娆犺垂閾惰仈鍥炶皟</p>
+     *
+     * @param request
+     * @throws Exception
+     */
+    @RequestMapping(path = "/oweFeeNotifyChinaUms", method = RequestMethod.POST)
+    public ResponseEntity<String> oweFeeNotifyChinaUms( HttpServletRequest request) {
+        JSONObject paramIn = new JSONObject();
+        for(String key :request.getParameterMap().keySet()){
+            paramIn.put(key,request.getParameter(key));
+        }
+        logger.debug("寰俊鏀粯鍥炶皟鎶ユ枃" + paramIn.toJSONString());
+
+        return oweFeeToNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
+    }
+
+    /**
      * <p>鍑虹缁熶竴涓嬪崟鍏ュ彛</p>
      *
      * @param request
@@ -173,8 +252,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