feature: 微信充值

1.联调

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/payments/ThirdPayBusiness.java

@@ -316,7 +316,8 @@ public class ThirdPayBusiness {
 
         req.body(JSONUtil.toJsonStr(bo));
         try (HttpResponse res = req.execute()) {
-            JSONObject object = JSONUtil.parseObj(res.body());
+            String strReturn = res.body();
+            //JSONObject object = JSONUtil.parseObj(res.body());
             //String resCode = object.getStr("code");
             //String resData = object.getStr("data");
             //if (ObjectUtil.equals(resCode, "200")) {
@@ -327,7 +328,7 @@ public class ThirdPayBusiness {
             //    return R.ok();
             //}
             //return R.fail(String.format("[生成微信收款码错误]-[%s]", object));
-            return R.ok();
+            return R.ok(strReturn,strReturn);
         } catch (Exception e) {
             log.error("[微信支付错误]-[{0}]", e);
             return R.fail("[微信支付错误]");

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/wx/contorller/WxController.java

@@ -97,25 +97,14 @@ public class WxController extends BaseController {
 
     @PostMapping("/pay")
     public R<String> wxPay(HttpServletRequest request, @RequestParam String ssoId, @RequestParam String transValue) {
-        //String userAgent = request.getHeader("user-agent");
-        //String userId = LoginHelper.getUserId().toString();
+        String userAgent = request.getHeader("user-agent");
+        String userId = LoginHelper.getUserId().toString();
         String openId = Base64.decodeStr(ssoId);
-        //Map<String, String> mapParams = new HashMap<>();
-        //mapParams.put("userId", userId);
-        //mapParams.put("ssoId", openId);
-        //mapParams.put("dealValue", transValue);
-        //mapParams.put("userAgent", userAgent);
-        //return thirdPayBusiness.createDirectPayment(mapParams);
-        String callBackUrl = "http://10.32.23.157:8080/pay-server/pay/back/1881509159999418369";
-        String payUrl = "https://portal.hnswdx.gov.cn/pay/toPay.html?openid=" + URLUtil.encode(openId) + "&price=" + transValue + "&title="
-            + URLUtil.encode("微信支付") + "&userAgent=MicroMessenger&detailsId=3&callBackUrl=" + callBackUrl;
-        log.info("支付地址");
-        HttpRequest req = HttpUtil.createGet(payUrl).header("user-agent", request.getHeader("user-agent"));
-        try (HttpResponse res = req.execute()) {
-            return R.ok(res.body());
-        } catch (Exception e) {
-            log.error("[微信支付错误]-[{0}]", e);
-            return R.fail(e.getLocalizedMessage());
-        }
+        Map<String, String> mapParams = new HashMap<>();
+        mapParams.put("userId", userId);
+        mapParams.put("ssoId", openId);
+        mapParams.put("dealValue", transValue);
+        mapParams.put("userAgent", userAgent);
+        return thirdPayBusiness.createDirectPayment(mapParams);
     }
 }