赠送积分更新状态

xiaoyong931011

2023-08-15 09090250b33c1f818c2364a8d03cf6d7b6c2c6de

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

@@ -13,10 +13,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.ApiLeaderListVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.service.IPayService;
@@ -82,19 +79,23 @@
    private final IApiMallTeamLeaderService iApiMallTeamLeaderService;
    private final IMallElectronicFenceService iMallElectronicFenceService;
    private final MallElectronicFenceMapper mallElectronicFenceMapper;
    private final MallMemberWalletMapper mallMemberWalletMapper;
    private final MallRollPerkMapper mallRollPerkMapper;
    private final MallMoneyFlowMapper mallMoneyFlowMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createOrder(AddOrderDto addOrderDto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember member = mallMemberMapper.selectById(memberId);
        MallMemberWallet memberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);

                //验证用户的等级
//        if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
//            throw new FebsException("请先申请成为代理人");
//        }

        //订单范围内才允许下单
        //验证收货地址
        MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
        if(ObjectUtil.isEmpty(address)){
            throw new FebsException("请重新选择收货地址信息");
@@ -108,7 +109,7 @@
        orderInfo.setStatus(OrderStatusEnum.WAIT_PAY.getValue());
        orderInfo.setRemark(addOrderDto.getRemark());
        orderInfo.setOrderType(addOrderDto.getOrderType());
        orderInfo.setDeliveryType(2);
        orderInfo.setDeliveryType(addOrderDto.getDeliveryType());
        if (CollUtil.isEmpty(addOrderDto.getItems())) {
            throw new FebsException("参数错误");
        }
@@ -116,108 +117,58 @@

        BigDecimal total = BigDecimal.ZERO;
        for (AddOrderItemDto item : addOrderDto.getItems()) {
                MallOrderItem orderItem = new MallOrderItem();
            MallOrderItem orderItem = new MallOrderItem();
            MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
            if (ObjectUtil.isEmpty(sku)) {
                throw new FebsException("购买商品或sku不存在");
            }

                // 积分商品提交订单
                if (addOrderDto.getOrderType() == 2) {
                    MallGoods mallGoods = mallGoodsMapper.selectById(item.getSkuId());
                    if (mallGoods.getStock() < item.getCnt()) {
                        throw new FebsException(mallGoods.getGoodsName() + "库存不足");
                    }

                    if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
                        throw new FebsException(mallGoods.getGoodsName() + "已下架");
                    }

                    BigDecimal amount = mallGoods.getScore().multiply(BigDecimal.valueOf(item.getCnt()));
                    orderItem.setAmount(amount);
                    orderItem.setCnt(item.getCnt());
                    orderItem.setOrderId(orderInfo.getId());
                    orderItem.setPrice(mallGoods.getScore());
                    orderItem.setGoodsId(mallGoods.getId());
                    orderItem.setGoodsName(mallGoods.getGoodsName());
                    orderItem.setStyleName(mallGoods.getGoodsName());
                    orderItem.setSkuName(mallGoods.getGoodsName());
                    orderItem.setSkuImage(mallGoods.getThumb());
                    orderItem.setState(1);

                    total = total.add(amount);
                } else {
                    MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
                    if (sku == null) {
                        throw new FebsException("购买商品或sku不存在");
                    }

//                    if("样品".equals(sku.getSample())){
//                        List<MallOrderItem> items = mallOrderItemMapper.selectItemBySkuIdUnCancel(sku.getId(), member.getId());
//                        if (CollUtil.isNotEmpty(items)) {
//                            throw new FebsException("样品一个用户只能购买一次");
//                        }
//                        Integer cnt = item.getCnt();
//                        if(1 < cnt){
//                            throw new FebsException("样品只能购买一件");
//                        }
//
//                    }

                    if (sku.getStock() < item.getCnt()) {
                        throw new FebsException(sku.getSkuName() + "库存不足");
                    }

                    MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
                    // 零撸专区购买
                    if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) {
                        List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId());
                        if (CollUtil.isNotEmpty(items)) {
                            throw new FebsException("无法重复领取同一个商品");
                        }
                    }

                    if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
                        throw new FebsException(mallGoods.getGoodsName() + "已下架");
                    }
                    //商品库存销量计算
                    Integer goodsResult = mallGoodsMapper.upDateStockAndVolumeByGoodsId(mallGoods.getId(), item.getCnt());
                    if(1 != goodsResult){
                        throw new FebsException(mallGoods.getGoodsName() + "库存不足");
                    }
                    BigDecimal amount = BigDecimal.ZERO;
                    BigDecimal itemPrice = BigDecimal.ZERO;
                    if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
                        //普通用户使用原价购买
                        amount = sku.getOriginalPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                        itemPrice = sku.getOriginalPrice();
                    }else{
                        //合伙人使用折扣价
                        amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                        itemPrice = sku.getPresentPrice();
                    }
