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

# Conflicts:
#	cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionConfigService.java
#	cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java

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

@@ -7,6 +7,7 @@ import java.sql.Timestamp;
 
 import com.czg.TimeQueryParam;
 import lombok.experimental.Accessors;
+
 import java.io.Serial;
 import java.time.LocalDateTime;
 
@@ -32,7 +33,7 @@ public class MkDistributionUserDTO extends TimeQueryParam implements Serializabl
     /**
      * 分销员ID，主键自增
      */
-    private Integer id;
+    private Long id;
 
     /**
      * 上级ID 关联本表id字段，无上级时为NULL
@@ -57,7 +58,7 @@ public class MkDistributionUserDTO extends TimeQueryParam implements Serializabl
     /**
      * 分销等级名称
      */
-    private Long distributionLevelName;
+    private String distributionLevelName;
 
     /**
      * 总收益
@@ -91,7 +92,7 @@ public class MkDistributionUserDTO extends TimeQueryParam implements Serializabl
 
 
     /**
-     *  默认 0 不分钱 1 正常分销员 9 被取消的分销员
+     * 默认 0 不分钱 1 正常分销员 9 被取消的分销员
      */
     private Integer status;
 
@@ -105,4 +106,13 @@ public class MkDistributionUserDTO extends TimeQueryParam implements Serializabl
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 用户名称
+     */
+    private String shopUserName;
+     /**
+     * 手机号
+     */
+    private String shopUserPhone;
+
 }

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

@@ -49,6 +49,10 @@ public class MkDistributionLevelConfig implements Serializable {
      * 有效人数
      */
     private Integer inviteCount;
+     /**
+     * 等级
+     */
+    private Integer level;
 
     /**
      * 消费金额

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

@@ -37,7 +37,7 @@ public class MkDistributionUser implements Serializable {
      * 分销员ID，主键自增
      */
     @Id(keyType = KeyType.Auto)
-    private Integer id;
+    private Long id;
 
     /**
      * 上级ID 关联本表id字段，无上级时为NULL
@@ -62,7 +62,7 @@ public class MkDistributionUser implements Serializable {
     /**
      * 分销等级名称
      */
-    private Long distributionLevelName;
+    private String distributionLevelName;
 
     /**
      * 总收益

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

@@ -1,10 +1,13 @@
 package com.czg.market.service;
 
 import com.czg.market.dto.MkDistributionUserDTO;
-import com.czg.market.dto.ShopCouponDTO;
+import com.czg.market.entity.MkDistributionUser;
+import com.czg.order.dto.MkDistributionPayDTO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
-import com.czg.market.entity.MkDistributionUser;
+
+import java.math.BigDecimal;
+import java.util.Map;
 
 /**
  * 分销员表 服务层。
@@ -38,4 +41,17 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
      */
     void deleteDistributionUser(Long id);
 
+
+    Map<String, Object> pay(long userId, MkDistributionPayDTO payDTO);
+
+    Boolean cashPayOrder(long adminId, MkDistributionPayDTO payParam);
+
+    /**
+     * 分销员开通
+     * @param userId 用户
+     * @param amount 金额
+     * @param shopId 店铺id
+     */
+    void open(Long userId, BigDecimal amount, Long shopId, Long sourceId);
+
 }