refactor(mall): 修改快乐活动订单支付逻辑判断

Administrator

3 days ago ae6f6e0be0c82cc801fc1a9bb0c7af91d8d02bff

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

@@ -618,7 +618,8 @@

        try {
            // 根据支付类型处理不同的支付逻辑
            if (StateUpDownEnum.PAY_METHOD_NO_PAY.getCode() == payType) {
//            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,15 +900,10 @@
        HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
                new LambdaQueryWrapper<HappyActivityOrderItem>()
                        .eq(HappyActivityOrderItem::getCode, orderItemCode)
                        .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode())
                .last("limit 1")
        );
        if(happyActivityOrderItem == null){
            throw new FebsException("票号异常！");
        }

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

        HappyActivity happyActivity = this.baseMapper.selectById(happyActivityOrderItem.getActivityId());
@@ -941,12 +937,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());