//                    BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                    orderItem.setAmount(amount);
                    orderItem.setCnt(item.getCnt());
                    orderItem.setOrderId(orderInfo.getId());
                    orderItem.setPrice(itemPrice);
                    orderItem.setGoodsId(sku.getGoodsId());
                    orderItem.setGoodsName(sku.getGoodsName());
                    orderItem.setSkuId(sku.getId());
                    orderItem.setState(1);
                    orderItem.setStyleName(sku.getStyleName());
                    orderItem.setSkuName(sku.getSkuName());
                    orderItem.setSkuImage(sku.getSkuImage());
                    orderItem.setIsNormal(mallGoods.getIsNormal());
                    orderItem.setCostPrice(sku.getCostPrice());

                    total = total.add(amount);
                    //规格的库存销量
                    Integer skuResult = mallGoodsSkuMapper.upDateStockAndVolumeBySkuId(sku.getId(),item.getCnt());
                    if(1 != skuResult){
                        throw new FebsException(sku.getSkuName() + "库存不足");
                    }
                    if (addOrderDto.getType() == 1) {
                        mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
                    }
            if (sku.getStock() < item.getCnt()) {
                throw new FebsException(sku.getSkuName() + "库存不足");
            }
            MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
            // 零撸专区购买
            if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) {
                List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId());
                if (CollUtil.isNotEmpty(items)) {
                    throw new FebsException("无法重复领取同一个商品");
                }
                mallOrderItemMapper.insert(orderItem);
            }

            if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
                throw new FebsException(mallGoods.getGoodsName() + "已下架");
            }
            //商品库存销量计算
            Integer goodsResult = mallGoodsMapper.upDateStockAndVolumeByGoodsId(mallGoods.getId(), item.getCnt());
            if(1 != goodsResult){
                throw new FebsException(mallGoods.getGoodsName() + "库存不足");
            }
            BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
            BigDecimal itemPrice = sku.getPresentPrice();
            orderItem.setAmount(amount);
            orderItem.setCnt(item.getCnt());
            orderItem.setOrderId(orderInfo.getId());
            orderItem.setPrice(itemPrice);
            orderItem.setGoodsId(sku.getGoodsId());
            orderItem.setGoodsName(sku.getGoodsName());
            orderItem.setSkuId(sku.getId());
            orderItem.setState(1);
            orderItem.setStyleName(sku.getStyleName());
            orderItem.setSkuName(sku.getSkuName());
            orderItem.setSkuImage(sku.getSkuImage());
            orderItem.setIsNormal(mallGoods.getIsNormal());
            orderItem.setCostPrice(sku.getCostPrice());

            total = total.add(amount);
            //规格的库存销量
            Integer skuResult = mallGoodsSkuMapper.upDateStockAndVolumeBySkuId(sku.getId(),item.getCnt());
            if(1 != skuResult){
                throw new FebsException(sku.getSkuName() + "库存不足");
            }
            if (addOrderDto.getType() == 1) {
                mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
            }
            mallOrderItemMapper.insert(orderItem);
        }
        //运费
        BigDecimal delivaryAmount = addOrderDto.getDeliveryAmount() == null ? BigDecimal.ZERO : addOrderDto.getDeliveryAmount();
@@ -230,9 +181,9 @@
        orderInfo.setPhone(address.getPhone());
        orderInfo.setIsHome(addOrderDto.getIsHome());

        if (StrUtil.isBlank(address.getLatitude())||StrUtil.isBlank(address.getLongitude())) {
            throw new FebsException("请添加地址");
        }
