bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusStageService.java

@@ -40,7 +40,7 @@ public interface ICuMemberBonusStageService extends IService<CuMemberBonusStage>
     /**
      * 填充指定点位
      */
-    void fillRetailDetail(CuMemberRetailDetail targetRetailDetail, String point,
+    boolean fillRetailDetail(CuMemberRetailDetail targetRetailDetail, String point,
                              CuMemberRetailDetail sourceRetailDetail, Date settleDate, EBonusStage eBonusStage,
                              List<BonusStageData> bonusStageDataList);
 

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java

@@ -1114,7 +1114,6 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
                 cuMemberBonusStage.setChildNode(bonusStageData.getTargetChildNode());
                 cuMemberBonusStage.setStage(bonusStageData.getStage());
                 cuMemberBonusStage.setStageNum(bonusStageData.getStageNum());
-                cuMemberBonusStage.setPkSourceMember(sourceMember.getPkMember());
                 stageIncomeRemark(saOrderExt, cuMemberBonusStage, sourceMember, targetMember);
                 BdBonusDeduct bdBonusDeduct = setBonusDetailDeduct(bonusConfigDTO, cuMemberBonusStage, saOrderExt != null ? saOrderExt.getOrderAmount() : null, saOrderExt != null ? saOrderExt.getInExchangeRate() : null);
                 if (EBonusIncomeStatus.NORMAL.getValue() == cuMemberBonusStage.getIncomeStatus()) {

bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java

@@ -18,7 +18,6 @@ import com.hzs.common.domain.member.achieve.ext.CuMemberRetailRangeExt;
 import com.hzs.common.domain.member.bonus.CuMemberBonus;
 import com.hzs.common.domain.member.bonus.CuMemberBonusStage;
 import com.hzs.common.domain.sale.ext.SaOrderExt;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,7 +29,6 @@ import java.util.*;
 /**
  * 会员奖金-阶段收益明细表 服务实现类
  */
-@Slf4j
 @Service
 public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStageMapper, CuMemberBonusStage> implements ICuMemberBonusStageService {
 
@@ -73,7 +71,7 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
     public CuMemberBonusStage getCuMemberBonusStage(SaOrderExt saOrderExt, CuMemberRetailRangeExt cuMemberRetailRange, CuMemberBonus cuMemberBonus, Integer pkBonusItems) {
         CuMemberBonusStage cuMemberBonusStage = CuMemberBonusStage.builder()
                 .pkBonus(cuMemberBonus.getPkId())
-                .pkOrder(null != saOrderExt ? saOrderExt.getPkId() : 0)
+                .pkOrder(saOrderExt.getPkId())
                 .pkBonusItems(pkBonusItems)
                 .incomeStatus(cuMemberRetailRange.getIncomeStatus())
                 .calType(ECalType.VALUE.getValue())
@@ -119,8 +117,8 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
         for (String suffix : BonusConstants.FIELD_LIST) {
             Field pointMemberField = BonusConstants.FIELD_MAP.get(BonusConstants.POINT_MEMBER_FIELD_NAME + suffix);
             Field pointField = BonusConstants.FIELD_MAP.get(BonusConstants.POINT_FIELD_NAME + suffix);
-            if (newParentRetailDetail.getPkMember().equals(ReflectUtil.getFieldValue(targetRetailDetail, pointMemberField))
+            if (ReflectUtil.getFieldValue(targetRetailDetail, pointMemberField).equals(newParentRetailDetail.getPkMember())
-                    && newParentRetailDetail.getChildNode().equals(ReflectUtil.getFieldValue(targetRetailDetail, pointField))) {
+                    && ReflectUtil.getFieldValue(targetRetailDetail, pointField).equals(newParentRetailDetail.getChildNode())) {
                 // 中间点位在目标点位的位置，根据位置获取新点位填充的位置
                 switch (suffix) {
                     case BonusConstants.POINT_11:
@@ -259,15 +257,13 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
      * 填充点位
      */
     @Override
-    public void fillRetailDetail(CuMemberRetailDetail targetRetailDetail, String point,
+    public boolean fillRetailDetail(CuMemberRetailDetail targetRetailDetail, String point,
                                     CuMemberRetailDetail sourceRetailDetail, Date settleDate, EBonusStage eBonusStage,
                                     List<BonusStageData> bonusStageDataList) {
         ReflectUtil.setFieldValue(targetRetailDetail, BonusConstants.POINT_MEMBER_FIELD_NAME + point, sourceRetailDetail.getPkMember());
         ReflectUtil.setFieldValue(targetRetailDetail, BonusConstants.POINT_FIELD_NAME + point, sourceRetailDetail.getChildNode());
         ReflectUtil.setFieldValue(targetRetailDetail, BonusConstants.UPDATE_FLAG, 0);
 
-        if (EBonusStage.ONE.getValue() == eBonusStage.getValue()
-                || EBonusStage.TWO.getValue() == eBonusStage.getValue()) {
         switch (point) {
             case BonusConstants.POINT_31:
             case BonusConstants.POINT_32:
@@ -311,7 +307,7 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
                                 .updateBool(0)
                                 .build());
                         bonusStageDataList.add(bonusStageData);
-                        } else {
+                    } else if (EBonusStage.TWO.getValue() == eBonusStage.getValue()) {
                         // 二阶段，全满发放阶段奖
                         // 返回奖金收益处理数据
                         BonusStageData bonusStageData = BonusStageData.builder()
@@ -333,21 +329,16 @@ public class CuMemberBonusStageServiceImpl extends ServiceImpl<CuMemberBonusStag
                                 .updateBool(0)
                                 .build());
                         bonusStageDataList.add(bonusStageData);
-                        }
+                    } else if (EBonusStage.THREE.getValue() == eBonusStage.getValue()) {
-                        return;
-                    }
-                    break;
-            }
-        } else {
                         // TODO 三阶段发放特殊处理
                         // TODO 三阶段填充满，判断是否需要赠送点位
-            switch (point) {
-                case BonusConstants.POINT_11:
-                case BonusConstants.POINT_12:
 
+                    }
+                    return true;
+                }
                 break;
         }
-        }
+        return false;
     }
 
     @Override

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailDetailMapper.xml

@@ -11,7 +11,6 @@
             #{items}
         </foreach>
         and cmrd.stage = #{stage}
-        and cmrd.stage_status = 1
         order by cmrd.pk_member, cmrd.child_node
     </select>
 

bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml

@@ -22,13 +22,13 @@
             cal_type, cal_achieve, cal_value,
             pretax_income, income_tax, real_income, remark,
             income_ratio, income_dial_ratio, order_dial_ratio,
-            pk_creator, child_node, stage, stage_num, pk_source_member)
+            pk_creator, child_node, stage, stage_num)
             values (
             #{item.pkBonus}, #{item.pkOrder}, #{item.pkBonusItems}, #{item.incomeStatus},
             #{item.calType}, #{item.calAchieve}, #{item.calValue},
             #{item.pretaxIncome}, #{item.incomeTax}, #{item.realIncome}, #{item.remark},
             #{item.incomeRatio}, #{item.incomeDialRatio}, #{item.orderDialRatio},
-            #{item.pkCreator}, #{item.childNode}, #{item.stage}, #{item.stageNum}, #{item.pkSourceMember})
+            #{item.pkCreator}, #{item.childNode}, #{item.stage}, #{item.stageNum})
         </foreach>
         SELECT 1 FROM dual
     </insert>

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberBonusStage.java

@@ -133,11 +133,5 @@ public class CuMemberBonusStage extends BaseEntity {
     @TableField("STAGE_NUM")
     private Integer stageNum;
 
-    /**
-     * 来源会员ID
-     */
-    @TableField("PK_SOURCE_MEMBER")
-    private Long pkSourceMember;
-
 
 }