weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-01-31 19:53:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

feat:解决代码冲突

Browse source
This commit is contained in:
wst 2024-12-06 20:17:11 +08:00
commit a62f31e71f
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
skyeye-shop/shop-store/src/main/java/com/skyeye/order/service/impl/OrderServiceImpl.java
View file

@ -292,7 +292,9 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl<OrderDao, Order>
ShopOrderState.SIGN.getKey(), // 已签收 ShopOrderState.SIGN.getKey(), // 已签收
ShopOrderState.COMPLETED.getKey(), // 已完成 ShopOrderState.COMPLETED.getKey(), // 已完成
ShopOrderState.UNEVALUATE.getKey(), // 待评价 ShopOrderState.UNEVALUATE.getKey(), // 待评价
ShopOrderState.EVALUATED.getKey()});// 已评价 ShopOrderState.EVALUATED.getKey(),// 已评价
ShopOrderState.PARTIALLYDONE.getKey(),//部分完成
ShopOrderState.PARTIALEVALUATION.getKey()});//部分评价
break; break;
case "4":// 已取消 case "4":// 已取消
stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()});
@ -347,33 +349,34 @@ public class OrderServiceImpl extends SkyeyeBusinessServiceImpl<OrderDao, Order>
break; break;
case "2": // 待收货 case "2": // 待收货
stateList = Arrays.asList(new Integer[]{ stateList = Arrays.asList(new Integer[]{
ShopOrderState.UNDELIVERED.getKey(), // 待发货
ShopOrderState.DELIVERED.getKey(), // 已发货 ShopOrderState.UNDELIVERED.getKey(),// 待发货
ShopOrderState.TRANSPORTING.getKey()}); // 运输中 ShopOrderState.DELIVERED.getKey(), // 已发货
ShopOrderState.TRANSPORTING.getKey()});//运输中
break; break;
case "3":// 已完成 case "3":// 已完成
stateList = Arrays.asList(new Integer[]{ stateList = Arrays.asList(new Integer[]{
ShopOrderState.SIGN.getKey(), // 已签收 ShopOrderState.SIGN.getKey(), // 已签收
ShopOrderState.COMPLETED.getKey(), // 已完成 ShopOrderState.COMPLETED.getKey(), // 已完成
ShopOrderState.UNEVALUATE.getKey(), // 待评价 ShopOrderState.UNEVALUATE.getKey(), // 待评价
ShopOrderState.EVALUATED.getKey(), // 已评价 ShopOrderState.EVALUATED.getKey(),// 已评价
ShopOrderState.PARTIALLYDONE.getKey(), // 部分完成 ShopOrderState.PARTIALLYDONE.getKey(),//部分完成
ShopOrderState.PARTIALEVALUATION.getKey()});// 部分评价 ShopOrderState.PARTIALEVALUATION.getKey()});//部分评价
break; break;
case "4":// 已取消 case "4":// 已取消
stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()}); stateList = Arrays.asList(new Integer[]{ShopOrderState.CANCELED.getKey()});
break; break;
case "5":// 处理中 case "5":// 处理中
stateList = Arrays.asList(new Integer[]{ stateList = Arrays.asList(new Integer[]{
ShopOrderState.REFUNDING.getKey(), // 退款中 ShopOrderState.REFUNDING.getKey(), // 退款中
ShopOrderState.SALESRETURNING.getKey(), // 退货中 ShopOrderState.SALESRETURNING.getKey(),//退货中
ShopOrderState.EXCHANGEING.getKey()}); // 换货中 ShopOrderState.EXCHANGEING.getKey()});//换货中
break; break;
case "6": // 申请记录 case "6": // 申请记录
stateList = Arrays.asList(new Integer[]{ stateList = Arrays.asList(new Integer[]{
ShopOrderState.REFUND.getKey(), // 已退款 ShopOrderState.REFUND.getKey(), // 已退款
ShopOrderState.SALESRETURNED.getKey(), // 已退货 ShopOrderState.SALESRETURNED.getKey(),//已退货
ShopOrderState.EXCHANGED.getKey()}); // 已换货 ShopOrderState.EXCHANGED.getKey()});//已换货
} }
QueryWrapper<Order> wrapper = new QueryWrapper<>(); QueryWrapper<Order> wrapper = new QueryWrapper<>();
if (CollectionUtil.isNotEmpty(stateList)) { // 状态列表为空时，则查询全部订单 if (CollectionUtil.isNotEmpty(stateList)) { // 状态列表为空时，则查询全部订单