From 0603efa1eede578756fc213e6e61d0de8dcbea27 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 25 Dec 2023 15:33:52 +0800
Subject: [PATCH] 富文本框输入版本变化
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 3339e6c..e8d3ee8 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(),
@@ -223,19 +226,19 @@
orderInfo.setCarriage(delivaryAmount);
}
orderInfo.setAmount(total);
-
+ orderInfo.setAddressId(address.getId());
orderInfo.setName(address.getName());
orderInfo.setPhone(address.getPhone());
orderInfo.setIsHome(addOrderDto.getIsHome());
//订单金额大于50，且选择送货上门，订单需要选择地址信息
- if(1 == addOrderDto.getIsHome()){
+// if(1 == addOrderDto.getIsHome()){
if (StrUtil.isBlank(address.getLatitude())||StrUtil.isBlank(address.getLongitude())) {
throw new FebsException("请添加地址");
}
orderInfo.setAddress(address.getArea() + address.getAddress());
orderInfo.setLatitude(address.getLatitude());
orderInfo.setLongitude(address.getLongitude());
- }
+// }
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -376,7 +379,7 @@
orderInfo.setPayMethod("余额支付");
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setPayTime(new Date());
- orderInfo.setPayResult("1");
+ orderInfo.setPayResult(1);
orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
// boolean hasTc = false;
@@ -427,7 +430,7 @@
orderInfo.setPayMethod("积分支付");
orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
orderInfo.setPayTime(new Date());
- orderInfo.setPayResult("1");
+ orderInfo.setPayResult(1);
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
break;
@@ -709,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