APP下单PC端订单流程调整

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/enums/OrderInfoSourceEnum.java

@@ -9,8 +9,8 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public enum OrderInfoSourceEnum {
-    A("小程序"),
-    B("公众号")
+    A("APP"),
+    B("PC")
     ;
 
     private final String remark;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/OrderLogic.java

@@ -362,11 +362,7 @@ public class OrderLogic {
         }
 
         //来源
-        if (orderBuyBean.getMiniPay() != null && orderBuyBean.getMiniPay()) {
-            orderInfo.setSource(OrderInfoSourceEnum.A.getRemark());
-        } else {
-            orderInfo.setSource(OrderInfoSourceEnum.B.getRemark());
-        }
+        orderInfo.setSource(OrderInfoSourceEnum.A.getRemark());
 
         orderInfoService.save(orderInfo);
         //新增订单详情

mall-server-api/src/main/java/com/gree/mall/manager/enums/OrderStatusEnum.java

@@ -2,6 +2,9 @@ package com.gree.mall.manager.enums;
 
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Getter
 public enum OrderStatusEnum {
     NOPAY("待付款"),
@@ -20,4 +23,9 @@ public enum OrderStatusEnum {
         this.name = name;
     }
     private String name;
+
+    public static boolean cancelOrderContains(String value) {
+        List<String> orderStatusList = Arrays.asList(OrderStatusEnum.NOPAY.toString(), OrderStatusEnum.DQR.toString(), OrderStatusEnum.DFH.toString());
+        return orderStatusList.contains(value);
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderDeliveryLogic.java

@@ -186,9 +186,11 @@ public class OrderDeliveryLogic {
                     .orElse(0);
 
             final String barcodeText = orderDeliveryList.stream()
-                    .filter(item -> item.getOrderDetailId().equals(orderDetail.getOrderDetailId()))
-                    .map(OrderDeliveryDetailBean::getBarcodeText)
-                    .findFirst().orElse("");
+                    .filter(item -> Objects.nonNull(item) &&
+                            orderDetail.getOrderDetailId().equals(item.getOrderDetailId()))
+                    .map(v -> StringUtils.isBlank(v.getBarcodeText()) ? "" : v.getBarcodeText())
+                    .findFirst()
+                    .orElse("");;
 
             orderDetail.setSendStockNum(orderDetail.getSendStockNum() + integer);
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -336,7 +336,7 @@ public class OrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         OrderInfo orderInfo = orderInfoService.getById(orderId);
 
-        if(!orderInfo.getOrderStatus().equals(OrderStatusEnum.NOPAY.toString())) {
+        if(!OrderStatusEnum.cancelOrderContains(orderInfo.getOrderStatus())) {
             throw new RemoteServiceException("订单当前状态不可取消");
         }