优惠卷

xiaoyong931011

2023-09-11 023a40799745789e5585a9f5448a11f6acb4f874

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

@@ -86,8 +86,10 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createOrder(AddOrderDto addOrderDto) {
        MallMember member = LoginUserUtil.getLoginUser();
        //验证用户的等级
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember member = mallMemberMapper.selectById(memberId);

                //验证用户的等级
//        if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
//            throw new FebsException("请先申请成为代理人");
//        }
@@ -179,15 +181,8 @@
                    if(1 != goodsResult){
                        throw new FebsException(mallGoods.getGoodsName() + "库存不足");
                    }
                    BigDecimal amount = BigDecimal.ZERO;
                    if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
                        //普通用户使用原价购买
                        amount = sku.getOriginalPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                    }else{
                        //合伙人使用折扣价
                        amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                    }
//                    BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));

                    BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
                    orderItem.setAmount(amount);
                    orderItem.setCnt(item.getCnt());
                    orderItem.setOrderId(orderInfo.getId());
@@ -370,7 +365,7 @@
                orderInfo.setPayResult("1");
                orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());

                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
                break;
            case "4":
                if (orderInfo.getOrderType() != 2) {
@@ -395,22 +390,6 @@

        this.baseMapper.updateById(orderInfo);



//        OrderStateDto orderStateDto = new OrderStateDto();
//        orderStateDto.setOrderNo(orderInfo.getOrderNo());
//        String productNames = getProductNames(orderInfo.getMemberId(), orderInfo.getId());
//        orderStateDto.setGoodsName(StrUtil.isEmpty(productNames)?"商品":productNames);
//        orderStateDto.setOrderState("已送达自提点");
//        orderStateDto.setTakeCode(orderInfo.getTakeCode());
//        String takeUniqueCode = orderInfo.getTakeUniqueCode();
//        MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
//        orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
//        orderStateDto.setOpenId(mallMemberMapper.selectById(orderInfo.getMemberId()).getOpenId());
//        DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getCode());
//        orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
////            iXcxPayService.pushOrderToAddress(orderStateDto);
//        iXcxPayService.uniformMessageSend(orderStateDto);
        Map<String, Object> map = new HashMap<>();
        map.put("orderInfo", payResultStr);
        map.put("orderNo", orderInfo.getOrderNo());
@@ -434,7 +413,7 @@
            throw new FebsException("支付密码错误");
        }

        int reduce = memberWalletService.reduce(orderInfo.getAmount().add(orderInfo.getCarriage()), mallMember.getId(), field);
        int reduce = memberWalletService.reduce(orderInfo.getAmount(), mallMember.getId(), field);
        if (reduce == 2) {
            throw new FebsException("余额不足");
        }