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

Administrator

3 days ago ae6f6e0be0c82cc801fc1a9bb0c7af91d8d02bff

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

@@ -415,6 +415,7 @@
                new LambdaQueryWrapper<HappyActivityConnect>()
                        .eq(HappyActivityConnect::getMemberId, memberId)
                        .eq(HappyActivityConnect::getName, dto.getName())
                        .eq(HappyActivityConnect::getPhone, dto.getPhone())
        );
        if(CollUtil.isNotEmpty(happyActivityConnects)){
            throw new FebsException("已经添加过该联系人");
@@ -471,6 +472,26 @@
    }

    @Override
    public FebsResponse expireOrder(ApiExpireOrderDto dto) {
        if(CollUtil.isEmpty(dto.getIds())){
            throw new FebsException("请选择订单");
        }

        dto.getIds().forEach(id -> {
            HappyActivityOrder happyActivityOrder = happyActivityOrderMapper.selectById(id);
            if(ObjectUtil.isNotEmpty(happyActivityOrder)){
                Long activityId = happyActivityOrder.getActivityId();
                Integer numCnt = happyActivityOrder.getNumCnt();
                this.baseMapper.updateHappyActivitySurplusCnt(activityId,numCnt);

                happyActivityOrder.setState(StateUpDownEnum.ORDER_STATE_OVERTIME.getCode());
                happyActivityOrderMapper.updateById(happyActivityOrder);
            }
        });
        return new FebsResponse().success();
    }

    @Override
    public FebsResponse createOrder(ApiCreateOrderDto dto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        if(CollUtil.isEmpty(dto.getConnectIds())){
@@ -484,6 +505,24 @@
        }

        Long activityId = dto.getActivityId();

        List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
                new LambdaQueryWrapper<HappyActivityOrderItem>()
                        .eq(HappyActivityOrderItem::getActivityId, activityId)
                        .in(HappyActivityOrderItem::getConnectId, connectIds)
        );
        if(CollUtil.isNotEmpty(happyActivityOrderItems)){
            //stream流操作happyActivityOrderItems，返回一个orderId的Set集合
            Set<Long> orderIdSet = happyActivityOrderItems.stream().map(HappyActivityOrderItem::getOrderId).collect(Collectors.toSet());
            List<HappyActivityOrder> happyActivityOrders = happyActivityOrderMapper.selectList(
                    new LambdaQueryWrapper<HappyActivityOrder>()
                            .in(HappyActivityOrder::getId, orderIdSet)
                            .in(HappyActivityOrder::getState, Arrays.asList(StateUpDownEnum.ORDER_STATE_WAIT_PAY.getCode(),StateUpDownEnum.ORDER_STATE_WAIT_USE.getCode()))
            );
            if(CollUtil.isNotEmpty(happyActivityOrders)){
                throw new FebsException("有报名人重复报名了活动，请重新选择");
            }
        }
        HappyActivity happyActivity = this.baseMapper.selectById(activityId);
        if (ObjectUtil.isEmpty(happyActivity)) {
            throw new FebsException("活动不存在");
@@ -579,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) {
@@ -692,7 +732,7 @@

        LambdaQueryWrapper<HappyActivityOrder> happyActivityOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
        happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getMemberId, memberId);
        if(ObjectUtil.isNotEmpty(dto.getState())){
        if(ObjectUtil.isNotEmpty(dto.getState()) && dto.getState() != 0){
            happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getState, dto.getState());
        }
        happyActivityOrderLambdaQueryWrapper.eq(HappyActivityOrder::getDeleteFlag, StateUpDownEnum.DOWN.getCode());
@@ -706,6 +746,7 @@
            List<HappyActivity> happyActivities = this.baseMapper.selectList(
                    new LambdaQueryWrapper<HappyActivity>()
                            .select(
                                    HappyActivity::getId,
                                    HappyActivity::getCategoryId,
                                    HappyActivity::getName,
                                    HappyActivity::getStartTime,
@@ -755,7 +796,7 @@

        List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList(
                new LambdaQueryWrapper<HappyActivityOrderItem>()
                        .eq(HappyActivityOrderItem::getOrderId, happyActivityOrder.getActivityId())
                        .eq(HappyActivityOrderItem::getOrderId, happyActivityOrder.getId())
                .eq(HappyActivityOrderItem::getMemberId, memberId)
        );
        if(CollUtil.isNotEmpty(happyActivityOrderItems)){
@@ -859,31 +900,56 @@
        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("票号异常！");
        }

        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
    public FebsResponse insureOrder(ApiCheckOrderDto dto) {
        // 获取当前登录用户的ID
        Long memberId = LoginUserUtil.getLoginUser().getId();

        MallMember mallMember = mallMemberMapper.selectById(memberId);

        if(StateUpDownEnum.UP.getCode() != mallMember.getCheckOrder()){
            throw new FebsException("您不是核销员！");
        }

        String orderItemCode = dto.getOrderItemCode();

        HappyActivityOrderItem happyActivityOrderItem = happyActivityOrderItemMapper.selectOne(
                new LambdaQueryWrapper<HappyActivityOrderItem>()
                        .eq(HappyActivityOrderItem::getCode, orderItemCode)
                        .last("limit 1")
        );
        if(happyActivityOrderItem != null){
            if(StateUpDownEnum.UP.getCode() == happyActivityOrderItem.getState()){
                throw new FebsException("票号已核销！");
            }

            happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode());
            happyActivityOrderItem.setTransferItemId(memberId);
            happyActivityOrderItemMapper.updateById(happyActivityOrderItem);

            agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId());

            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());

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

        return new FebsResponse().fail().message("核销失败！");
        return new FebsResponse().success().message("操作成功");
    }

    /**