//        if (StrUtil.isBlank(address.getLatitude())||StrUtil.isBlank(address.getLongitude())) {
//            throw new FebsException("请添加地址");
//        }
        orderInfo.setAddress(address.getProvince()+address.getCity()+address.getArea() + address.getAddress());
        orderInfo.setLatitude(address.getLatitude());
        orderInfo.setLongitude(address.getLongitude());
@@ -342,6 +293,8 @@

        String payResultStr = "";
        String wxResultStr = "";
        String amountActualMsg = "0";
        StringBuffer stringBuffer = new StringBuffer();
        switch (payOrderDto.getType()) {
            case "1":
                BrandWCPayRequestData brandWCPayRequestData = null;
@@ -353,19 +306,9 @@
                wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
                payResultStr = brandWCPayRequestData.getPrepay_id();
                orderInfo.setPayMethod("微信支付");
                amountActualMsg = orderInfo.getAmount().toString();
                break;
            case "2":
                if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
                    payResultStr = orderInfo.getPayOrderNo();
                } else {
                    payResultStr = payService.aliPay(orderInfo);
                }

                orderInfo.setPayOrderNo(payResultStr);
                orderInfo.setPayMethod("支付宝支付");
                agentProducer.sendOrderReturn(orderInfo.getId());
                break;
            case "3":
                payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");

                orderInfo.setPayOrderNo(orderInfo.getOrderNo());
