fix

Hentua

2023-06-15 5bde8becd930fad8e99fbd395a372cbe1ea94748

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

@@ -149,7 +149,7 @@

                if (mallGoods.getRulesTimes() != null && mallGoods.getRulesCnt() != null) {
                    DateTime startDate = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -mallGoods.getRulesTimes());
                    List<MallOrderInfo> orderInfos = this.baseMapper.selectScoreOrderListInDate(DateUtil.beginOfDay(startDate), DateUtil.endOfDay(new Date()), mallGoods.getId());
                    List<MallOrderInfo> orderInfos = this.baseMapper.selectScoreOrderListInDate(DateUtil.beginOfDay(startDate), DateUtil.endOfDay(new Date()), mallGoods.getId(), member.getId());
                    if (CollUtil.isNotEmpty(orderInfos) && orderInfos.size() >= mallGoods.getRulesCnt()) {
                        throw new FebsException("超出领取最大限制");
                    }
@@ -282,7 +282,9 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
        MallMember member = LoginUserUtil.getLoginUser();
        MallMember mallMember = LoginUserUtil.getLoginUser();
        MallMember member = memberMapper.selectById(mallMember.getId());

        MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(payOrderDto.getId());
        if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
            throw new FebsException("订单不存在");
@@ -373,14 +375,15 @@

                    mallAchieveService.add(item.getId());
                }

                // 根据用户购买的商品设置其等级
                member.setLevel(GoodsToLevelEnums.getLevelByAccountLevel(goodsLevel));
                member.setAccountLevel(goodsLevel);

                String level = GoodsToLevelEnums.getLevelByAccountLevel(goodsLevel);
                if (MemberLevelEnum.getLevelCode(member.getLevel()) < MemberLevelEnum.getLevelCode(level)) {
                    member.setLevel(level);
                }
                this.memberMapper.updateById(member);

                memberWalletService.add(score, member.getId(), "score");

                if (orderInfo.getScoreCnt().compareTo(BigDecimal.ZERO) > 0) {
                    int reduce = memberWalletService.reduce(orderInfo.getScoreCnt(), member.getId(), "prizeScore");
                    if (reduce == 2) {
@@ -391,7 +394,6 @@

                mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.BUY_TC.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().subtract(orderInfo.getScoreAmount()).negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());

                ThreadUtil.execute(() -> {
                    ThreadUtil.sleep(5000);