caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper711 2024-09-18 15:40:02 +08:00
commit dc1d1a7e7e
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java
View File

@ -12,6 +12,7 @@ public enum DeliverStatusEnum {
* 发货状态 * 发货状态
*/ */
UNDELIVERED("未发货"), UNDELIVERED("未发货"),
PARTS_DELIVERED("部分发货"),
DELIVERED("已发货"), DELIVERED("已发货"),
RECEIVED("已收货"); RECEIVED("已收货");

1
framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java
View File

@ -14,6 +14,7 @@ public enum OrderStatusEnum {
UNPAID("未付款"), UNPAID("未付款"),
PAID("已付款"), PAID("已付款"),
UNDELIVERED("待发货"), UNDELIVERED("待发货"),
PARTS_DELIVERED("部分发货"),
DELIVERED("已发货"), DELIVERED("已发货"),
COMPLETED("已完成"), COMPLETED("已完成"),
STAY_PICKED_UP("待自提"), STAY_PICKED_UP("待自提"),

6
framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java
View File

@ -73,18 +73,18 @@ public class AllowOperation implements Serializable {
//可编辑订单收件人信息=实物订单 && 订单未发货 && 订单未取消 && 订单不是自提 //可编辑订单收件人信息=实物订单 && 订单未发货 && 订单未取消 && 订单不是自提
this.editConsignee = order.getOrderType().equals(OrderTypeEnum.NORMAL.name()) this.editConsignee = order.getOrderType().equals(OrderTypeEnum.NORMAL.name())
&& order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) && (order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) || order.getDeliverStatus().equals(DeliverStatusEnum.PARTS_DELIVERED.name()))
&& !status.equals(OrderStatusEnum.CANCELLED.name()) && !status.equals(OrderStatusEnum.CANCELLED.name())
&& !order.getDeliveryMethod().equals(DeliveryMethodEnum.SELF_PICK_UP.name()); && !order.getDeliveryMethod().equals(DeliveryMethodEnum.SELF_PICK_UP.name());
//是否允许被发货 //是否允许被发货
this.ship = editConsignee && status.equals(OrderStatusEnum.UNDELIVERED.name()); this.ship = editConsignee && (status.equals(OrderStatusEnum.UNDELIVERED.name()) || order.getDeliverStatus().equals(DeliverStatusEnum.PARTS_DELIVERED.name()));
//是否允许被收货 //是否允许被收货
this.rog = status.equals(OrderStatusEnum.DELIVERED.name()); this.rog = status.equals(OrderStatusEnum.DELIVERED.name());
//是否允许查看物流信息 //是否允许查看物流信息
this.showLogistics = order.getDeliverStatus().equals(DeliverStatusEnum.DELIVERED.name()) && status.equals(OrderStatusEnum.DELIVERED.name()); this.showLogistics = (order.getDeliverStatus().equals(DeliverStatusEnum.DELIVERED.name()) || order.getDeliverStatus().equals(DeliverStatusEnum.PARTS_DELIVERED.name())) && (status.equals(OrderStatusEnum.DELIVERED.name()) || status.equals(OrderStatusEnum.PARTS_DELIVERED.name()));
//虚拟订单 或 自提订单可以核销 //虚拟订单 或 自提订单可以核销
this.take = this.take =

10
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -22,6 +22,7 @@ import cn.lili.common.utils.CurrencyUtil;
import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.SnowFlake;
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage; import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.member.entity.dto.MemberAddressDTO; import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.aftersale.entity.enums.ComplaintStatusEnum;
import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum; import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
import cn.lili.modules.order.order.aop.OrderLogPoint; import cn.lili.modules.order.order.aop.OrderLogPoint;
@ -470,7 +471,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
public Order delivery(String orderSn, String logisticsNo, String logisticsId) { public Order delivery(String orderSn, String logisticsNo, String logisticsId) {
Order order = OperationalJudgment.judgment(this.getBySn(orderSn)); Order order = OperationalJudgment.judgment(this.getBySn(orderSn));
//如果订单未发货，并且订单状态值等于待发货 //如果订单未发货，并且订单状态值等于待发货
if (order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) && order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name())) { if ((order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) || order.getDeliverStatus().equals(DeliverStatusEnum.PARTS_DELIVERED.name())) &&
(order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name()) || order.getOrderStatus().equals(OrderStatusEnum.PARTS_DELIVERED.name()))) {
//获取对应物流 //获取对应物流
Logistics logistics = logisticsService.getById(logisticsId); Logistics logistics = logisticsService.getById(logisticsId);
if (logistics == null) { if (logistics == null) {
@ -872,7 +874,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
throw new ServiceException("发货数量不正确!"); throw new ServiceException("发货数量不正确!");
} }
orderItem.setDeliverNumber((partDeliveryDTO.getDeliveryNum() + orderItem.getDeliverNumber())); orderItem.setDeliverNumber((partDeliveryDTO.getDeliveryNum() + orderItem.getDeliverNumber()));
// 记录分包裹中每个item子单的具体发货信息 // 记录分包裹中每个item子单的具体发货信息
OrderPackageItem orderPackageItem = new OrderPackageItem(); OrderPackageItem orderPackageItem = new OrderPackageItem();
orderPackageItem.setOrderSn(orderSn); orderPackageItem.setOrderSn(orderSn);
@ -906,6 +907,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
//是否全部发货 //是否全部发货
if (delivery) { if (delivery) {
return delivery(orderSn, invoiceNumber, logisticsId); return delivery(orderSn, invoiceNumber, logisticsId);
}else if(order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) || order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name())){
//更改订单状态为部分发货
order.setDeliverStatus(DeliverStatusEnum.PARTS_DELIVERED.name());
order.setOrderStatus(OrderStatusEnum.PARTS_DELIVERED.name());
this.updateById(order);
} }
return order; return order;
} }