feature: 微信支付

微信支付联调

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

@@ -317,17 +317,6 @@ public class ThirdPayBusiness {
         req.body(JSONUtil.toJsonStr(bo));
         try (HttpResponse res = req.execute()) {
             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")) {
-            //    Map<String, String> map = new HashMap<>();
-            //    map.put("orderSn", vo.getOrderId().toString());
-            //    map.put("qrCode", resData);
-            //
-            //    return R.ok();
-            //}
-            //return R.fail(String.format("[生成微信收款码错误]-[%s]", object));
             return R.ok(strReturn,strReturn);
         } catch (Exception e) {
             log.error("[微信支付错误]-[{0}]", e);

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

@@ -33,7 +33,7 @@ import java.util.Map;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@ResponseResult
+//@ResponseResult
 @RequestMapping("/wx")
 public class WxController extends BaseController {
     private final IWxService wxService;
@@ -95,8 +95,8 @@ public class WxController extends BaseController {
         return wxService.getIdCode(userId);
     }
 
-    @PostMapping("/pay")
-    public R<String> wxPay(HttpServletRequest request, @RequestParam String ssoId, @RequestParam String transValue) {
+    @RequestMapping("/pay")
+    public String wxPay(HttpServletRequest request, @RequestParam String ssoId, @RequestParam String transValue) {
         String userAgent = request.getHeader("user-agent");
         String userId = LoginHelper.getUserId().toString();
         String openId = Base64.decodeStr(ssoId);
@@ -105,6 +105,9 @@ public class WxController extends BaseController {
         mapParams.put("ssoId", openId);
         mapParams.put("dealValue", transValue);
         mapParams.put("userAgent", userAgent);
-        return thirdPayBusiness.createDirectPayment(mapParams);
+
+        R<String> strReturn = thirdPayBusiness.createDirectPayment(mapParams);
+        log.info("[微信支付请求返回]-[{}]", strReturn.getData());
+        return strReturn.getData();
     }
 }