Merge remote-tracking branch 'origin/feature/订单中台' into feature/订单中台

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

@@ -369,9 +369,10 @@ public class GicOrderController {
     }
 
     // 修改物流
+    // type :   1: 下单发货  2：换货发货
     @RequestMapping("modify-order-logistics")
     public RestResponse<Object> modifyOrderDeliver(String enterpriseId, String orderId, String storeId,
-            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName) {
+            String logisticsId, String companyCode, String logisticsNo, String companyId, String companyName , @RequestParam(defaultValue="1")int type) {
         UpdateOrderLogisticsQDTO qdto = new UpdateOrderLogisticsQDTO();
         qdto.setEnterpriseId(enterpriseId);
         qdto.setLogisticsCompanyCode(companyCode);
@@ -380,6 +381,7 @@ public class GicOrderController {
         qdto.setCourierNumber(logisticsNo);
         qdto.setOrderId(orderId);
         qdto.setLogisticsId(logisticsId);
+        qdto.setType(type);
         this.webOrderManageApiService.updateOrderLogistics(qdto);
         return RestResponse.successResult();
     }