From 7ce147f2b1dff457ed9d32239dd9f10057d784da Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 11 Jun 2023 11:46:20 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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..e63d158 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
@@ -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("微信支付");
@@ -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