From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 287d863..97fab9c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/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("超出领取最大限制");
}
@@ -303,6 +303,14 @@
orderInfo.setName(itemsWx.get(0).getGoodsName());
}
+ if (orderInfo.getScoreCnt().compareTo(BigDecimal.ZERO) > 0) {
+ int reduce = memberWalletService.reduce(orderInfo.getScoreCnt(), member.getId(), "prizeScore");
+ if (reduce == 2) {
+ throw new FebsException("积分不足");
+ }
+ mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getScoreCnt().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
+ }
+
payResultStr = wechatPayService.pay(orderInfo);
orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("微信支付");
@@ -365,14 +373,14 @@
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) {
@@ -383,7 +391,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);
@@ -540,16 +547,15 @@
orderDetailVo.setRemainTime(remainTime);
}
if(2 == deliverType){
- MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
+ MallShop mallShopApply = mallShopMapper.selectById(orderInfo.getShopId());
if(ObjectUtil.isNotEmpty(mallShopApply)){
ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
- apiShopApplyVo.setName(mallShopApply.getName());
+ apiShopApplyVo.setName(mallShopApply.getShopName());
apiShopApplyVo.setPhone(mallShopApply.getPhone());
- apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
- apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
- apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
+ apiShopApplyVo.setLatitude(mallShopApply.getLatitude().toPlainString());
+ apiShopApplyVo.setLongitude(mallShopApply.getLongitude().toPlainString());
apiShopApplyVo.setShopName(mallShopApply.getShopName());
- apiShopApplyVo.setAddress(mallShopApply.getAddress());
+ apiShopApplyVo.setAddress(mallShopApply.getShopAddress());
orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
}
}
--
Gitblit v1.9.1