分销系统V.1.0.0

src/main/java/com/caimei365/user/controller/DistributionApi.java

@@ -5,14 +5,12 @@ import com.caimei365.user.model.dto.ClubTemporaryDto;
 import com.caimei365.user.model.dto.OnlineDto;
 import com.caimei365.user.model.po.CmDistribution;
 import com.caimei365.user.model.po.ServiceProviderPo;
-import com.caimei365.user.model.vo.ClubTemporaryVo;
-import com.caimei365.user.model.vo.ClubVo;
-import com.caimei365.user.model.vo.CmBehaviorRecordVo;
-import com.caimei365.user.model.vo.ServiceProviderVo;
+import com.caimei365.user.model.vo.*;
 import com.caimei365.user.service.CmDistributionService;
 import com.caimei365.user.service.SellerService;
 import com.caimei365.user.utils.RequestUtil;
 import com.caimei365.user.utils.ValidateUtil;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -41,17 +39,19 @@ public class DistributionApi {
 
 
     /**
-     * 机构访问详情
+     * 团队成员列表
      */
     @GetMapping("/getDistributionList")
-    public ResponseJson<List<CmDistribution>> getDistributionList(CmDistribution cmDistribution) {
+    public ResponseJson<List<CmDistributionVO>> getDistributionList(CmDistribution cmDistribution) {
         if (null == cmDistribution.parentId()) {
             return ResponseJson.error("参数异常！", null);
         }
+//        PageHelper.startPage(pageNum, pageSize);
+//        PaginationVo<CmDistributionVO> paginationVo = new PaginationVo(archiveList);
         List<CmDistribution> cmDistributionList = cmDistributionService.getCmDistributionList(new CmDistribution()
                 .parentId(cmDistribution.parentId())
         );
-        return ResponseJson.success(cmDistributionList);
+        return ResponseJson.success( CmDistributionVO.setValues(cmDistributionList));
     }
 
 
@@ -59,14 +59,14 @@ public class DistributionApi {
      * 协销个人中心
      */
     @GetMapping("/home")
-    public ResponseJson<CmDistribution> getHome(CmDistribution cmDistribution) {
-        if (null == cmDistribution.userId() || null == cmDistribution.id()) {
+    public ResponseJson<CmDistributionVO> getHome(CmDistribution cmDistribution) {
+        if (null == cmDistribution.userId()) {
             return ResponseJson.error("参数异常：用户Id不能为空！", null);
         }
-        return ResponseJson.success(cmDistributionService.getByCmDistribution(new CmDistribution()
+        return ResponseJson.success(CmDistributionVO.setValue(cmDistributionService.getByCmDistribution(new CmDistribution()
                 .id(cmDistribution.id())
                 .userId(cmDistribution.userId())
-        ));
+        )));
     }
 
     /**
@@ -89,11 +89,11 @@ public class DistributionApi {
      * 更新协销信息
      */
     @PostMapping("/setPassword")
-    public ResponseJson setPassword(CmDistribution cmDistribution, String password, String code) {
+    public ResponseJson setPassword(CmDistribution cmDistribution, String oldPassword, String code) {
         if (null == code) {
             return ResponseJson.error("验证码不能为空！", null);
         }
-        if (!password.equals(cmDistribution.password())) {
+        if (!oldPassword.equals(cmDistribution.password())) {
             return ResponseJson.error("两次输入的密码不一致！", null);
         }
         cmDistributionService.setPassword(new CmDistribution()
@@ -122,7 +122,7 @@ public class DistributionApi {
     }
 
     /**
-     * 更新协销信息
+     * 新增协销信息
      */
     @PostMapping("/save")
     public ResponseJson save(CmDistribution cmDistribution) {

src/main/java/com/caimei365/user/model/vo/CmDistributionVO.java

@@ -0,0 +1,110 @@
+package com.caimei365.user.model.vo;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+import com.caimei365.user.model.po.CmDistribution;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.io.Serializable;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.apache.ibatis.type.Alias;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * distribution对象 cm_distribution
+ *
+ * @author Kaick
+ * @date 2023-09-25
+ */
+@Data
+@Alias("CmDistributionVO")
+public class CmDistributionVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 联系人
+     */
+    private String linkMan;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 分账号
+     */
+    private String splitCode;
+
+    /**
+     * 状态：90上线，91下线
+     */
+    private Integer status;
+
+    /**
+     * 分销二维码
+     */
+    private String qrCode;
+
+    /**
+     * 头像
+     */
+    private String image;
+
+    /**
+     * 父级团队Id：0表示团队
+     */
+    private Integer parentId;
+
+    /**
+     * 父级团队Id集合
+     */
+    private String parentIds;
+
+    public static List<CmDistributionVO> setValues(List<CmDistribution> cmDistributionList) {
+        List<CmDistributionVO> cmDistributionVOList = new ArrayList<>();
+        cmDistributionList.forEach(cmDistribution -> {
+            cmDistributionVOList.add(setValue(cmDistribution));
+        });
+        return cmDistributionVOList;
+    }
+
+    public static CmDistributionVO setValue(CmDistribution cmDistribution) {
+            CmDistributionVO cmDistributionVO = new CmDistributionVO();
+            cmDistributionVO.setId(cmDistribution.getId());
+            cmDistributionVO.setUserId(cmDistribution.getUserId());
+            cmDistributionVO.setName(cmDistribution.getName());
+            cmDistributionVO.setLinkMan(cmDistribution.getLinkMan());
+            cmDistributionVO.setMobile(cmDistribution.getMobile());
+            cmDistributionVO.setSplitCode(cmDistribution.getSplitCode());
+            cmDistributionVO.setStatus(cmDistribution.getStatus());
+            cmDistributionVO.setQrCode(cmDistribution.getQrCode());
+            cmDistributionVO.setImage(cmDistribution.getImage());
+            cmDistributionVO.setParentId(cmDistribution.getParentId());
+            cmDistributionVO.setParentIds(cmDistribution.getParentIds());
+        return cmDistributionVO;
+    }
+}