@@ -375,32 +318,244 @@
                orderInfo.setPayResult("1");
                orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());

                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                break;
            case "4":
                if (orderInfo.getOrderType() != 2) {
                    throw new FebsException("非积分订单，无法使用积分支付");
                }
                payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "prizeScore");
                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(),
                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);

                amountActualMsg = orderInfo.getAmount().toString();

                stringBuffer.append(orderInfo.getId().toString());
                stringBuffer.append("@");
                stringBuffer.append(amountActualMsg);
                agentProducer.sendOrderGetMsg(stringBuffer.toString());
                break;
            case "3":
                /**
                 * 获取用户的当前积分
                 */
                MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
                BigDecimal score = mallMemberWallet.getScore();
                BigDecimal amount = orderInfo.getAmount();
                //积分兑换比例
                DataDictionaryCustom scoreChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        DataDictionaryEnum.SCORE_CHANGE.getType(),
                        DataDictionaryEnum.SCORE_CHANGE.getCode()
                );
                BigDecimal scoreChange = StrUtil.isEmpty(scoreChangeDic.getValue()) ? new BigDecimal("1") : new BigDecimal(scoreChangeDic.getValue());
                BigDecimal amountToScore = amount.multiply(scoreChange).setScale(0, BigDecimal.ROUND_DOWN);
                //实际支付积分
                BigDecimal scoreActual = BigDecimal.ZERO;
                if(score.compareTo(amountToScore) >= 0){
                    //拥有的积分大于此次订单的金额，则全额订单折扣
                    int reduce = memberWalletService.reduce(amountToScore, member.getId(), "score");
                    if (reduce == 2) {
                        throw new FebsException("积分余额不足");
                    }
                    orderInfo.setPayMethod("积分支付");
                    scoreActual = amountToScore;
                }else{
                    //拥有的积分大于此次订单的金额，则全额订单折扣
                    int reduce = memberWalletService.reduce(score, member.getId(), "score");
                    if (reduce == 2) {
                        throw new FebsException("积分余额不足");
                    }
                    scoreActual = score;
                }

                BigDecimal scoreToAmount = score.divide(scoreChange, 2, BigDecimal.ROUND_DOWN);
                //实际支付余额
                BigDecimal amountActual = amount.subtract(scoreToAmount).setScale(2, BigDecimal.ROUND_DOWN);
                int balance = memberWalletService.reduce(amountActual, member.getId(), "balance");
                if (balance == 2) {
                    throw new FebsException("余额不足");
                }
                orderInfo.setPayOrderNo(orderInfo.getOrderNo());
                orderInfo.setPayMethod("积分支付");
                orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                orderInfo.setPayTime(new Date());
                orderInfo.setPayResult("1");
                orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
                if(amountActual.compareTo(BigDecimal.ZERO) > 0){
                    mallMoneyFlowService.addMoneyFlow(member.getId(), amountActual.negate(), MoneyFlowTypeEnum.PAY.getValue(),
                            orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                    amountActualMsg = amountActual.toString();
                }
                if(scoreActual.compareTo(BigDecimal.ZERO) > 0){
                    mallMoneyFlowService.addMoneyFlow(member.getId(), scoreActual.negate(),
                            MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
                }

                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
                stringBuffer.append(orderInfo.getId().toString());
                stringBuffer.append("@");
                stringBuffer.append(amountActualMsg);
                agentProducer.sendOrderGetMsg(stringBuffer.toString());
                break;
            case "4":
                MallRollPerk mallRollPerk = mallRollPerkMapper.selectById(payOrderDto.getRollId());
                if(ObjectUtil.isEmpty(mallRollPerk)){
                    throw new FebsException("兑换券不存在");
                }
                int stateRoll = ObjectUtil.isEmpty(mallRollPerk.getState()) ? 2 : mallRollPerk.getState();
                if(stateRoll == 2){
                    throw new FebsException("兑换券已使用");
                }
                mallRollPerk.setState(2);
                mallRollPerk.setUpdateTime(DateUtil.date());
                mallRollPerkMapper.updateById(mallRollPerk);
                payResultStr = orderInfo.getOrderNo();

                orderInfo.setPayOrderNo(payOrderDto.getRollId().toString());
                orderInfo.setPayMethod("兑换券支付");
                orderInfo.setPayTime(new Date());
                orderInfo.setPayResult("1");

                stringBuffer.append(orderInfo.getId().toString());
                stringBuffer.append("@");
                stringBuffer.append(amountActualMsg);
                agentProducer.sendOrderGetMsg(stringBuffer.toString());

                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.ROLL_PAY.getValue(),
                        orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
                break;
            /**
             *  余额加微信
             */
            case "2,1":
                MallMemberWallet mallMemberWalletThree = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
                BigDecimal balanceThree = mallMemberWalletThree.getBalance();
                BigDecimal amountThree = orderInfo.getAmount();

//                int reduceThree = memberWalletService.reduce(balanceThree, member.getId(), "balance");
//                if (reduceThree == 2) {
//                    throw new FebsException("余额不足");
//                }
//                mallMoneyFlowService.addMoneyFlow(member.getId(), balanceThree.negate(), MoneyFlowTypeEnum.PAY.getValue(),
//                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);

                //实际支付余额
                BigDecimal amountActualThree = amountThree.subtract(balanceThree).setScale(2, BigDecimal.ROUND_DOWN);
                orderInfo.setAmount(amountActualThree);

                BrandWCPayRequestData brandWCPayRequestDataThree = null;
                try {
                    brandWCPayRequestDataThree = iXcxPayService.startPayment(orderInfo);
                } catch (Exception e) {
                    throw new FebsException("支付失败");
                }
                wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataThree);
                payResultStr = brandWCPayRequestDataThree.getPrepay_id();
                orderInfo.setPayMethod("余额加微信");
                orderInfo.setAmount(amountThree);
                amountActualMsg = amountThree.toString();

                stringBuffer.append(orderInfo.getId().toString());
                stringBuffer.append("@");
                stringBuffer.append(amountActualMsg);
                agentProducer.sendOrderGetMsg(stringBuffer.toString());
                break;
            /**
             *  积分加余额
             */
            case "3,2":
                /**
                 * 获取用户的当前积分
                 */
                MallMemberWallet mallMemberWalletNOne = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
                BigDecimal scoreOne = mallMemberWalletNOne.getScore();
                BigDecimal amountOne = orderInfo.getAmount();
                //积分兑换比例
                DataDictionaryCustom scoreChangeOneDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        DataDictionaryEnum.SCORE_CHANGE.getType(),
                        DataDictionaryEnum.SCORE_CHANGE.getCode()
                );
                BigDecimal scoreChangeOne = StrUtil.isEmpty(scoreChangeOneDic.getValue()) ? new BigDecimal("1") : new BigDecimal(scoreChangeOneDic.getValue());
                int reduceOne = memberWalletService.reduce(scoreOne, member.getId(), "score");
                if (reduceOne == 2) {
                    throw new FebsException("积分余额不足");
                }
                BigDecimal scoreToAmountOne = scoreOne.divide(scoreChangeOne, 2, BigDecimal.ROUND_DOWN);
                //实际支付余额
                BigDecimal amountActualOne = amountOne.subtract(scoreToAmountOne).setScale(2, BigDecimal.ROUND_DOWN);
                int balanceOne = memberWalletService.reduce(amountActualOne, member.getId(), "balance");
                if (balanceOne == 2) {
                    throw new FebsException("余额不足");
                }
                orderInfo.setPayOrderNo(orderInfo.getOrderNo());
                orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                orderInfo.setPayTime(new Date());
                orderInfo.setPayResult("1");
                orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
                mallMoneyFlowService.addMoneyFlow(member.getId(), amountActualOne.negate(), MoneyFlowTypeEnum.PAY.getValue(),
                        orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                amountActualMsg = amountActualOne.toString();

                stringBuffer.append(orderInfo.getId().toString());
                stringBuffer.append("@");
                stringBuffer.append(amountActualMsg);
                agentProducer.sendOrderGetMsg(stringBuffer.toString());

                orderInfo.setPayMethod("积分加余额");
                mallMoneyFlowService.addMoneyFlow(member.getId(), scoreOne.negate(),
                        MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);
                break;
            /**
             *  积分加微信
             */
            case "3,1":
                MallMemberWallet mallMemberWalletNTwo = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
                BigDecimal scoreTwo = mallMemberWalletNTwo.getScore();
                BigDecimal amountTwo = orderInfo.getAmount();
                //积分兑换比例
                DataDictionaryCustom scoreChangeTwoDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                        DataDictionaryEnum.SCORE_CHANGE.getType(),
                        DataDictionaryEnum.SCORE_CHANGE.getCode()
                );
                BigDecimal scoreChangeTwo = StrUtil.isEmpty(scoreChangeTwoDic.getValue()) ? new BigDecimal("1") : new BigDecimal(scoreChangeTwoDic.getValue());
                int reduceTwo = memberWalletService.reduce(scoreTwo, member.getId(), "score");
                if (reduceTwo == 2) {
                    throw new FebsException("积分余额不足");
                }
                mallMoneyFlowService.addMoneyFlow(member.getId(), scoreTwo.negate(),
                        MoneyFlowTypeEnum.SCORE_PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue(),"积分支付",2);

                BigDecimal scoreToAmountTwo = scoreTwo.divide(scoreChangeTwo, 2, BigDecimal.ROUND_DOWN);
                //实际支付余额
                BigDecimal amountActualTwo = amountTwo.subtract(scoreToAmountTwo).setScale(2, BigDecimal.ROUND_DOWN);
                orderInfo.setAmount(amountActualTwo);

                BrandWCPayRequestData brandWCPayRequestDataTwo = null;
                try {
                    brandWCPayRequestDataTwo = iXcxPayService.startPayment(orderInfo);
                } catch (Exception e) {
                    throw new FebsException("支付失败");
                }
                wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestDataTwo);
                payResultStr = brandWCPayRequestDataTwo.getPrepay_id();
                orderInfo.setPayMethod("积分加微信");
                amountActualMsg = amountActualTwo.toString();


                stringBuffer.append(orderInfo.getId().toString());
                stringBuffer.append("@");
                stringBuffer.append(amountActualMsg);
                agentProducer.sendOrderGetMsg(stringBuffer.toString());
                break;
            default:
                throw new FebsException("请选择正确的支付方式");

        }
        if(ObjectUtil.isNotEmpty(payOrderDto.getUseTime())){
            orderInfo.setUseTime(DateUtil.parseDate(payOrderDto.getUseTime()));
        }

        //订单支付成功产生一个提货码
        String takeCode = ShareCodeUtil.toSerialCode(orderInfo.getId());
        orderInfo.setTakeCode(takeCode);

        this.baseMapper.updateById(orderInfo);


