Merge branch 'master' of http://10.0.5.229:10880/Harper/feifan-backend-zx-admin into dev/2024/0417/update-admin

# Conflicts:
#	feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathService.java

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/CaclEnum.java

@@ -14,7 +14,6 @@ public enum CaclEnum {
     HIGH_QUOTA(6, "最高可以获得积分"),
     SMALL_QUOTA_CRASH(7, "小区额度分配"),
     AFTER_CRASH_CALC_PT_TOTAL_QUOTA(8, "碰撞后计算平台总收益"),
-
     ;
 
     /**

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/SharePathController.java

@@ -128,8 +128,10 @@ public class SharePathController {
     @GetMapping("/getTree")
     @Operation(summary = "获取分销人员关系树")
     @PreAuthorize("@ss.hasPermission('distri:share-path:query')")
-    public CommonResult<TreeNode> getTree(@RequestParam("userId") Long userId) {
-        TreeNode sharePath = sharePathService.getTree(userId);
+    public CommonResult<TreeNode> getTree(@RequestParam("userId") Long userId,
+                                          @RequestParam("minDepth") Integer minDepth,
+                                          @RequestParam("maxDepth") Integer maxDepth) {
+        TreeNode sharePath = sharePathService.getTree(userId,minDepth,maxDepth);
         return success(sharePath);
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/sharepath/SharePathMapper.java

@@ -72,7 +72,7 @@ public interface SharePathMapper extends BaseMapperX<SharePathDO> {
     List<Long> findLessSortedSiblings(@Param("descendantId") Long descendantId);
 
 
-    List<TreeNode> selectDescendants(@Param("ancestor")  Long userId);
+    List<TreeNode> selectDescendants(@Param("ancestor") Long userId, @Param("minDepth") Integer minDepth, @Param("maxDepth") Integer maxDepth);
 }
 
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/duser/DuserServiceImpl.java

@@ -94,7 +94,7 @@ public class DuserServiceImpl implements DuserService {
 
     @Override
     public DuserDO getDuser(Long id) {
-        return duserMapper.selectById(id);
+        return duserMapper.selectOne(new LambdaQueryWrapperX<DuserDO>().eq(DuserDO::getUserId,id));
     }
 
     @Override

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ordercalc/OrderCalcServiceImpl.java

@@ -150,8 +150,6 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             // 计算兄弟分区， 以及后代分区
             partitionCrashService.calcCrash(userId);
         }
-
-
     }
 
     @Override

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogService.java

@@ -2,6 +2,7 @@ package cn.newfeifan.mall.module.distri.service.ptprofitlog;
 
 import java.util.*;
 import javax.validation.*;
+
 import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
@@ -61,12 +62,14 @@ public interface PtProfitLogService {
      * @param caclEnum    日志模板
      * @param amount      增加额度
      * @param afterAmount 增加之后的额度
-     * @param jsonString
+     * @param jsonString  百分比计算模板
      */
     void addMessage(Long userId, CaclEnum caclEnum, Integer amount, Integer afterAmount, String jsonString);
+    void addMessage(Long userId, CaclEnum caclEnum, Integer amount, Integer afterAmount);
 
     /**
      * 获取昨日的日志信息
+     *
      * @param sonsId
      * @return
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogServiceImpl.java

@@ -35,6 +35,8 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
     private PtProfitLogMapper ptProfitLogMapper;
 
 
+
+
     @Override
     public Long createPtProfitLog(PtProfitLogSaveReqVO createReqVO) {
         // 插入
@@ -93,6 +95,15 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                 .profitStatus(caclEnum.getType())
                 .build();
         ptProfitLogMapper.insert(BeanUtils.toBean(ptProfitLog, PtProfitLogDO.class));
+        // todo 发送通知
+        // todo 发短信
+
+    }
+
+    @Override
+    public void addMessage(Long userId, CaclEnum caclEnum, Integer amount, Integer afterAmount) {
+
+
 
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathService.java

@@ -54,7 +54,6 @@ public interface SharePathService {
     PageResult<SharePathDO> getSharePathPage(SharePathPageReqVO pageReqVO);
 
 
-    TreeNode getTree(Long userId);
 
 
     /**
@@ -100,4 +99,6 @@ public interface SharePathService {
     List<Long> sonsId(Long userId);
 
     PageResult<SharePathRespVO> getDescendants(SharePathPageReqVO pageReqVO);
+    TreeNode getTree(Long userId, Integer minDepth, Integer maxDepth);
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -155,11 +155,15 @@ public class SharePathServiceImpl implements SharePathService {
         return sharePathMapper.selectPage(pageReqVO);
     }
 
+
     @Override
-    public TreeNode getTree(Long userId) {
+    public TreeNode getTree(Long userId, Integer minDepth, Integer maxDepth) {
         // 如果user为空, 则查询全部信息
+        if (userId == null) {
+            userId = PT_ID;
+        }
         DuserDO sharePathDO = duserService.getDuser(userId);
-        List<TreeNode> treeNodes = sharePathMapper.selectDescendants(userId);
+        List<TreeNode> treeNodes = sharePathMapper.selectDescendants(userId, minDepth, maxDepth);
         TreeNode build = TreeNode.builder()
                 .phone(sharePathDO.getMobile())
                 .name(sharePathDO.getName())

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/sharepath/SharePathMapper.xml

@@ -113,15 +113,17 @@
     <select id="selectDescendants"
             resultMap="TreeNodeMap">
         WITH RECURSIVE SubPath AS (
-            SELECT descendant, desc_name, depth
-            FROM distri_share_path
-            WHERE ancestor = #{ancestor}
-            UNION ALL
-            SELECT d.descendant, d.desc_name, d.depth
-            FROM distri_share_path d
-                     INNER JOIN SubPath sp ON sp.descendant = d.ancestor
+        SELECT descendant, desc_name, depth
+        FROM distri_share_path
+        WHERE ancestor = #{ancestor} AND depth <![CDATA[>=]]> #{minDepth}
+        UNION ALL
+        SELECT d.descendant, d.desc_name, d.depth
+        FROM distri_share_path d
+        INNER JOIN SubPath sp ON sp.descendant = d.ancestor
+        WHERE d.depth <![CDATA[<=]]> #{maxDepth}
         )
         SELECT * FROM SubPath
+        WHERE depth <![CDATA[<=]]> #{maxDepth};
 
     </select>
 </mapper>

feifan-server/src/main/resources/application-local.yaml

@@ -146,7 +146,7 @@ spring:
     admin:
       # Spring Boot Admin Client 客户端的相关配置
       client:
-        url: http://10.0.5.227:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
+        url: http://10.0.5.228:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
         instance:
           service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
       # Spring Boot Admin Server 服务端的相关配置