Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java

@@ -1,9 +1,10 @@
 package com.czg.account.dto.shopuser;
 
+import com.czg.enums.ShopUserFlowBizEnum;
 import jakarta.validation.constraints.DecimalMax;
 import jakarta.validation.constraints.DecimalMin;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@ import java.math.BigDecimal;
  * @author Administrator
  */
 @Data
+@Builder
 public class ShopUserMoneyEditDTO {
     /**
      * 对应shopUserid
@@ -23,6 +25,12 @@ public class ShopUserMoneyEditDTO {
      */
     @NotNull
     private Integer type;
+    /**
+     * 关联id，
+     * 霸王餐时 订单id
+     * 支付/退款 tb_order_payment.id
+     */
+    private Long relationId;
     /**
      * 浮动金额
      */
@@ -30,6 +38,8 @@ public class ShopUserMoneyEditDTO {
     @DecimalMin("0.01")
     @DecimalMax("9999")
     private BigDecimal money;
+
+    private ShopUserFlowBizEnum bizEnum;
     /**
      * 备注
      */

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java

@@ -55,9 +55,11 @@ public class ShopUserFlow implements Serializable {
     private String remark;
 
     /**
-     * 关联订单编号，支付单号，退款单号
+     * 关联id，
+     * 霸王餐时 订单id
+     * 支付/退款 tb_order_payment.id
      */
-    private String relationOrderNo;
+    private Long relationId;
 
     @Column(onInsertValue = "now()")
     private LocalDateTime createTime;

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java

@@ -84,7 +84,7 @@ public class OrderPayment implements Serializable {
     public OrderPayment() {
     }
 
-    public OrderPayment(@NonNull Long shopId, @NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo,
+    public OrderPayment(@NonNull Long shopId,@NonNull Long sourceId, @NotBlank String payType, @NotBlank String orderNo,
                         String authCode, @NonNull BigDecimal amount) {
         this.shopId = shopId;
         this.sourceId = sourceId;