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-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java

@@ -5,6 +5,7 @@ import com.czg.annotation.SaCheckMainShop;
 import com.czg.market.dto.MkDistributionConfigDTO;
 import com.czg.market.service.MkDistributionAmountFlowService;
 import com.czg.market.service.MkDistributionConfigService;
+import com.czg.market.service.MkDistributionUserService;
 import com.czg.market.vo.*;
 import com.czg.order.dto.MkDistributionPayDTO;
 import com.czg.resp.CzgResult;
@@ -30,6 +31,8 @@ public class DistributionController {
     @Resource
     private MkDistributionConfigService configService;
     @Resource
+    private MkDistributionUserService distributionUserService;
+    @Resource
     private MkDistributionAmountFlowService distributionAmountFlowService;
 
     /**
@@ -64,7 +67,7 @@ public class DistributionController {
         AssertUtil.isNull(payParam.getShopId(), "店铺id不能为空");
         AssertUtil.isNull(payParam.getAmount(), "充值金额不能为空");
         AssertUtil.isTrue(payParam.getAmount().compareTo(BigDecimal.ZERO) == 0, "金额不为0");
-        return CzgResult.success(configService.cashPayOrder(StpKit.USER.getLoginIdAsLong(), payParam));
+        return CzgResult.success(distributionUserService.cashPayOrder(StpKit.USER.getLoginIdAsLong(), payParam));
     }
 
     /**

cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionUserController.java

@@ -0,0 +1,79 @@
+package com.czg.controller.admin;
+
+import com.czg.annotation.SaAdminCheckPermission;
+import com.czg.log.annotation.OperationLog;
+import com.czg.market.dto.MkDistributionUserDTO;
+import com.czg.market.entity.MkDistributionUser;
+import com.czg.market.service.MkDistributionUserService;
+import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
+import com.czg.utils.AssertUtil;
+import com.czg.validator.group.DefaultGroup;
+import com.czg.validator.group.UpdateGroup;
+import com.mybatisflex.core.paginate.Page;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 分销员
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/admin/distribution/user")
+public class DistributionUserController {
+    @Resource
+    private MkDistributionUserService distributionUserService;
+
+    /**
+     * 分销员:获取分销员分页列表
+     */
+    @GetMapping
+    public CzgResult<Page<MkDistributionUserDTO>> getDistributionUser(MkDistributionUserDTO param) {
+        return CzgResult.success(distributionUserService.getDistributionUser(param));
+    }
+
+    /**
+     * 分销员:添加分销员
+     *
+     * @return 是否成功
+     */
+    @PostMapping
+    @OperationLog("分销员-添加")
+    @SaAdminCheckPermission(value = "distribution:user:add", name = "分销员添加")
+    public CzgResult<Void> addDistributionUser(@RequestBody MkDistributionUser param) {
+        Long shopId = StpKit.USER.getShopId(0L);
+        param.setShopId(shopId);
+        distributionUserService.addDistributionUser(param);
+        return CzgResult.success();
+    }
+
+
+    /**
+     * 分销员:修改
+     */
+    @PutMapping
+    @OperationLog("分销员-修改")
+    @SaAdminCheckPermission("distribution:user:update")
+    public CzgResult<Void> updateDistributionUser(@RequestBody @Validated({UpdateGroup.class, DefaultGroup.class}) MkDistributionUserDTO dto) {
+        Long shopId = StpKit.USER.getShopId(0L);
+        dto.setShopId(shopId);
+        distributionUserService.updateDistributionUserById(dto);
+        return CzgResult.success();
+    }
+
+    /**
+     * 分销员:删除
+     */
+    @DeleteMapping
+    @OperationLog("分销员-删除")
+    @SaAdminCheckPermission("distribution:user::delete")
+    public CzgResult<String> deleteDistributionUser(@RequestParam Long id) {
+        AssertUtil.isNull(id, "{}不能为空", "id");
+        distributionUserService.deleteDistributionUser(id);
+        return CzgResult.success();
+    }
+
+
+}