From e72e04ae5b82252fe0a848d3d1bf9496df6bbabc Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 15:53:08 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 18 +-----------------
1 files changed, 1 insertions(+), 17 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 97038c9..3eb553e 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
@@ -390,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());
@@ -429,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("余额不足");
}
--
Gitblit v1.9.1