删除多余字段

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -58,6 +58,24 @@ public class OrderInfo extends BasePo {
 
     /**
      * 万里牛订单状态
+     * -3:分销商审核
+     * -2:到账管理
+     * -1:未付款
+     * 0:审核
+     * 1:打单配货
+     * 2:验货
+     * 3:称重
+     * 4:待发货
+     * 5：财审
+     * 8:已发货
+     * 9:成功
+     * 10:关闭
+     * 11:异常结束
+     * 12:异常处理
+     * 13:外部系统配货中
+     * 14:预售
+     * 15:打包
+     * 19:拣货
      */
     private Integer wlnStatus;
 
@@ -107,7 +125,7 @@ public class OrderInfo extends BasePo {
     private String shopName;
 
     /**
-     * 进度
+     * 进度 {@link com.sd.business.entity.order.enums.OrderStatusEnum}
      */
     private Integer status;
 

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -205,7 +205,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         }
 
         // 订单进度
-        if (department != null && Objects.equals(department.getOrderMode(), "2") && orderInfo.getWlnStatus() != 1) {
+        if (department != null && Objects.equals(department.getOrderMode(), "2")) {
             orderInfo.setStatus(OrderStatusEnum.SCHEDULING.getKey());
         } else {
             orderInfo.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
@@ -330,9 +330,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         }
 
         // 万里牛订单状态不为1时，订单状态修改为备料中
-        if (department != null
-                && Objects.equals(department.getOrderMode(), "2")
-                && orderInfo.getWlnStatus() != 1
+        if (department != null && Objects.equals(department.getOrderMode(), "2")
                 && Objects.equals(orderInfo.getStatus(), OrderStatusEnum.UNDER_REVIEW.getKey())) {
             orderInfo.setStatus(OrderStatusEnum.SCHEDULING.getKey());
         }
@@ -511,10 +509,10 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
         OrderSku orderSku = new OrderSku();
         orderSku.setId(IdWorker.getId());
+        orderSku.setOrderId(orderInfo.getId());
         orderSku.setWlnSkuId(wlnOrderSku.getString("sys_goods_uid"));
         orderSku.setWlnSkuSpecId(wlnOrderSku.getString("sys_spec_uid"));
         orderSku.setWlnSkuName(wlnOrderSku.getString("oln_sku_name"));
-        orderSku.setOrderId(orderInfo.getId());
         orderSku.setQuantity(wlnOrderSku.getBigDecimal("size"));
 
         orderSku.setUnitPrice(BigDecimal.ZERO);