代码优化

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderRefund.java

@@ -35,6 +35,11 @@ public class OrderRefund extends TenantEntity {
      */
     private Long userId;
 
+    /**
+     * 原始订单编号
+     */
+    private String originOrderNo;
+
     /**
      * 订单编号
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderRefundBo.java

@@ -37,6 +37,12 @@ public class OrderRefundBo extends BaseEntity {
     @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long userId;
 
+    /**
+     * 原始订单编号
+     */
+    @NotBlank(message = "原始订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String originOrderNo;
+
     /**
      * 订单编号
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderRefundVo.java

@@ -39,6 +39,12 @@ public class OrderRefundVo implements Serializable {
     @ExcelProperty(value = "用户id")
     private Long userId;
 
+    /**
+     * 原始订单编号
+     */
+    @ExcelProperty(value = "原始订单编号")
+    private String originOrderNo;
+
     /**
      * 订单编号
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteOrderServiceImpl.java

@@ -169,6 +169,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
             .setPayInfo(IPayStrategy.pay(JSON.toJSONString(ot), feeList, remoteOrder.getTradeType().name()));
     }
 
+    @GlobalTransactional(rollbackFor = Exception.class)
     @Override
     public Boolean createRefundOrder(RemoteSaveRefundOrder remoteOrder) throws Exception {
         OrderVo order = orderService.queryList(new OrderBo()
@@ -193,6 +194,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
 
         or = new OrderRefundVo()
             .setUserId(order.getUserId())
+            .setOriginOrderNo(order.getOriginOrderNo())
             .setOrderNo(order.getOrderNo())
             .setOrderPayNo(order.getOrderPayNo())
             .setOrderRefundNo(System.currentTimeMillis() + "")

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/JsapiPayStrategy.java

@@ -62,7 +62,7 @@ public class JsapiPayStrategy implements IPayStrategy {
             throw new RuntimeException("退款金额不能小于等于0");
         }
         RefundModel model = new RefundModel()
-            .setOut_trade_no(or.getOrderNo())
+            .setOut_trade_no(or.getOriginOrderNo())
             .setOut_refund_no(or.getOrderRefundNo())
             .setAmount(new RefundAmount().setRefund(amount).setTotal(amount).setCurrency("CNY"));
         return JsonUtils.toJsonString(wxPayService.refund(model));