订单

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -22,6 +22,7 @@ import com.gic.business.order.enums.OrderEnum;
 import com.gic.business.order.qdto.ordermanage.ListOrderManageQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderItemShipmentQDTO;
 import com.gic.business.order.qdto.ordermanage.OrderShipmentQDTO;
+import com.gic.business.order.qdto.ordermanage.UpdateOrderLogisticsQDTO;
 import com.gic.business.order.service.ordermanage.WebOrderManageApiService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
@@ -152,26 +153,15 @@ public class GicOrderController {
     public RestResponse<Object> modifyOrderDeliver(String enterpriseId, String orderId, String storeId,
             List<String> orderItemIdList, String companyCode, String logisticsNo, String companyId,
             String companyName) {
-        OrderShipmentQDTO qdto = new OrderShipmentQDTO();
+        UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setLogisticsCompanyCode(companyCode);
         qdto.setLogisticsCompanyName(companyName);
         qdto.setLogisticsCompanyId(companyId);
         qdto.setCourierNumber(logisticsNo);
         qdto.setOrderId(orderId);
-        // 门店发货
-        qdto.setDeliveryMode(2);
-        // 好办
-        qdto.setSource(2);
-        List<OrderItemShipmentQDTO> list = new ArrayList<>();
-        orderItemIdList.forEach(o -> {
-            OrderItemShipmentQDTO item = new OrderItemShipmentQDTO();
-            item.setOrderItemId(o);
-            item.setStoreId(storeId);
-            list.add(item);
-        });
-        qdto.setOrderItemShipment(list);
-        this.webOrderManageApiService.updateLogistics(qdto);
+        qdto.setOrderItemIds(orderItemIdList);
+        this.webOrderManageApiService.updateOrderLogistics(qdto);
         return RestResponse.successResult();
     }
     // 客户详情中的商城订单