refactor(mall): 优化活动订单支付逻辑

Administrator

3 days ago bdcd332feebe13ea46186ed093ca55eb2f3b3fdf

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

@@ -552,7 +552,11 @@
        happyActivityOrder.setNumCnt(dto.getNumCnt());
        happyActivityOrder.setAmount(amount);
        happyActivityOrder.setPayState(StateUpDownEnum.PAY_STATE_NOT_PAY.getCode());
        happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
        if(BigDecimal.ZERO.compareTo(amount) == 0){
            happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_NO_PAY.getCode());
        }else{
            happyActivityOrder.setPayType(StateUpDownEnum.PAY_METHOD_WECHAT.getCode());
        }
        happyActivityOrder.setFailTime(failTime);
        log.info("创建订单，订单号="+JSONUtil.parse(happyActivityOrder));
        happyActivityOrderMapper.insert(happyActivityOrder);
@@ -619,6 +623,7 @@
        try {
            // 根据支付类型处理不同的支付逻辑
            if (StateUpDownEnum.PAY_METHOD_NO_PAY.getCode() == payType) {
//            if (BigDecimal.ZERO.compareTo(happyActivityOrder.getAmount()) == 0) {
                // 处理无需支付的订单逻辑
                processNoPayOrder(happyActivityOrder, orderId);
            } else if (StateUpDownEnum.PAY_METHOD_WECHAT.getCode() == payType) {
@@ -899,31 +904,25 @@
        HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
                new LambdaQueryWrapper<HappyActivityOrderItem>()
                        .eq(HappyActivityOrderItem::getCode, orderItemCode)
                        .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
                .last("limit 1")
        );
        if(happyActivityOrderItem != null){

            if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
                throw new FebsException("该票号已核销！");
            }

            HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
            ApiCheckOrderVo apiCheckOrderVo = new ApiCheckOrderVo();
            apiCheckOrderVo.setActivityName(happyActivity.getName());
            apiCheckOrderVo.setActivityStartTime(happyActivity.getStartTime());
            apiCheckOrderVo.setActivityEndTime(happyActivity.getEndTime());
            apiCheckOrderVo.setActivityAddress(happyActivity.getAddress());
            apiCheckOrderVo.setCode(happyActivityOrderItem.getCode());
            apiCheckOrderVo.setName(happyActivityOrderItem.getName());
            apiCheckOrderVo.setPhone(happyActivityOrderItem.getPhone());
            apiCheckOrderVo.setPrice(happyActivityOrderItem.getPrice());
            apiCheckOrderVo.setState(happyActivityOrderItem.getState());

            return new FebsResponse().success().data(apiCheckOrderVo);
        if(happyActivityOrderItem == null){
            throw new FebsException("票号异常！");
        }

        return new FebsResponse().fail().message("核销失败！");
        HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
        ApiCheckOrderVo apiCheckOrderVo = new ApiCheckOrderVo();
        apiCheckOrderVo.setActivityName(happyActivity.getName());
        apiCheckOrderVo.setActivityStartTime(happyActivity.getStartTime());
        apiCheckOrderVo.setActivityEndTime(happyActivity.getEndTime());
        apiCheckOrderVo.setActivityAddress(happyActivity.getAddress());
        apiCheckOrderVo.setCode(happyActivityOrderItem.getCode());
        apiCheckOrderVo.setName(happyActivityOrderItem.getName());
        apiCheckOrderVo.setPhone(happyActivityOrderItem.getPhone());
        apiCheckOrderVo.setPrice(happyActivityOrderItem.getPrice());
        apiCheckOrderVo.setState(happyActivityOrderItem.getState());

        return new FebsResponse().success().data(apiCheckOrderVo);
    }

    @Override
@@ -942,12 +941,11 @@
        HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
                new LambdaQueryWrapper<HappyActivityOrderItem>()
                        .eq(HappyActivityOrderItem::getCode, orderItemCode)
                        .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
                        .last("limit 1")
        );
        if(happyActivityOrderItem != null){
            if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
                throw new FebsException("该票号已核销！");
                throw new FebsException("票号已核销！");
            }

            happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());