From 294ac0a5a3e27dd95a2f9edd5cb5fd5ab4279fda Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 29 Sep 2022 15:10:53 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 80e57a0..2c4106a 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
@@ -100,6 +100,9 @@
//订单范围内才允许下单
MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
+ if(ObjectUtil.isEmpty(address)){
+ throw new FebsException("请重新选择提货人信息");
+ }
// MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
// if(ObjectUtil.isNotEmpty(mallElectronicFence)){
// String inStr = iMallElectronicFenceService.fenceToLocation(mallElectronicFence.getGKey(),
@@ -494,7 +497,8 @@
IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
orderListDto.setMemberId(member.getId());
- IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
+// IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
+ IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectNewApiOrderListInPage(page, orderListDto);
if (CollUtil.isNotEmpty(mallOrderInfos.getRecords())) {
mallOrderInfos.getRecords().forEach(item -> {
item.setItems(mallOrderItemMapper.selectListByOrderId(item.getId()));
@@ -708,9 +712,9 @@
throw new FebsException("购买商品或sku不存在");
}
- if (sku.getStock() < mallOrderItem.getCnt()) {
- throw new FebsException(sku.getSkuName() + "库存不足");
- }
+// if (sku.getStock() < mallOrderItem.getCnt()) {
+// throw new FebsException(sku.getSkuName() + "库存不足");
+// }
MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
Integer goodsResult = mallGoodsMapper.updateStockAndVolumeByGoodsId(mallGoods.getId(), mallOrderItem.getCnt());
--
Gitblit v1.9.1