订单

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

@@ -46,6 +46,11 @@ public class OrderSku extends BasePo {
     private String wlnSkuSpecId;
 
     /**
+     * 万里牛 sku名称
+     */
+    private String wlnSkuName;
+
+    /**
      * 数量
      */
     private BigDecimal quantity;

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderInfoVo.java

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 订单列表查询返回值实体
@@ -26,4 +27,9 @@ public class OrderInfoVo extends OrderInfo {
      */
     private Date deliveryTime;
 
+    /**
+     * 订单商品
+     */
+    private List<OrderSkuVo> orderSkuList;
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -76,6 +76,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             result.setDepartmentName(department.getName());
         }
 
+
         return result;
     }
 

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

@@ -93,8 +93,10 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             if (orderInfo != null) {
                 Integer processStatus = wlnOrder.getInteger("process_status");
                 if (ObjectUtil.notEqual(orderInfo.getWlnStatus(), processStatus)) {
-                    orderInfo.setWlnStatus(processStatus);
-                    updateOrderList.add(orderInfo);
+                    OrderInfo updateOrder = new OrderInfo();
+                    updateOrder.setId(orderInfo.getId());
+                    updateOrder.setWlnStatus(processStatus);
+                    updateOrderList.add(updateOrder);
                 }
                 continue;
             }
@@ -270,6 +272,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         orderSku.setPrintType(1);
         orderSku.setWlnSkuId(wlnOrderSku.getString("sys_goods_uid"));
         orderSku.setWlnSkuSpecId(wlnOrderSku.getString("sys_spec_uid"));
+        orderSku.setWlnSkuName(wlnOrderSku.getString("oln_sku_name"));
         if (skuSpec != null) {
             orderSku.setSkuId(skuSpec.getSkuId());
             orderSku.setSkuSpecId(skuSpec.getId());