java110 лет назад: 5
Родитель
Сommit
837efd8540

+ 1 - 1
service-front/src/main/java/com/java110/front/configuration/ServiceConfiguration.java

@@ -25,7 +25,7 @@ public class ServiceConfiguration {
         exclusions.append("/callComponent/download/getFile/fileByObjId,");//放开 下载图片也不需要登录
         exclusions.append("/app/payment/notify,");//微信支付通知
         exclusions.append("/app/payment/rentingNotify,");//微信支付通知
-        exclusions.append("/app/payment/oweFeeToPay,");//欠费微信支付通知
+        exclusions.append("/app/payment/oweFeeNotify,");//欠费微信支付通知
         exclusions.append("/app/loginWx,");// 登录跳过
         exclusions.append("/app/getWxPhoto,");// 登录跳过
         exclusions.append("/app/loginProperty,");// 物业APP登录跳过

+ 7 - 11
service-front/src/main/java/com/java110/front/controller/PaymentController.java

@@ -43,6 +43,9 @@ public class PaymentController extends BaseController {
     @Autowired
     private IRentingToNotifySMO rentingToNotifySMOImpl;
 
+    @Autowired
+    private IOweFeeToNotifySMO oweFeeToNotifySMOImpl;
+
 
 
     /**
@@ -150,18 +153,11 @@ public class PaymentController extends BaseController {
      * @param request
      * @throws Exception
      */
-    @RequestMapping(path = "/oweFeeToPay", method = RequestMethod.POST)
-    public ResponseEntity<String> oweFeeToPay(@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");
-        }
+    @RequestMapping(path = "/oweFeeNotify", method = RequestMethod.POST)
+    public ResponseEntity<String> oweFeeNotify(@RequestBody String postInfo, HttpServletRequest request) {
+        logger.debug("微信支付回调报文" + postInfo);
 
-        IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
-                "", "", "", pd.getSessionId(),
-                appId);
-        return rentingToPaySMOImpl.toPay(newPd);
+        return oweFeeToNotifySMOImpl.toNotify(postInfo,request);
     }
     /**
      * <p>支付回调Api</p>

+ 1 - 1
service-front/src/main/resources/wechatAuth.properties

@@ -7,7 +7,7 @@ java110.auth.wechat.mchId=mchId
 java110.auth.wechat.wxPayUnifiedOrder=https://api.mch.weixin.qq.com/pay/unifiedorder
 java110.auth.wechat.wxNotifyUrl=https://app.demo.winqi.cn/app/payment/notify
 java110.auth.wechat.rentingNotifyUrl=https://app.demo.winqi.cn/app/payment/rentingNotify
-java110.auth.wechat.oweFeeNotifyUrl=https://app.demo.winqi.cn/app/payment/oweFeeToPay
+java110.auth.wechat.oweFeeNotifyUrl=https://app.demo.winqi.cn/app/payment/oweFeeNotify
 
 # ¹«ÖÚºÅÐÅÏ¢
 java110.auth.wechat.wechatAppId=key