Prechádzať zdrojové kódy

fix(order): 添加订单退款表单校验并更新微信支付回调地址- 为退款订单接口添加@Validated注解以启用参数校验
- 在RefundOrderForm中为orderCode和orderProInfoIds字段添加@NotBlank校验
- 更新微信支付v3的支付通知和退款通知回调地址到正式域名
- 移除AppOrderController中未使用的资源注入

wzq 1 týždeň pred
rodič
commit
dac600c2ec

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/OrderController.java

@@ -237,7 +237,7 @@ public class OrderController {
      */
     @Operation(summary = "订单退款")
     @PostMapping("/refundOrder")
-    public Result<String> refundOrder(@RequestBody RefundOrderForm refundOrderForm) {
+    public Result<String> refundOrder(@Validated @RequestBody RefundOrderForm refundOrderForm) {
         return Result.OK(appOrderService.refundOrder(refundOrderForm));
     }
 

+ 3 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/form/RefundOrderForm.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.app.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serial;
 import java.io.Serializable;
 
@@ -13,11 +14,13 @@ public class RefundOrderForm implements Serializable {
     /**
      * 订单编号
      */
+    @NotBlank(message = "订单编号不能为空")
     private String orderCode;
 
     /**
      * 子订单ID(逗号分隔)
      */
+    @NotBlank(message = "子订单ID不能为空")
     private String orderProInfoIds;
 
     /**

+ 2 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WechatUrlConstants.java

@@ -17,10 +17,10 @@ public class WechatUrlConstants {
     public final static String PAY_V3_QUERY_OUT = "https://api.mch.weixin.qq.com/v3/pay/partner/transactions/out-trade-no/{out_trade_no}";
 
     //微信支付v3 支付通知接口地址
-    public final static String PAY_V3_NOTIFY = "https://6a34b652.r28.cpolar.top/jeecgboot/app/order/wechatPayNotify";
+    public final static String PAY_V3_NOTIFY = "https://admin.qlapp.cn/jeecgboot/app/order/wechatPayNotify";
 
     //微信支付v3 退款通知接口地址
-    public final static String PAY_V3_REFUND_NOTIFY = "https://6a34b652.r28.cpolar.top/jeecgboot/app/order/callback/refundOrderNotify";
+    public final static String PAY_V3_REFUND_NOTIFY = "https://admin.qlapp.cn/jeecgboot/app/order/callback/refundOrderNotify";
 
     //服务商 添加分账接收方
     public final static String PAY_V3_RECEIVERS_ADD = "https://api.mch.weixin.qq.com/v3/profitsharing/receivers/add";

+ 0 - 7
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppOrderController.java

@@ -324,13 +324,6 @@ public class AppOrderController extends JeecgController<AppOrder, IAppOrderServi
         return Result.OK(page);
     }
 
-    @Resource
-    private IInsureOrderInfoService insureOrderInfoService;
-    @Resource
-    private IInsurePriceService insurePriceService;
-    @Resource
-    private ISysUserService sysUserService;
-
     @Transactional(rollbackFor = Exception.class)
     @Operation(summary = "订单管理-订单改价")
     @PostMapping(value = "/priceChange")