From 452416e443c95947a52bfeea943d1792fbc6d3a0 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 12 Jun 2023 23:04:52 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..25797ed 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("超出领取最大限制");
}
@@ -301,6 +301,14 @@
orderInfo.setName("商品");
}else{
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);
@@ -540,16 +548,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