修改可见的积分详情

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

@@ -26,6 +26,7 @@ public enum CaclEnum {
     ORDER_REFUND_INTEGRAL_CONSUMER(19,"订单退款","订单退款，收回消费者获得的冻结积分"),
     ORDER_REFUND_INTEGRAL_ANCESTER(20,"订单退款","订单退款，收回消费者的推荐人，获得的冻结积分"),
     ORDER_PAY_INTEGRAL_CONSUMER(21, "购物获得","消费者购物,获得冻结积分"),//购物者本人 获得积分
+    SMALL_QUOTA_CRASH_SETTLE(22, "合赢奖结算获得","每天计算的合赢奖7天后结算"),
     ;
 
     /**

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ptprofitlog/PtProfitLogMapper.java

@@ -32,7 +32,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
             profitStatus = Arrays.asList(
                     RECOMMENDED_PERSON_QUOTA.getType(),
                     DIRECT_REFERRAL_QUOTA.getType(),
-                    SMALL_QUOTA_CRASH.getType(),
+                    SMALL_QUOTA_CRASH_SETTLE.getType(),
                     ORDER_PAY_INTEGRAL.getType(),
                     ORDER_REFUND_INTEGRAL.getType(),
                     ORDER_CANCEL_BY_USER_REFUND_INTEGRAL.getType(),
@@ -43,6 +43,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
             profitStatus = Arrays.asList(
                     RECOMMENDED_PERSON_QUOTA.getType(),
                     DIRECT_REFERRAL_QUOTA.getType(),
+                    SMALL_QUOTA_CRASH.getType(),
                     ORDER_PAY_INTEGRAL_ANCESTER.getType(),
                     ORDER_REFUND_INTEGRAL_CONSUMER.getType(),
                     ORDER_REFUND_INTEGRAL_ANCESTER.getType(),
@@ -55,6 +56,7 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                     PLATFORM_TOTAL_ADD.getType(),
                     PLATFORM_SERVICE_FEE.getType(),
                     PLATFORM_REVENUE.getType(),
+                    SMALL_QUOTA_CRASH_SETTLE.getType(),
                     AFTER_CRASH_CALC_PT_TOTAL_QUOTA.getType(),
                     AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA.getType(),
                     GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT.getType(),
@@ -81,7 +83,8 @@ public interface PtProfitLogMapper extends BaseMapperX<PtProfitLogDO> {
                 .eqIfPresent(PtProfitLogDO::getPercentTemplate, reqVO.getPercentTemplate())
                 .eqIfPresent(PtProfitLogDO::getUserId, reqVO.getUserId())
                 .inIfPresent(PtProfitLogDO::getProfitStatus, profitStatus)
-                .orderByDesc(PtProfitLogDO::getCreateTime);
+                .orderByDesc(PtProfitLogDO::getCreateTime)
+                .orderByDesc(PtProfitLogDO::getId);
         return selectPage(reqVO, queryWrapper);
     }
 

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

@@ -101,16 +101,18 @@ public class SharePathServiceImpl implements SharePathService {
         duserService.hasUserAndCreat(createReqVO);
 
         // 存储他们之间的关系
-        sharePathMapper.addNode(
-                createReqVO.getAncestor(),
-                ancestor.getName(),
-                ancestor.getNickname(),
-                ancestor.getMobile(),
-
-                createReqVO.getDescendant(),
-                descendant.getName(),
-                descendant.getNickname(),
-                descendant.getMobile());
+        if (!Objects.equals(createReqVO.getDescendant(), PT_ID)) {
+            sharePathMapper.addNode(
+                    createReqVO.getAncestor(),
+                    ancestor.getName(),
+                    ancestor.getNickname(),
+                    ancestor.getMobile(),
+
+                    createReqVO.getDescendant(),
+                    descendant.getName(),
+                    descendant.getNickname(),
+                    descendant.getMobile());
+        }
 
         OrderPercentageDO orderPercentageDO = orderPercentageMapper.selectList().get(0);
         duserService.updateDuserSocial(createReqVO.getAncestor(), Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()), SocialStatusEnum.REGISTER_ANCESTOR_SOCIAL.getStatus());