fix(ai): 修复AI代理列表查询时公司ID为空的问题

Administrator

15 hours ago 49aa4adcf769bb96abcb102e0216a4f32ab3fe92

fix(ai): 修复AI代理列表查询时公司ID为空的问题

 src/main/java/cc/mrbird/febs/ai/service/impl/AiAgentServiceImpl.java

@@ -76,6 +76,10 @@
    @Override
    public FebsResponse agentList(ApiAgentPageDto dto) {
        // 创建分页对象，传入当前页和每页大小

        if (StrUtil.isEmpty(dto.getCompanyId())){
            dto.setCompanyId(AiCommonEnum.COMPANY_ID.getPrompt());
        }
        Page<ApiAgentVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
        Page<ApiAgentVo> pageListByQuery = aiAgentMapper.getPageListByQuery(page, dto);
        return new FebsResponse().success().data(pageListByQuery);

 src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java

@@ -45,51 +45,51 @@
    @Autowired
    private MallMemberCouponMapper mallMemberCouponMapper;

    @Scheduled(cron = "0 0/5 * * * ? ")
    public void overtimeJob() {
        log.info("订单超时任务执行");
        List<MallOrderInfo> orderList = orderInfoMapper.selectOrderInfoUpTime(OrderStatusEnum.WAIT_PAY.getValue());
        if (CollUtil.isNotEmpty(orderList)) {
            for (MallOrderInfo orderInfo : orderList) {
                //更新订单状态
                orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
                orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
                orderInfoMapper.updateById(orderInfo);

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
                if(CollUtil.isNotEmpty(mallOrderItemList)){
                    for(MallOrderItem mallOrderItem : mallOrderItemList){
                        MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(mallOrderItem.getSkuId());
                        if (sku == null) {
                            throw new FebsException("购买商品或sku不存在");
                        }

//                        if (sku.getStock() < mallOrderItem.getCnt()) {
//    @Scheduled(cron = "0 0/5 * * * ? ")
//    public void overtimeJob() {
//        log.info("订单超时任务执行");
//        List<MallOrderInfo> orderList = orderInfoMapper.selectOrderInfoUpTime(OrderStatusEnum.WAIT_PAY.getValue());
//        if (CollUtil.isNotEmpty(orderList)) {
//            for (MallOrderInfo orderInfo : orderList) {
//                //更新订单状态
//                orderInfo.setStatus(OrderStatusEnum.CANCEL.getValue());
//                orderInfo.setCancelType(MallOrderInfo.CANCEL_OVERTIME_NO_PAY);
//                orderInfoMapper.updateById(orderInfo);
//
//                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
//                if(CollUtil.isNotEmpty(mallOrderItemList)){
//                    for(MallOrderItem mallOrderItem : mallOrderItemList){
//                        MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(mallOrderItem.getSkuId());
//                        if (sku == null) {
//                            throw new FebsException("购买商品或sku不存在");
//                        }
//
////                        if (sku.getStock() < mallOrderItem.getCnt()) {
////                            throw new FebsException(sku.getSkuName() + "库存不足");
////                        }
//
//                        MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
//                        Integer goodsResult = mallGoodsMapper.updateStockAndVolumeByGoodsId(mallGoods.getId(), mallOrderItem.getCnt());
//                        if(1 != goodsResult){
//                            throw new FebsException(mallGoods.getGoodsName() + "库存不足");
//                        }
//
//                        Integer skuResult = mallGoodsSkuMapper.updateStockAndVolumeBySkuId(sku.getId(),mallOrderItem.getCnt());
//                        if(1 != skuResult){
//                            throw new FebsException(sku.getSkuName() + "库存不足");
//                        }

                        MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
                        Integer goodsResult = mallGoodsMapper.updateStockAndVolumeByGoodsId(mallGoods.getId(), mallOrderItem.getCnt());
                        if(1 != goodsResult){
                            throw new FebsException(mallGoods.getGoodsName() + "库存不足");
                        }

                        Integer skuResult = mallGoodsSkuMapper.updateStockAndVolumeBySkuId(sku.getId(),mallOrderItem.getCnt());
                        if(1 != skuResult){
                            throw new FebsException(sku.getSkuName() + "库存不足");
                        }
                        Long memberCouponId = mallOrderItem.getMemberCouponId();
                        MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
                        if(ObjectUtil.isNotEmpty(mallMemberCoupon)){
                            mallMemberCoupon.setState(1);
                            mallMemberCouponMapper.updateById(mallMemberCoupon);
                        }
                    }
                }
            }
        }

    }
//                        Long memberCouponId = mallOrderItem.getMemberCouponId();
//                        MallMemberCoupon mallMemberCoupon = mallMemberCouponMapper.selectById(memberCouponId);
//                        if(ObjectUtil.isNotEmpty(mallMemberCoupon)){
//                            mallMemberCoupon.setState(1);
//                            mallMemberCouponMapper.updateById(mallMemberCoupon);
//                        }
//                    }
//                }
//            }
//        }
//
//    }




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

@@ -880,11 +880,11 @@
            mallMember.setBirthday(apiXcxSaveInfoDto.getBirthday());
        }

        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
            MallVipConfig mallVipConfig = configs.get(0);
            mallMember.setLevel(mallVipConfig.getCode());
        }
//        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
//        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
//            MallVipConfig mallVipConfig = configs.get(0);
//            mallMember.setLevel(mallVipConfig.getCode());
//        }

        if(ObjectUtil.isNotEmpty(apiXcxSaveInfoDto.getGender())){
            mallMember.setSex(1 == apiXcxSaveInfoDto.getGender() ? "女" : "男");