Merge remote-tracking branch 'origin/test' into test

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

@@ -30,6 +30,7 @@ public class ShopUserMoneyEditDTO implements Serializable {
      * 关联id，
      * 订单支付/订单退款/霸王餐时 订单id
      * 支付/退款 tb_order_payment.id
+     * 消费返现为返现记录id
      */
     private Long relationId;
     /**

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkConsumeCashbackRecord.java

@@ -14,6 +14,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 消费返现明细 实体类。
@@ -26,6 +27,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("mk_consume_cashback_record")
+@Accessors(chain = true)
 public class MkConsumeCashbackRecord implements Serializable {
 
     @Serial

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkConsumeCashbackService.java

@@ -7,6 +7,8 @@ import com.czg.market.vo.MkConsumeCashbackVO;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.MkConsumeCashback;
 
+import java.math.BigDecimal;
+
 /**
  *  服务层。
  *
@@ -17,4 +19,14 @@ public interface MkConsumeCashbackService extends IService<MkConsumeCashback> {
     MkConsumeCashbackVO detail(Long shopId);
 
     Boolean edit(Long shopId, MkConsumeCashbackDTO consumeDiscountDTO) throws ApiNotPrintException;
+
+    /**
+     * 消费返现
+     * @param shopId 店铺id
+     * @param userId 用户id
+     * @param amount 金额
+     * @param orderId 订单id
+     * @param orderNo 订单号
+     */
+    void cashback(Long shopId, Long userId, BigDecimal amount, Long orderId, String orderNo);
 }

cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java

@@ -70,4 +70,19 @@ public interface TableValueConstant {
             }
         }
     }
+
+    interface MkConsumeCashback {
+        @Getter
+        enum CashbackType {
+            FIX("fix", "待推送"),
+            PERCENTAGE("percentage", "推送成功");
+            private final String code;
+            private final String msg;
+
+            CashbackType(String code, String msg) {
+                this.code = code;
+                this.msg = msg;
+            }
+        }
+    }
 }

cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 public enum ShopUserFlowBizEnum {
     // 会员充值
     CASH_IN("cashIn", "会员充值"),
+    CASHBACK("cashback", "消费返现"),
     FREE_IN("freeIn", "霸王餐充值"),
     // 重置奖励
     AWARD_IN("awardIn", "充值奖励"),