Explorar el Código

feature: 微信充值
1.自助机二维码充值完善
2.小程序页面支付

luoyb hace 1 año
padre
commit
afb5970a91

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

@@ -191,7 +191,9 @@ public class ThirdPayBusiness {
             log.error("[更新订单状状态失败]-[收款方流水号和系统不一致]-[{}]", JSONUtil.toJsonStr(bo));
             return R.fail("[更新订单状状态失败]-[收款方流水号和系统不一致]");
         }
-        bo.setBackUrl(vo.getBackUrl() + bo.getOrderId() + "/" + bo.getPaySn());
+        if (ObjectUtil.notEqual(vo.getPayStatus(), PayStatusEnum.SUCCESS.code().toString())) {
+            bo.setBackUrl(vo.getBackUrl() + bo.getOrderId() + "/" + bo.getPaySn());
+        }
         vo = payOrderService.updateOrderStatus(bo);
         if (ObjectUtil.isEmpty(vo)) {
             log.error("[更新订单支付状态失败]-[{}]", JSONUtil.toJsonStr(bo));

+ 9 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/ThirdPayController.java

@@ -55,7 +55,16 @@ public class ThirdPayController extends BaseController {
 
         return thirdPayBusiness.payCallBackHandler(bo);
     }
+    @RequestMapping("/back/{orderSn}/{paySn}")
+    public R<PayOrderVo> callBackThirdPay(@PathVariable("orderSn") String orderSn, @PathVariable("paySn") String paySn){
+        PayOrderBo bo = new PayOrderBo();
+        bo.setOrderId(Long.valueOf(orderSn));
+        bo.setPaySn(paySn);
+        bo.setPayStatus(PayStatusEnum.SUCCESS.code().toString());
+        bo.setCreditTime(DateUtil.date());
 
+        return thirdPayBusiness.payCallBackHandler(bo);
+    }
     /**
      * 查询充值订单支付状态
      * @param orderSn 充值订单