20220810

xiaoyong931011

2022-08-11 2cb2669a13dd6cd043f17b7a10a090110cbe674f

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
import cc.mrbird.febs.mall.dto.*;
@@ -42,6 +43,13 @@
@Service
@RequiredArgsConstructor
public class ApiMallTeamLeaderServiceImpl extends ServiceImpl<MallTeamLeaderMapper, MallTeamLeader> implements IApiMallTeamLeaderService {


    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final MallTeamLeaderMapper mallTeamLeaderMapper;
    private final MallMemberMapper mallMemberMapper;
    private final IXcxPayService iXcxPayService;
    private final SpringContextHolder springContextHolder;

    @Override
    @Transactional
@@ -118,11 +126,6 @@
        return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
    }

    private final MallOrderInfoMapper mallOrderInfoMapper;
    private final MallTeamLeaderMapper mallTeamLeaderMapper;
    private final MallMemberMapper mallMemberMapper;
    private final IXcxPayService iXcxPayService;

    @Override
    @Transactional
    public FebsResponse leaderOrderConfirm(ApiLeaderOrderConfirmDto apiLeaderOrderConfirmDto) {
@@ -137,8 +140,9 @@
                continue;
//                return new FebsResponse().fail().message("订单不存在");
            }
            Integer status = mallOrderInfo.getStatus();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
            Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
            Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
            if(OrderStatusEnum.WAIT_FINISH.getValue() != status || 2 != deliveryState){
                continue;
//                return new FebsResponse().fail().message("订单不是待确认到货状态");
            }