处理循环依赖的问题

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ordercalc/vo/OrderCalcRespVO.java

@@ -62,9 +62,7 @@ public class OrderCalcRespVO {
     private LocalDateTime createTime;
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
-    @Schema(description = "购买数量", example = "10152")
-    @ExcelProperty("购买数量")
-    private Integer productCount;
+
     @Schema(description = "用户昵称", example = "王五")
     @ExcelProperty("用户昵称")
     private String nickName;
@@ -76,12 +74,6 @@ public class OrderCalcRespVO {
     @ExcelProperty("下单人姓名")
     private String name;
 
-    @Schema(description = "订单ID", example = "21497")
-    @ExcelProperty("订单ID")
-    private Long orderId;
 
-    @Schema(description = "下单人姓名", example = "赵六")
-    @ExcelProperty("下单人姓名")
-    private String name;
 
 }

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

@@ -19,6 +19,7 @@ import cn.newfeifan.mall.module.distri.service.partitioncrash.PartitionCrashServ
 import cn.newfeifan.mall.module.distri.service.ptprofit.PtProfitService;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
 import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -63,15 +64,18 @@ public class OrderCalcServiceImpl implements OrderCalcService {
     private PtProfitLogService ptProfitLogService;
 
     @Resource
+    @Lazy
     private SharePathService sharePathService;
 
     @Resource
     private OrderPercentageService orderPercentageService;
 
     @Resource
+    @Lazy
     private DuserService duserService;
 
     @Resource
+    @Lazy
     private IntegralService integralService;
 
     @Resource

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/partitioncrash/PartitionCrashServiceImpl.java

@@ -18,9 +18,9 @@ import cn.newfeifan.mall.module.distri.service.partitionbrothers.PartitionBrothe
 import cn.newfeifan.mall.module.distri.service.partitionson.PartitionSonService;
 import cn.newfeifan.mall.module.distri.service.ptprofit.PtProfitService;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
-import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-
+import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
 import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
@@ -56,6 +56,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
     private PartitionCrashMapper partitionCrashMapper;
 
     @Resource
+    @Lazy
     private SharePathService sharePathService;
 
     @Resource
@@ -65,12 +66,14 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
     private PartitionBrothersService partitionBrothersService;
 
     @Resource
+    @Lazy
     private DuserService duserService;
 
     @Resource
     private PtProfitLogService ptProfitLogService;
 
     @Resource
+    @Lazy
     private IntegralService integralService;
 
     @Resource

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

@@ -16,13 +16,7 @@ import cn.newfeifan.mall.framework.common.pojo.PageParam;
  */
 public interface SharePathService {
 
-    /**
-     * 创建分销用户关系
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createSharePath(@Valid SharePathSaveReqVO createReqVO);
+    Long createSharePath(SharePathSaveReqVO createReqVO);
 
     void createSharePathByUserId(SharePathSaveReqVO createReqVO);
 

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

@@ -1,19 +1,17 @@
 package cn.newfeifan.mall.module.distri.service.sharepath;
 
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
 import cn.newfeifan.mall.module.distri.service.ordercalc.OrderCalcService;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -25,7 +23,6 @@ import java.util.stream.Stream;
 import cn.newfeifan.mall.module.distri.controller.admin.sharepath.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.sharepath.SharePathMapper;
@@ -47,6 +44,7 @@ public class SharePathServiceImpl implements SharePathService {
     private SharePathMapper sharePathMapper;
 
     @Resource
+    @Lazy
     private DuserService duserService;
     @Resource
     private MemberUserService memberUserService;