//        StringBuffer stringBuffer = new StringBuffer();
//        stringBuffer.append(orderInfo.getId().toString());
//        stringBuffer.append("@");
//        stringBuffer.append(amountActualMsg);
//        agentProducer.sendOrderGetMsg(stringBuffer.toString());
        agentProducer.sendRollSendMsg(orderInfo.getId());

//        OrderStateDto orderStateDto = new OrderStateDto();
//        orderStateDto.setOrderNo(orderInfo.getOrderNo());
@@ -492,6 +647,9 @@
            long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
            orderDetailVo.setRemainTime(remainTime);
        }
        String orderNo = orderInfo.getOrderNo();
        List<MoneyFlowVo> moneyFlowVos = mallMoneyFlowMapper.selectMoneyFlowByOrderNo(orderNo,orderInfo.getMemberId());
        orderDetailVo.setMoneyFlowVos(moneyFlowVos);
        return orderDetailVo;
    }

@@ -521,34 +679,46 @@
        orderInfo.setReceivingTime(new Date());
        this.baseMapper.updateById(orderInfo);

        //生成一条团长提成记录
//        Long orderInfoId = orderInfo.getId();
//        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);
//        if(CollUtil.isNotEmpty(mallOrderItemList)){
//
//            MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(orderInfo.getTakeUniqueCode());
//            Integer profitSwitch = mallTeamLeader.getProfitSwitch()==null?2:mallTeamLeader.getProfitSwitch();
//            BigDecimal bonusPercent =new BigDecimal(mallTeamLeader.getBonusPercent()==null?"0":mallTeamLeader.getBonusPercent());
//
//            if(1 == profitSwitch){
//                for(MallOrderItem mallOrderItem : mallOrderItemList){
//                    Integer state = mallOrderItem.getState() == null ? 1 : mallOrderItem.getState();
//                    if(1 == state){
//                        MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
//                        mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
//                        mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
//                        mallLeaderAchieve.setOrderItemId(mallOrderItem.getId());
//                        BigDecimal itemAmount = mallOrderItem.getAmount();
//                        mallLeaderAchieve.setAmount(itemAmount);
//                        BigDecimal bigDecimal = bonusPercent.multiply(itemAmount).setScale(2, BigDecimal.ROUND_DOWN);
//                        mallLeaderAchieve.setProfitAmount(bigDecimal);
//                        mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
//                        mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
//                        mallLeaderAchieveMapper.insert(mallLeaderAchieve);
//                    }
//                }
//            }
//        }
        //是否返利
        if(ObjectUtil.isNotEmpty(member.getReferrerId())){
            String referrerId = member.getReferrerId();
            MallMember mallMemberParent = memberMapper.selectInfoByInviteId(referrerId);
            Long parentId = mallMemberParent.getId();
            String orderNo = orderInfo.getOrderNo();
            MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberIdAndRtMemberId(orderNo, member.getId(), parentId);
            mallMoneyFlow.setStatus(2);
            mallMoneyFlow.setIsReturn(1);
            mallMoneyFlowMapper.updateById(mallMoneyFlow);
            memberWalletService.add(mallMoneyFlow.getAmount(), parentId, "balance");
        }
        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
        if(CollUtil.isNotEmpty(mallOrderItemList)){
            for(MallOrderItem mallOrderItem : mallOrderItemList){
                Long goodsId = mallOrderItem.getGoodsId();
                MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
                if(ObjectUtil.isEmpty(mallGoods)){
                    break;
                }
                //是否送券 1:是 2:否
                BigDecimal levelTwoPrice = mallGoods.getLevelTwoPrice();
                if(BigDecimal.ONE.compareTo(levelTwoPrice) == 0){
                    MallRollPerk mallRollPerk = new MallRollPerk();
                    mallRollPerk.setMemberId(member.getId());
                    mallRollPerk.setState(1);
                    mallRollPerk.setRollId(mallGoods.getLevelThreePrice().longValue());
                    mallRollPerkMapper.insert(mallRollPerk);
                }
                //赠送积分
                BigDecimal levelOnePrice = mallGoods.getLevelOnePrice();
                if(BigDecimal.ZERO.compareTo(levelOnePrice) <= 0){
                    memberWalletService.add(levelOnePrice, member.getId(), "score");

                    mallMoneyFlowService.addMoneyFlow(member.getId(), levelOnePrice, MoneyFlowTypeEnum.STATIC_BONUS.getValue(),
                            orderInfo.getOrderNo(),  FlowTypeEnum.SCORE.getValue(),"赠送积分",2);
                }
            }
        }

    }

    @Override