diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index 61f584c4f..a55c3e6df 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -26,8 +26,6 @@ import com.czg.market.vo.InviteUserVO; import com.czg.market.vo.MkDistributionConfigVO; import com.czg.order.dto.MkDistributionPayDTO; import com.czg.order.entity.OrderInfo; -import com.czg.market.service.OrderInfoService; -import com.czg.order.service.OrderPaymentService; import com.czg.sa.StpKit; import com.czg.service.market.enums.OrderStatusEnums; import com.czg.service.market.mapper.MkDistributionUserMapper; @@ -685,22 +683,15 @@ public class MkDistributionUserServiceImpl extends ServiceImpl { - MkDistributionFlow refundFlow = BeanUtil.copyProperties(item, MkDistributionFlow.class); - refundFlow.setStatus(TableValueConstant.DistributionFlow.Status.REFUND.getCode()); - refundFlow.setSourceId(item.getId()); - refundFlow.setId(null); - refundFlow.setCreateTime(DateUtil.date().toLocalDateTime()); - refundFlow.setUpdateTime(DateUtil.date().toLocalDateTime()); if (TableValueConstant.DistributionFlow.Status.PENDING.getCode().equals(item.getStatus())) { - item.setStatus(TableValueConstant.DistributionFlow.Status.SUCCESS.getCode()); -// updateIncome(item.getRewardAmount().negate(), BigDecimal.ZERO, BigDecimal.ZERO, item.getDistributionUserId(), item.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel()); + item.setStatus(TableValueConstant.DistributionFlow.Status.REFUND.getCode()); distributionFlowService.updateById(item); + mapper.updateIncome(item.getRewardAmount().negate(), null, null, item.getDistributionUserId(), item.getShopId()); } else { // 执行扣款 updateIncome(BigDecimal.ZERO, item.getRewardAmount().negate(), BigDecimal.ZERO, item.getDistributionUserId(), item.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel()); updateShopInfoAmount(item.getShopId(), item.getRewardAmount(), orderId, TableValueConstant.DistributionAmountFlow.Type.REFUND, "分销回退"); } - distributionFlowService.save(refundFlow); }); } @@ -738,6 +729,13 @@ public class MkDistributionUserServiceImpl extends ServiceImpl