添加退款版本号

src/main/java/com/szwl/controller/TOrderController.java

@@ -2978,11 +2978,23 @@ public class TOrderController {
         if (order.getStatus() == 3) {
             return "success";
         }
-
+        // 判断退款版本号是否存在
+        String refundOrderNo = order.getRefundOrderNo();
+        if(StringUtils.isNotEmpty(refundOrderNo)) {
+            if(refundSn.equals(refundOrderNo)) {
+                try {
+                    esTOrderService.updateDataById(order);
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
+                return "success";
+            }
+        }
         // 订单商品数量
         Integer productNumber = order.getProductNumber();
         if (JoinpayConstant.r6_Status_100.equals(r6_Status)) {
-
+            // 设置退款版本号
+            order.setRefundOrderNo(refundSn);
             // 已退款
             if(productNumber >= refundNumber){
                 productNumber -= refundNumber;

src/main/java/com/szwl/model/entity/TOrder.java

@@ -1,7 +1,9 @@
 package com.szwl.model.entity;
 
 import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2022-06-17
+ * @since 2023-05-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -59,12 +61,12 @@ public class TOrder implements Serializable {
 
     private Long productId;
 
+    private String productDesc;
+
     private String productName;
 
     private String productNo;
 
-    private String productDesc;
-
     private Date refundDate;
 
     private String sn;
@@ -75,9 +77,6 @@ public class TOrder implements Serializable {
 
     private String trxNo;
 
-    //'订单状态；0：排队中（机器上传的，代表机器已收到订单），-1：排队中（默认），1：正在制作，2：已制作',
-    private String orderStatus;
-
     private String refundTrxNo;
 
     private String es;
@@ -85,20 +84,32 @@ public class TOrder implements Serializable {
     private BigDecimal refundAmount;
 
     private String note;
-    @ApiModelProperty(value = "支付平台; 0或null为汇聚，1为杉德支付,2为香港QFPay,3为直接对接微信支付平台")
+
+    @ApiModelProperty(value = "支付平台  0或null为汇聚，1为杉德支付")
     private String payPlatform;
 
+    @ApiModelProperty(value = "是否结算 0或null为未结算，1已结算。仅杉德支付有这个")
     private String isSettlement;
 
-    private String proportionDesc;
-
     private Long wxId;
 
+    private String proportionDesc;
+
     private BigDecimal marketingAmount;
 
+    private String coupons;
+
+    @ApiModelProperty(value = "退款营销金额")
     private BigDecimal refundMarketingAmount;
 
-    private String coupons;
+    @ApiModelProperty(value = "订单状态；0：排队中，1：正在制作，2：已制作")
+    private String orderStatus;
 
+    @ApiModelProperty(value = "商品数量")
     private Integer productNumber;
+
+    @ApiModelProperty(value = "退款订单版本号")
+    private String refundOrderNo;
+
+
 }