排期bug修复

service/src/main/java/com/dayou/service/impl/ItemBrokerageGeneralServiceImpl.java

@@ -175,18 +175,25 @@ public class ItemBrokerageGeneralServiceImpl extends ServiceImpl<ItemBrokerageGe
     public void addMarketerBrokerage(Long id) {
         Item item = itemMapper.selectById(id);
         //下单人id
+        BrokerageDetailBO brokerageDetailBO = BrokerageDetailBO.builder()
+                .amount(item.getAmount())
+                .cate(item.getCate())
+                .businessSource(item.getBusinessSource())
+                .itemId(id)
+                .build();
         Long userId = item.getUserId();
         SimplePostModel postModel = userPostService.getMarketPostList(userId);
         String brokerageRule = LAND_MARKETER_RULE.getCode();
-        if (postModel.getName().equals(SUPERVISOR)){
-            brokerageRule = BrokerageRule.LAND_SUPERVISOR_RULE.getCode();
-        }
-        if (postModel.getName().equals(MARKET_MANAGER)){
-            brokerageRule = BrokerageRule.LAND_MANAGER_RULE.getCode();
+        if (postModel !=null){
+            if (postModel.getName().equals(SUPERVISOR)){
+                brokerageRule = BrokerageRule.LAND_SUPERVISOR_RULE.getCode();
+            }
+            if (postModel.getName().equals(MARKET_MANAGER)){
+                brokerageRule = BrokerageRule.LAND_MANAGER_RULE.getCode();
+            }
         }
+        brokerageDetailBO.setBrokerageRule(brokerageRule);
         if (item.getAmount()!=null){
-            BrokerageDetailBO brokerageDetailBO = BrokerageDetailBO.builder().amount(item.getAmount()).cate(item.getCate()).businessSource(item.getBusinessSource()).itemId(id).build();
-            brokerageDetailBO.setBrokerageRule(brokerageRule);
             brokerageDetailBO.setAdvanceAmount(BigDecimal.ZERO);
             brokerageDetailBO.setPredictAmount(BigDecimal.ZERO);
             brokerageDetailBO.setActualAmount(BigDecimal.ZERO);

service/src/main/java/com/dayou/service/impl/ItemStageServiceImpl.java

@@ -134,7 +134,7 @@ public class ItemStageServiceImpl extends ServiceImpl<ItemStageMapper, ItemStage
             this.update(new LambdaUpdateWrapper<ItemStage>().set(ItemStage::getHeaderId,oldStage.getFooterId()).eq(ItemStage::getId,stage1.getId()));
         }
         if (stage2!=null){
-            this.update(new LambdaUpdateWrapper<ItemStage>().set(ItemStage::getHeaderId,oldStage.getHeaderId()).eq(ItemStage::getId,stage2.getId()));
+            this.update(new LambdaUpdateWrapper<ItemStage>().set(ItemStage::getHeaderId,oldStage.getFooterId()).eq(ItemStage::getId,stage2.getId()));
         }
         this.updateById(itemStageVO);