新增商品在输入栏中，给出提示信息

KKSU

2024-06-03 7870b760fff7b18a7c16924c90c8c774b770fed1

新增商品在输入栏中，给出提示信息

 src/main/java/cc/mrbird/febs/mall/service/IApiMallTeamLeaderService.java

@@ -30,6 +30,8 @@

    FebsResponse leaderRefundOrder(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto);

    FebsResponse leaderRefundOrderAll(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto);

    FebsResponse refundOrderInfo(ApiRefundOrderInfoDto apiRefundOrderInfoDto);

    FebsResponse leaderProfit();

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

@@ -946,7 +946,7 @@
            apiLeaderRefundOrderDto.setOrderId(mallOrderInfo.getId());
            apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
            apiLeaderRefundOrderDto.setAgreeState(1);
            iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
            iApiMallTeamLeaderService.leaderRefundOrderAll(apiLeaderRefundOrderDto);
        }
        return new FebsResponse().success();
    }

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

@@ -510,6 +510,135 @@
    }

    @Override
    public FebsResponse leaderRefundOrderAll(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {

        //获取退款订单信息
        Long orderId = apiLeaderRefundOrderDto.getOrderId();
        Long itemId = apiLeaderRefundOrderDto.getItemId();

        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
        MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
        if(ObjectUtil.isEmpty(mallGoodsSku)){
            return new FebsResponse().fail().message("退款失败，请联系客服人员");
        }
        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, 3);
        if(CollUtil.isEmpty(mallRefundEntities)){
            return new FebsResponse().fail().message("退款失败，请联系客服人员");
        }
        MallRefundEntity mallRefundEntity = mallRefundEntities.get(0);

        Integer agreeState = apiLeaderRefundOrderDto.getAgreeState() == null? 2:apiLeaderRefundOrderDto.getAgreeState();
        if(2 == agreeState){
            //更新订单详情
            mallOrderItem.setState(1);
            mallOrderItemMapper.updateById(mallOrderItem);
            //更新退款订单
            mallRefundEntity.setState(2);
            mallRefundEntity.setUpdatedTime(DateUtil.date());
            mallRefundMapper.updateById(mallRefundEntity);
            return new FebsResponse().success().message("操作成功");
        }else{//退款订单编号
            String orderNo = mallOrderInfo.getOrderNo();
            //退款退款编号
            String refundNo = mallRefundEntity.getRefundNo();
            //退款订单金额
            BigDecimal orderAmount = mallOrderInfo.getAmount();
            BigDecimal aa = new BigDecimal(100);
            int orderMoney = orderAmount.multiply(aa).intValue();

            //退款退款金额
            BigDecimal refundAmount = mallRefundEntity.getAmount();
            List<MallOrderItem> mallOrderItemListOnly = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
            if(CollUtil.isNotEmpty(mallOrderItemListOnly)){
                refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
                log.info("退款订单编号为{}，订单金额：{}，待退款订单：{}，退款金额：{}", refundNo,orderAmount,mallOrderItemListOnly.size(),refundAmount);
            }
            BigDecimal bb = new BigDecimal(100);
            int refundMoney = refundAmount.multiply(bb).intValue();

            //余额支付退款
            if(mallRefundEntity.getType() == 3){
                //更新订单详情
                mallOrderItem.setState(3);
                mallOrderItemMapper.updateById(mallOrderItem);
                //更新库存信息
                MallGoods mallGoods = mallGoodsMapper.selectById(mallOrderItem.getGoodsId());
                mallGoods.setStock(mallGoods.getStock() + mallOrderItem.getCnt());
                mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
                mallGoodsMapper.updateById(mallGoods);
                mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
                mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
                mallGoodsSkuMapper.updateById(mallGoodsSku);
                //更新退款订单
                mallRefundEntity.setState(1);
                mallRefundEntity.setUpdatedTime(DateUtil.date());
                mallRefundMapper.updateById(mallRefundEntity);
                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额退款",2);

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
                if(CollUtil.isEmpty(mallOrderItemList)){
                    MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
                    mallOrderRefund.setStatus(6);
                    mallOrderInfoMapper.updateById(mallOrderRefund);
                }
                memberWalletService.add(refundAmount, mallOrderInfo.getMemberId(), "balance");
                return new FebsResponse().success().message("退款成功");
            }

            Boolean flag = false;
            Boolean debug = xcxProperties.getDebug();
            if (debug) {
                boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
                flag = b;
            } else {
                log.info("开始调用退款接口。。。退款编号为{}", refundNo);
                boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null);
                flag = b;
            }

            if(flag){
                //更新订单详情
                mallOrderItem.setState(3);
                mallOrderItemMapper.updateById(mallOrderItem);
                //更新库存信息
                MallGoods mallGoods = mallGoodsMapper.selectById(mallOrderItem.getGoodsId());
                mallGoods.setStock(mallGoods.getStock() + mallOrderItem.getCnt());
                mallGoods.setVolume(mallGoods.getVolume() - mallOrderItem.getCnt());
                mallGoodsMapper.updateById(mallGoods);

//                MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(mallOrderItem.getSkuId());
                mallGoodsSku.setStock(mallGoodsSku.getStock() + mallOrderItem.getCnt());
                mallGoodsSku.setSkuVolume(mallGoodsSku.getSkuVolume() - mallOrderItem.getCnt());
                mallGoodsSkuMapper.updateById(mallGoodsSku);

                //更新退款订单
                mallRefundEntity.setState(1);
                mallRefundEntity.setUpdatedTime(DateUtil.date());
                mallRefundMapper.updateById(mallRefundEntity);
                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.WECHAT_REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.WECHAT.getValue(),"微信退款",2);

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
                if(CollUtil.isEmpty(mallOrderItemList)){
                    MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
                    mallOrderRefund.setStatus(6);
                    mallOrderInfoMapper.updateById(mallOrderRefund);
                }
            }else{

                //更新订单详情
                mallOrderItem.setState(1);
                mallOrderItemMapper.updateById(mallOrderItem);

                mallRefundEntity.setState(2);
                mallRefundMapper.updateById(mallRefundEntity);
                return new FebsResponse().fail().message("退款失败，请联系客服人员");
            }
            return new FebsResponse().success().message("退款成功");
        }
    }

    @Override
    public FebsResponse refundOrderInfo(ApiRefundOrderInfoDto apiRefundOrderInfoDto) {
        Long orderId = apiRefundOrderInfoDto.getOrderId();
        Long itemId = apiRefundOrderInfoDto.getItemId();