rentaiming
2024-05-29 7998c03ea0b22ca4f7fc50d77d99df6501fb7fd1
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -61,22 +61,21 @@
    private IPaylogService iPaylogService;
    @Override
    public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderID,
                                             HttpServletRequest request) {
    public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) {
        Double price = 0.0;
        try {
            if(judgeContainsStr(orderID)){
            if(judgeContainsStr(orderNO)){
                price=  Double.valueOf(1);
                body = "商品支付";
                subject = "商品支付";
                body = body;
                subject = subject;
                Map<String, Object> map = new HashMap<String, Object>();
                if (type == 1) {
                    // 支付宝预下单
                    return paylogServiceImpl.alipay("1", subject, body, price, request);
                    return paylogServiceImpl.alipay(orderNO, subject, body, price, request);
                } else {
                    // 微信预下单
                    return paylogServiceImpl.wxpay(1, "1", body, price, request);
                    return paylogServiceImpl.wxpay(2, orderNO, body,openId, price, request);
                }
            }
        } catch (Exception e) {
@@ -307,17 +306,17 @@
     * @param request
     * @return
     */
    public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body, Double price,
    public static R<Map<String, Object>> wxpay(Integer apptype, String outTradeNo, String body,String openId, Double price,
                                               HttpServletRequest request) {
        // 获取预支付接口返回参数
        Map<String, Object> map = new HashMap<String, Object>();
        Map<String, Object> appPayMap = new HashMap<String, Object>();
        try {
            // 构建接口请求参数
            UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(apptype, outTradeNo, body, price,
                    Configure.wx_notify_url);
            UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(outTradeNo, body, price, Configure.wx_notify_url,
                    "JSAPI", openId);
            // 请求接口获取返回接口
            String result = requestUnifiedorderService(apptype, unifiedorderReqData);
            String result = requestUnifiedorderService(2, unifiedorderReqData);
            System.out.println(result);
            System.out.println("WxpayController.createOrder__result:\n" + result);
            // 获取预支付接口返回参数
@@ -333,7 +332,7 @@
                    (String) map.get("prepay_id"), unifiedorderReqData.getNonce_str());
            // 对获取预支付返回接口参数进行封装(生成支付订单接口数据)
            appPayMap.put("appid", appPay.getAppid());// 公众账号ID
            appPayMap.put("appid", appPay.getAppid());// 小程序ID
            appPayMap.put("nonceStr", appPay.getNoncestr());// 随机字符串(32位)
            appPayMap.put("package", appPay.get_package());// 扩展字段(暂填写固定值Sign=WXPay)
            appPayMap.put("partnerId", appPay.getPartnerid());// 商户号