24282 преди 1 година
родител
ревизия
c395ad86fc

+ 12 - 9
sd-business/src/main/java/com/sd/business/controller/order/OrderController.java

@@ -1,13 +1,16 @@
 package com.sd.business.controller.order;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.order.vo.OrderVo;
-import com.sd.business.entity.order.dto.OrderSelectDto;
-import com.sd.business.entity.order.dto.OrderDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.order.dto.OrderInfoDto;
+import com.sd.business.entity.order.dto.OrderSelectDto;
+import com.sd.business.entity.order.vo.OrderInfoVo;
 import com.sd.business.service.order.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -30,7 +33,7 @@ public class OrderController {
      * 订单列表
      */
     @PostMapping("/list")
-    public List<OrderVo> list(@RequestBody OrderSelectDto dto) {
+    public List<OrderInfoVo> list(@RequestBody OrderSelectDto dto) {
         return orderService.getList(dto);
     }
 
@@ -38,7 +41,7 @@ public class OrderController {
      * 订单分页
      */
     @PostMapping("/page")
-    public Page<OrderVo> page(@RequestBody OrderSelectDto dto) {
+    public Page<OrderInfoVo> page(@RequestBody OrderSelectDto dto) {
         return orderService.getPage(dto);
     }
 
@@ -46,7 +49,7 @@ public class OrderController {
      * 订单明细
      */
     @PostMapping("/detail")
-    public OrderVo detail(@RequestBody BaseSelectDto dto) {
+    public OrderInfoVo detail(@RequestBody BaseSelectDto dto) {
         return orderService.detail(dto.getId());
     }
 
@@ -54,7 +57,7 @@ public class OrderController {
      * 订单新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody OrderDto orderDto) {
+    public void add(@RequestBody OrderInfoDto orderDto) {
         orderService.add(orderDto);
     }
 
@@ -62,7 +65,7 @@ public class OrderController {
      * 订单编辑
      */
     @PostMapping("/edit")
-    public void edit(@RequestBody OrderDto orderDto) {
+    public void edit(@RequestBody OrderInfoDto orderDto) {
         orderService.edit(orderDto);
     }
 

+ 3 - 3
sd-business/src/main/java/com/sd/business/entity/order/dto/OrderDto.java → sd-business/src/main/java/com/sd/business/entity/order/dto/OrderInfoDto.java

@@ -1,17 +1,17 @@
 package com.sd.business.entity.order.dto;
 
-import com.sd.business.entity.order.po.Order;
+import com.sd.business.entity.order.po.OrderInfo;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * 订单新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
 @Getter
 @Setter
-public class OrderDto extends Order {
+public class OrderInfoDto extends OrderInfo {
 
 }

+ 2 - 2
sd-business/src/main/java/com/sd/business/entity/order/po/Order.java → sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -18,8 +18,8 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@TableName("`order`")
-public class Order extends BasePo {
+@TableName("order_info")
+public class OrderInfo extends BasePo {
 
     /**
      * 来源 1自定义添加 2万里牛

+ 3 - 3
sd-business/src/main/java/com/sd/business/entity/order/vo/OrderVo.java → sd-business/src/main/java/com/sd/business/entity/order/vo/OrderInfoVo.java

@@ -1,17 +1,17 @@
 package com.sd.business.entity.order.vo;
 
-import com.sd.business.entity.order.po.Order;
+import com.sd.business.entity.order.po.OrderInfo;
 import lombok.Getter;
 import lombok.Setter;
 
 /**
  * 订单列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
 @Getter
 @Setter
-public class OrderVo extends Order {
+public class OrderInfoVo extends OrderInfo {
 
 }

+ 6 - 6
sd-business/src/main/java/com/sd/business/mapper/order/OrderMapper.java

@@ -1,10 +1,10 @@
 package com.sd.business.mapper.order;
 
-import com.sd.business.entity.order.po.Order;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.order.vo.OrderVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.order.po.OrderInfo;
+import com.sd.business.entity.order.vo.OrderInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,19 +14,19 @@ import java.util.List;
  * 订单 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
-public interface OrderMapper extends BaseMapper<Order> {
+public interface OrderMapper extends BaseMapper<OrderInfo> {
 
     /**
      * 订单列表
      */
-    List<OrderVo> getList(@Param("ew") IWrapper<Order> wrapper);
+    List<OrderInfoVo> getList(@Param("ew") IWrapper<OrderInfo> wrapper);
 
     /**
      * 订单分页
      */
-    Page<OrderVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Order> wrapper);
+    Page<OrderInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<OrderInfo> wrapper);
 
 }

+ 11 - 11
sd-business/src/main/java/com/sd/business/service/order/OrderService.java

@@ -1,11 +1,11 @@
 package com.sd.business.service.order;
 
-import com.sd.business.entity.order.po.Order;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.order.vo.OrderVo;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
-import com.sd.business.entity.order.dto.OrderDto;
+import com.sd.business.entity.order.po.OrderInfo;
+import com.sd.business.entity.order.vo.OrderInfoVo;
 
 import java.util.List;
 
@@ -14,35 +14,35 @@ import java.util.List;
  * 订单 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
-public interface OrderService extends BaseService<Order> {
+public interface OrderService extends BaseService<OrderInfo> {
 
     /**
      * 订单列表
      */
-    List<OrderVo> getList(OrderSelectDto dto);
+    List<OrderInfoVo> getList(OrderSelectDto dto);
 
     /**
      * 订单分页
      */
-    Page<OrderVo> getPage(OrderSelectDto dto);
+    Page<OrderInfoVo> getPage(OrderSelectDto dto);
 
     /**
      * 订单明细
      */
-    OrderVo detail(Long id);
+    OrderInfoVo detail(Long id);
 
     /**
      * 订单新增
      */
-    void add(OrderDto orderDto);
+    void add(OrderInfoDto orderDto);
 
     /**
      * 订单编辑
      */
-    void edit(OrderDto orderDto);
+    void edit(OrderInfoDto orderDto);
 
     /**
      * 订单删除

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

@@ -1,16 +1,16 @@
 package com.sd.business.service.order.impl;
 
-import com.sd.business.entity.order.po.Order;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.order.dto.OrderInfoDto;
+import com.sd.business.entity.order.dto.OrderSelectDto;
+import com.sd.business.entity.order.po.OrderInfo;
+import com.sd.business.entity.order.vo.OrderInfoVo;
 import com.sd.business.mapper.order.OrderMapper;
 import com.sd.business.service.order.OrderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.order.vo.OrderVo;
-import com.sd.business.entity.order.dto.OrderSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.order.dto.OrderDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.util.List;
 
@@ -19,42 +19,42 @@ import java.util.List;
  * 订单 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
 @Service
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implements OrderService {
 
     @Override
-    public List<OrderVo> getList(OrderSelectDto dto) {
-        IWrapper<Order> wrapper = getWrapper();
-        wrapper.orderByDesc("o", Order::getId);
-        List<OrderVo> list = this.baseMapper.getList(wrapper);
+    public List<OrderInfoVo> getList(OrderSelectDto dto) {
+        IWrapper<OrderInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("o", OrderInfo::getId);
+        List<OrderInfoVo> list = this.baseMapper.getList(wrapper);
         return list;
     }
 
     @Override
-    public Page<OrderVo> getPage(OrderSelectDto dto) {
-        IWrapper<Order> wrapper = getWrapper();
-        wrapper.orderByDesc("o", Order::getId);
-        Page<OrderVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+    public Page<OrderInfoVo> getPage(OrderSelectDto dto) {
+        IWrapper<OrderInfo> wrapper = getWrapper();
+        wrapper.orderByDesc("o", OrderInfo::getId);
+        Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }
 
     @Override
-    public OrderVo detail(Long id) {
-        Order Order = this.getById(id);
-        OrderVo result = BeanUtil.toBean(Order, OrderVo.class);
+    public OrderInfoVo detail(Long id) {
+        OrderInfo OrderInfo = this.getById(id);
+        OrderInfoVo result = BeanUtil.toBean(OrderInfo, OrderInfoVo.class);
         return result;
     }
 
     @Override
-    public void add(OrderDto orderDto) {
+    public void add(OrderInfoDto orderDto) {
         this.save(orderDto);
     }
 
     @Override
-    public void edit(OrderDto orderDto) {
+    public void edit(OrderInfoDto orderDto) {
         this.updateById(orderDto);
     }
 

+ 66 - 68
sd-business/src/main/resources/mapper/order/OrderMapper.xml

@@ -1,77 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.order.OrderMapper">
-    <select id="getList" resultType="com.sd.business.entity.order.vo.OrderVo">
-        select
-            o.id,
-            o.code,
-            o.wln_code,
-            o.express_delivery_code,
-            o.schedule,
-            o.settlement_status,
-            o.commerce_platform,
-            o.total_amount,
-            o.product_total_amount,
-            o.custom_processing_fee,
-            o.lssue_fee,
-            o.delivery_materials_fee,
-            o.packing_labor,
-            o.packaging_material_cost,
-            o.delivery_time,
-            o.order_time,
-            o.shipping_time,
-            o.consignee,
-            o.consignee_number,
-            o.province,
-            o.city,
-            o.county,
-            o.detailed_address,
-            o.postcode,
-            o.department_id,
-            o.express_delivery_id,
-            o.remark,
-            o.create_user,
-            o.create_time,
-            o.update_user,
-            o.update_time
-        from order o
+    <select id="getList" resultType="com.sd.business.entity.order.vo.OrderInfoVo">
+        select o.id,
+               o.code,
+               o.wln_code,
+               o.express_delivery_code,
+               o.status,
+               o.settlement_status,
+               o.commerce_platform,
+               o.total_amount,
+               o.product_total_amount,
+               o.custom_processing_fee,
+               o.lssue_fee,
+               o.delivery_materials_fee,
+               o.packing_labor,
+               o.packaging_material_cost,
+               o.delivery_time,
+               o.order_time,
+               o.shipping_time,
+               o.consignee,
+               o.consignee_number,
+               o.province,
+               o.city,
+               o.county,
+               o.detailed_address,
+               o.postcode,
+               o.department_id,
+               o.express_delivery_id,
+               o.remark,
+               o.create_user,
+               o.create_time,
+               o.update_user,
+               o.update_time
+        from order_info o
             ${ew.customSqlSegment}
     </select>
 
-    <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderVo">
-        select
-            o.id,
-            o.code,
-            o.wln_code,
-            o.express_delivery_code,
-            o.schedule,
-            o.settlement_status,
-            o.commerce_platform,
-            o.total_amount,
-            o.product_total_amount,
-            o.custom_processing_fee,
-            o.lssue_fee,
-            o.delivery_materials_fee,
-            o.packing_labor,
-            o.packaging_material_cost,
-            o.delivery_time,
-            o.order_time,
-            o.shipping_time,
-            o.consignee,
-            o.consignee_number,
-            o.province,
-            o.city,
-            o.county,
-            o.detailed_address,
-            o.postcode,
-            o.department_id,
-            o.express_delivery_id,
-            o.remark,
-            o.create_user,
-            o.create_time,
-            o.update_user,
-            o.update_time
-        from order o
+    <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderInfoVo">
+        select o.id,
+               o.code,
+               o.wln_code,
+               o.express_delivery_code,
+               o.status,
+               o.settlement_status,
+               o.commerce_platform,
+               o.total_amount,
+               o.product_total_amount,
+               o.custom_processing_fee,
+               o.lssue_fee,
+               o.delivery_materials_fee,
+               o.packing_labor,
+               o.packaging_material_cost,
+               o.delivery_time,
+               o.order_time,
+               o.shipping_time,
+               o.consignee,
+               o.consignee_number,
+               o.province,
+               o.city,
+               o.county,
+               o.detailed_address,
+               o.postcode,
+               o.department_id,
+               o.express_delivery_id,
+               o.remark,
+               o.create_user,
+               o.create_time,
+               o.update_user,
+               o.update_time
+        from order_info o
             ${ew.customSqlSegment}
     </select>
 

+ 6 - 6
sd-wln/src/main/java/com/sd/wln/scheduled/WlnSyncTask.java

@@ -18,8 +18,8 @@ public class WlnSyncTask {
     /**
      * 每天同步库存
      */
-    // @Scheduled(cron = "0 0 1 * * ?")
-    @Scheduled(cron = "0/1 * * * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
+    // @Scheduled(cron = "0/1 * * * * ?")
     public void syncSku() {
         for (int i = 0; i < 3; i++) {
             boolean flag = wlnSkuService.syncSkuClassify();
@@ -36,9 +36,9 @@ public class WlnSyncTask {
         }
     }
 
-    // @Scheduled(fixedDelay = 30 * 1000)
-    // private void syncOrder() {
-    //     wlnOrderService.syncOrder();
-    // }
+    @Scheduled(fixedDelay = 30 * 1000)
+    private void syncOrder() {
+        wlnOrderService.syncOrder();
+    }
 
 }

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

@@ -10,7 +10,7 @@ import com.fjhx.tenant.entity.dict.po.DictCommonData;
 import com.fjhx.tenant.service.dict.DictCommonDataService;
 import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.enums.OrderStatusEnum;
-import com.sd.business.entity.order.po.Order;
+import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.service.department.DepartmentService;
@@ -58,28 +58,28 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         }
         Map<String, Department> departmentMap = getDepartmentMap();
 
-        List<Order> saveOrderList = new ArrayList<>();
+        List<OrderInfo> saveOrderListInfo = new ArrayList<>();
         List<OrderSku> saveOrderSkuList = new ArrayList<>();
 
-        List<Order> updateOrderList = new ArrayList<>();
+        List<OrderInfo> updateOrderListInfo = new ArrayList<>();
 
-        List<Order> orderList = orderService.list(q ->
-                q.between(Order::getWlnApproveTime, DateUtil.offsetDay(endDate, -3), endDate));
-        Map<String, Order> orderMap = orderList.stream().collect(Collectors.toMap(Order::getWlnUid, Function.identity()));
+        List<OrderInfo> orderInfoList = orderService.list(q ->
+                q.between(OrderInfo::getWlnApproveTime, DateUtil.offsetDay(endDate, -3), endDate));
+        Map<String, OrderInfo> orderMap = orderInfoList.stream().collect(Collectors.toMap(OrderInfo::getWlnUid, Function.identity()));
 
         for (JSONObject wlnOrder : wlnOrderList) {
             String uid = wlnOrder.getString("uid");
-            Order order = orderMap.get(uid);
-            if (order != null) {
+            OrderInfo orderInfo = orderMap.get(uid);
+            if (orderInfo != null) {
                 Integer processStatus = wlnOrder.getInteger("process_status");
-                if (ObjectUtil.notEqual(order.getWlnStatus(), processStatus)) {
-                    order.setWlnStatus(processStatus);
-                    updateOrderList.add(order);
+                if (ObjectUtil.notEqual(orderInfo.getWlnStatus(), processStatus)) {
+                    orderInfo.setWlnStatus(processStatus);
+                    updateOrderListInfo.add(orderInfo);
                 }
                 continue;
             }
 
-            order = createOrder(wlnOrder, departmentMap);
+            orderInfo = createOrder(wlnOrder, departmentMap);
             List<JSONObject> wlnOrderSkuList = wlnOrder.getJSONArray("orders").toJavaList(JSONObject.class);
 
             if (ObjectUtil.isNotEmpty(wlnOrderSkuList)) {
@@ -94,17 +94,17 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
                 for (JSONObject wlnOrderSku : wlnOrderSkuList) {
                     SkuSpec skuSpec = skuSpecMap.get(wlnOrderSku.getString("sys_spec_uid"));
-                    OrderSku orderSku = createOrderSku(wlnOrderSku, order, skuSpec);
+                    OrderSku orderSku = createOrderSku(wlnOrderSku, orderInfo, skuSpec);
                     saveOrderSkuList.add(orderSku);
                 }
 
             }
 
-            saveOrderList.add(order);
+            saveOrderListInfo.add(orderInfo);
         }
 
-        orderService.saveBatch(saveOrderList);
-        orderService.updateBatchById(updateOrderList);
+        orderService.saveBatch(saveOrderListInfo);
+        orderService.updateBatchById(updateOrderListInfo);
         orderSkuService.saveBatch(saveOrderSkuList);
         return true;
     }
@@ -162,25 +162,25 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         return departmentMap;
     }
 
-    private Order createOrder(JSONObject wlnOrder, Map<String, Department> departmentMap) {
+    private OrderInfo createOrder(JSONObject wlnOrder, Map<String, Department> departmentMap) {
         Department department = departmentMap.get(wlnOrder.getString("storage_code"));
 
-        Order order = new Order();
-        order.setId(IdWorker.getId());
-        order.setSource(2);
-        order.setCode(wlnOrder.getString("tp_tid"));
-        order.setWlnCode(wlnOrder.getString("trade_no"));
-        order.setWlnUid(wlnOrder.getString("uid"));
-        order.setWlnCreateTime(wlnOrder.getDate("create_time"));
-        order.setWlnApproveTime(wlnOrder.getDate("approve_time"));
-        order.setModifyTime(wlnOrder.getLong("modify_time"));
-        order.setRemark(wlnOrder.getString("remark"));
-        order.setProvince(wlnOrder.getString("province"));
-        order.setCity(wlnOrder.getString("city"));
-        order.setCounty(wlnOrder.getString("district"));
-        order.setDetailedAddress(wlnOrder.getString("address"));
-        order.setPostcode(wlnOrder.getString("zip"));
-        order.setWlnStatus(wlnOrder.getInteger("process_status"));
+        OrderInfo orderInfo = new OrderInfo();
+        orderInfo.setId(IdWorker.getId());
+        orderInfo.setSource(2);
+        orderInfo.setCode(wlnOrder.getString("tp_tid"));
+        orderInfo.setWlnCode(wlnOrder.getString("trade_no"));
+        orderInfo.setWlnUid(wlnOrder.getString("uid"));
+        orderInfo.setWlnCreateTime(wlnOrder.getDate("create_time"));
+        orderInfo.setWlnApproveTime(wlnOrder.getDate("approve_time"));
+        orderInfo.setModifyTime(wlnOrder.getLong("modify_time"));
+        orderInfo.setRemark(wlnOrder.getString("remark"));
+        orderInfo.setProvince(wlnOrder.getString("province"));
+        orderInfo.setCity(wlnOrder.getString("city"));
+        orderInfo.setCounty(wlnOrder.getString("district"));
+        orderInfo.setDetailedAddress(wlnOrder.getString("address"));
+        orderInfo.setPostcode(wlnOrder.getString("zip"));
+        orderInfo.setWlnStatus(wlnOrder.getInteger("process_status"));
 
         StringBuilder builder = new StringBuilder();
         // 订单来源平台
@@ -192,30 +192,30 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             builder.append("_");
             builder.append(wlnOrder.getString("shop_name"));
         }
-        order.setCommercePlatform(builder.toString());
+        orderInfo.setCommercePlatform(builder.toString());
 
         if (department != null) {
-            order.setDepartmentId(department.getId());
+            orderInfo.setDepartmentId(department.getId());
             if (Objects.equals(department.getOrderMode(), "2")) {
-                order.setStatus(OrderStatusEnum.REJECT.getKey());
+                orderInfo.setStatus(OrderStatusEnum.REJECT.getKey());
             } else {
-                order.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
+                orderInfo.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
             }
         } else {
-            order.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
+            orderInfo.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
         }
 
-        if (order.getWlnStatus() == 10 || order.getWlnStatus() == 11 || order.getWlnStatus() == 12) {
-            order.setStatus(OrderStatusEnum.EXCEPTION.getKey());
+        if (orderInfo.getWlnStatus() == 10 || orderInfo.getWlnStatus() == 11 || orderInfo.getWlnStatus() == 12) {
+            orderInfo.setStatus(OrderStatusEnum.EXCEPTION.getKey());
         }
 
-        return order;
+        return orderInfo;
     }
 
-    private OrderSku createOrderSku(JSONObject wlnOrderSku, Order order, SkuSpec skuSpec) {
+    private OrderSku createOrderSku(JSONObject wlnOrderSku, OrderInfo orderInfo, SkuSpec skuSpec) {
         OrderSku orderSku = new OrderSku();
         orderSku.setId(IdWorker.getId());
-        orderSku.setOrderId(order.getId());
+        orderSku.setOrderId(orderInfo.getId());
         orderSku.setQuantity(wlnOrderSku.getBigDecimal("size"));
         orderSku.setPrintType(1);
         orderSku.setWlnSkuId(wlnOrderSku.getString("sys_goods_uid"));