Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

wuxw

2022-01-15 630cb0babb264657d8a07476e328654573620f8c

 service-api/src/main/java/com/java110/api/controller/app/PaymentController.java

@@ -68,11 +68,17 @@
    private IOweFeeToNotifySMO oweFeeToNotifySMOImpl;

    @Autowired
    private ITempCarFeeToNotifySMO tempCarFeeToNotifySMOImpl;

    @Autowired
    private IToQrPayOweFeeSMO toQrPayOweFeeSMOImpl;
    @Autowired
    private IToPayInGoOutSMO toPayInGoOutSMOImpl;
    @Autowired
    private IToPayBackCitySMO toPayBackCitySMOImpl;

    @Autowired
    private IToPayTempCarFeeSMO toPayTempCarFeeSMOImpl;

    /**
     * <p>统一下单入口</p>
@@ -111,8 +117,29 @@

        IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getUserName(), pd.getToken(), postInfo,
                "", "", "", pd.getSessionId(),
                appId,pd.getHeaders());
                appId, pd.getHeaders());
        return toPayOweFeeSMOImpl.toPay(newPd);
    }

    /**
     * <p>统一下单入口</p>
     *
     * @param request
     * @throws Exception
     */
    @RequestMapping(path = "/toPayTempCarFee", method = RequestMethod.POST)
    public ResponseEntity<String> toPayTempCarFee(@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, pd.getHeaders());
        return toPayTempCarFeeSMOImpl.toPay(newPd);
    }

    /**
@@ -215,8 +242,8 @@


        String preStr = buildSignString(params);
        paramIn.put("preSign",preStr);
        paramIn.put("sign",sign);
        paramIn.put("preSign", preStr);
        paramIn.put("sign", sign);
        //判断签名是否相等

        // 收到通知后记得返回SUCCESS
@@ -267,8 +294,8 @@


        String preStr = buildSignString(params);
        paramIn.put("preSign",preStr);
        paramIn.put("sign",sign);
        paramIn.put("preSign", preStr);
        paramIn.put("sign", sign);

        return oweFeeToNotifySMOImpl.toNotify(paramIn.toJSONString(), request);
    }
@@ -287,6 +314,19 @@
    }

    /**
     * <p>出租统一下单入口</p>
     *
     * @param request
     * @throws Exception
     */
    @RequestMapping(path = "/tempCarFeeNotifyUrl", method = RequestMethod.POST)
    public ResponseEntity<String> tempCarFeeNotifyUrl(@RequestBody String postInfo, HttpServletRequest request) {
        logger.debug("微信支付回调报文" + postInfo);

        return tempCarFeeToNotifySMOImpl.toNotify(postInfo, request);
    }

    /**
     * <p>支付回调Api</p>
     *
     * @param request