老师自己不分润

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserAccountServiceImpl.java

@@ -405,6 +405,17 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
     }
 
     public void mallTeacherRecordState(MallOrderItemDto shareDto) {
+
+        // 平台修改收入状态
+        if (shareDto.getStatus().equals(PostStatusEnum.RECORDED)) {
+            platformCashAccountRecordService.mallRecordedRecord(shareDto.getProductSkuId(),shareDto.getOrderSn(),GoodTypeEnum.MALL.getCode());
+
+        } else if (shareDto.getStatus().equals(PostStatusEnum.CANCEL)) {
+            platformCashAccountRecordService.cancelRecord(shareDto.getOrderSn(),GoodTypeEnum.MALL.getCode(),shareDto.getProductSkuId());
+        }
+
+
+        // 修改老师分润
         List<UserAccountRecord> list = userAccountRecordService.lambdaQuery()
                                                                .eq(UserAccountRecord::getOrderNo, shareDto.getOrderSn())
                                                                .eq(UserAccountRecord::getBizId, shareDto.getProductSkuId())
@@ -414,13 +425,6 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         }
         for (UserAccountRecord userAccount : list) {
             this.accountChange(userAccount.getId(),shareDto.getStatus());
-            if (shareDto.getStatus().equals(PostStatusEnum.RECORDED)) {
-
-                platformCashAccountRecordService.mallRecordedRecord(shareDto.getProductSkuId(),shareDto.getOrderSn(),GoodTypeEnum.MALL.getCode());
-
-            } else if (shareDto.getStatus().equals(PostStatusEnum.CANCEL)) {
-                platformCashAccountRecordService.cancelRecord(shareDto.getOrderSn(),GoodTypeEnum.MALL.getCode(),shareDto.getProductSkuId());
-            }
         }
     }
 
@@ -452,7 +456,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         platformCashAccountRecordService.save(platformCashAccountRecord);
 
         //分润
-        if (null != shareDto.getPromoterId()) {
+        if (null != shareDto.getPromoterId() && !shareDto.getPromoterId().equals(shareDto.getUserId())) {
             //获取分润收益费率
             BigDecimal shareFeeRate = userOrderService.getShareFreeByGoodType(GoodTypeEnum.MALL);
             if (shareFeeRate.compareTo(BigDecimal.ZERO) > 0) {