From 1a3cb3d15f1c159d12f7569c9058e6fbc114969a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 19 Dec 2022 11:01:22 +0800
Subject: [PATCH] 20221219 1、生成物流单号 2、支付后订单状态自动成为待收货状态 3、新增编辑商品后，会自动计算补贴金额和商品星级，并显示在后台商品列表中
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 143 ++++++++++++++++++++++++-----------------------
1 files changed, 74 insertions(+), 69 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 761b355..c05d958 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
@@ -83,10 +83,10 @@
public Long createOrder(AddOrderDto addOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
- MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
- if (address == null) {
- throw new FebsException("地址不存在");
- }
+// MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
+// if (address == null) {
+// throw new FebsException("地址不存在");
+// }
String orderNo = MallUtils.getOrderNum();
MallOrderInfo orderInfo = new MallOrderInfo();
@@ -94,11 +94,11 @@
orderInfo.setOrderTime(new Date());
orderInfo.setMemberId(member.getId());
orderInfo.setStatus(OrderStatusEnum.WAIT_PAY.getValue());
- orderInfo.setName(address.getName());
- orderInfo.setAddress(address.getArea() + address.getAddress());
- orderInfo.setPhone(address.getPhone());
- orderInfo.setLatitude(address.getLatitude());
- orderInfo.setLongitude(address.getLongitude());
+// orderInfo.setName(address.getName());
+// orderInfo.setAddress(address.getArea() + address.getAddress());
+// orderInfo.setPhone(address.getPhone());
+// orderInfo.setLatitude(address.getLatitude());
+// orderInfo.setLongitude(address.getLongitude());
orderInfo.setRemark(addOrderDto.getRemark());
orderInfo.setOrderType(addOrderDto.getOrderType());
@@ -106,21 +106,21 @@
throw new FebsException("参数错误");
}
- int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
- if(2 == deliverType){
- if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
- throw new FebsException("请选择门店");
- }
- Long shopId = addOrderDto.getShopId();
- MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
- if(ObjectUtil.isEmpty(mallShopApply)){
- throw new FebsException("请选择门店");
- }
- if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
- throw new FebsException("请选择门店");
- }
- orderInfo.setShopId(shopId);
- }
+// int deliverType = ObjectUtil.isEmpty(addOrderDto.getDeliverType()) ? 1 : addOrderDto.getDeliverType();
+// if(2 == deliverType){
+// if(ObjectUtil.isEmpty(addOrderDto.getShopId())){
+// throw new FebsException("请选择门店");
+// }
+// Long shopId = addOrderDto.getShopId();
+// MallShopApply mallShopApply = mallShopApplyMapper.selectById(shopId);
+// if(ObjectUtil.isEmpty(mallShopApply)){
+// throw new FebsException("请选择门店");
+// }
+// if(MallShopApply.APPLY_AGREE != mallShopApply.getStatus()){
+// throw new FebsException("请选择门店");
+// }
+// orderInfo.setShopId(shopId);
+// }
this.baseMapper.insert(orderInfo);
BigDecimal total = BigDecimal.ZERO;
@@ -204,13 +204,13 @@
}
orderInfo.setAmount(total);
- if(2 == deliverType){
- orderInfo.setDeliverType(2);
- orderInfo.setCarriage(BigDecimal.ZERO);
- }else{
- orderInfo.setDeliverType(1);
- orderInfo.setCarriage(carriage);
- }
+// if(2 == deliverType){
+// orderInfo.setDeliverType(2);
+// orderInfo.setCarriage(BigDecimal.ZERO);
+// }else{
+// orderInfo.setDeliverType(1);
+// orderInfo.setCarriage(carriage);
+// }
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
@@ -322,50 +322,55 @@
orderInfo.setPayOrderNo(orderInfo.getOrderNo());
orderInfo.setPayMethod("余额支付");
- orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+// orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ //订单支付成功后，订单直接变成待收货
+ orderInfo.setStatus(OrderStatusEnum.WAIT_FINISH.getValue());
+ //生成物流编号
+ String logisticsNo = MallUtils.getLogisticsNum(StrUtil.subSuf(payResultStr, payResultStr.length() - 2));
+ orderInfo.setPayTradeNo(logisticsNo);
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
- boolean hasTc = false;
+// boolean hasTc = false;
// 静态倍数
- List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
- if (CollUtil.isNotEmpty(orderItems)) {
- for (MallOrderItem orderItem : orderItems) {
- MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
- BigDecimal score = BigDecimal.ZERO;
- MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
- if (mallGoods.getIsNormal() == 2) {
- hasTc = true;
- score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
-// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
-// score = sku.getPresentPrice().multiply(staticMulti);
- // 普通商品也及时结算，不再10天结算
- } else {
- score = sku.getPresentPrice();
- }
-
- if (score.compareTo(BigDecimal.ZERO) > 0) {
- memberWalletService.add(score, member.getId(), "score");
- mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
- // 添加业绩
- mallAchieveService.add(orderItem.getId());
- }
- }
- }
+// List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
+// if (CollUtil.isNotEmpty(orderItems)) {
+// for (MallOrderItem orderItem : orderItems) {
+// MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
+// BigDecimal score = BigDecimal.ZERO;
+// MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
+// if (mallGoods.getIsNormal() == 2) {
+// hasTc = true;
+// score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
+//// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
+//// score = sku.getPresentPrice().multiply(staticMulti);
+// // 普通商品也及时结算，不再10天结算
+// } else {
+// score = sku.getPresentPrice();
+// }
+//
+// if (score.compareTo(BigDecimal.ZERO) > 0) {
+// memberWalletService.add(score, member.getId(), "score");
+// mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+//
+// // 添加业绩
+// mallAchieveService.add(orderItem.getId());
+// }
+// }
+// }
// 购买套餐后，升级为普通会员
- if (hasTc) {
- MallMember mallMember = memberMapper.selectById(member.getId());
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
- memberMapper.updateById(mallMember);
- }
- }
+// if (hasTc) {
+// MallMember mallMember = memberMapper.selectById(member.getId());
+// if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
+// mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+// memberMapper.updateById(mallMember);
+// }
+// }
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
+// agentProducer.sendAutoLevelUpMsg(member.getId());
+// agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -513,7 +518,8 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue()) {
+ Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
+ if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
orderDetailVo.setExpressNo(expressInfo.getExpressNo());
orderDetailVo.setExpressCom(expressInfo.getExpressCom());
@@ -531,7 +537,6 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
- Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
if(2 == deliverType){
MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
if(ObjectUtil.isNotEmpty(mallShopApply)){
--
Gitblit v1.9.1