订单

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

 package com.gic.haoban.manage.web.controller.order;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -99,6 +100,7 @@ public class GicOrderController {
         OrderInfoDTO orderInfo = ret.getResult().getOrderInfo();
         OrderDetailVO orderDetailVO = EntityUtil.changeEntityByJSON(OrderDetailVO.class,
                 ret.getResult().getOrderInfo());
+        orderDetailVO.setBuyerRemark(orderInfo.getRemarks());
         List<OrderDetailItemVO> orderItemList = EntityUtil.changeEntityListNew(OrderDetailItemVO.class,
                 ret.getResult().getOrderItemList());
         orderDetailVO.setOrderItemList(orderItemList);
@@ -109,7 +111,7 @@ public class GicOrderController {
         member.setAddressName(orderInfo.getBuyerName());
         member.setAddressDetail(orderInfo.getAddressInfo());
         orderDetailVO.setMember(member);
-        
+
         return RestResponse.successResult(orderDetailVO);
     }
 
@@ -130,9 +132,8 @@ public class GicOrderController {
 
     // 发货
     @RequestMapping("order-logistics-deliver")
-    public RestResponse<Object> orderDeliver(String enterpriseId, String orderId, String storeId,
-            List<String> orderItemIdList, String companyCode, String logisticsNo, String companyId,
-            String companyName) {
+    public RestResponse<Object> orderDeliver(String enterpriseId, String orderId, String storeId, String orderItemIds,
+            String companyCode, String logisticsNo, String companyId, String companyName) {
         OrderShipmentQDTO qdto = new OrderShipmentQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setLogisticsCompanyCode(companyCode);
@@ -144,6 +145,7 @@ public class GicOrderController {
         qdto.setDeliveryMode(2);
         // 好办
         qdto.setSource(2);
+        List<String> orderItemIdList = Arrays.asList(orderItemIds.split(","));
         List<OrderItemShipmentQDTO> list = new ArrayList<>();
         orderItemIdList.forEach(o -> {
             OrderItemShipmentQDTO item = new OrderItemShipmentQDTO();
@@ -162,8 +164,8 @@ public class GicOrderController {
     // 修改物流
     @RequestMapping("modify-order-logistics")
     public RestResponse<Object> modifyOrderDeliver(String enterpriseId, String orderId, String storeId,
-            List<String> orderItemIdList, String companyCode, String logisticsNo, String companyId,
-            String companyName) {
+            String orderItemIds, String companyCode, String logisticsNo, String companyId, String companyName) {
+        List<String> orderItemIdList = Arrays.asList(orderItemIds.split(","));
         UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setLogisticsCompanyCode(companyCode);