创建订单+operator

order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java

@@ -29,6 +29,6 @@ public class DeliveryOrderController {
     @GetMapping("/delivery/create")
     public BaseResponse deliveryCreate(@RequestParam("orderCode") String orderCode
             , @RequestParam(value = "operator", required = false) String operator) {
-        return orderDeliveryService.createDelivery(orderCode);
+        return orderDeliveryService.createDelivery(orderCode, operator);
     }
 }

order-management/src/main/java/cn/freemud/management/service/OrderDeliveryService.java

@@ -15,6 +15,7 @@ import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.google.common.base.Throwables;
 import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -47,7 +48,7 @@ public class OrderDeliveryService {
      * @param orderCode
      * @return
      */
-    public BaseResponse createDelivery(String orderCode) {
+    public BaseResponse createDelivery(String orderCode, String operator) {
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(orderCode);
         if (null == orderBean) {
             return CommonResp.fail("订单不存在");
@@ -58,7 +59,7 @@ public class OrderDeliveryService {
             return CommonResp.success(pair.getValue());
         }
         try {
-            this.createDelivery(orderBean);
+            this.createDelivery(orderBean, operator);
         } catch (CheckException e) {
             log.error("创建配送单失败({}),trace:{}", orderCode, Throwables.getStackTraceAsString(e));
             return CommonResp.fail(e.getMessage());
@@ -72,7 +73,7 @@ public class OrderDeliveryService {
      * @param orderBean
      * @return
      */
-    public Boolean createDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public Boolean createDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean, String operator) {
         StoreInfoRequest storeInfoRequestDto = new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId());
         StoreResponse storeInfo = storeCenterService.getStoreInfo(storeInfoRequestDto, LogTreadLocal.getTrackingNo());
         if (SUCCESS != storeInfo.getStatusCode() || storeInfo.getBizVO() == null) {
@@ -83,14 +84,17 @@ public class OrderDeliveryService {
         CreateDeliveryOrderRequestDto requestDto = buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl);
         CreateDeliveryOrderResponseDto deliveryResponse = deliveryService.deliveryOrderAdd(requestDto, LogTreadLocal.getTrackingNo());
 
+        if (StringUtils.isBlank(operator)) {
+            operator = "系统";
+        }
         //创建配送单失败，更新订单为异常单
         if (deliveryResponse == null || SUCCESS != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
             String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
-            orderBaseService.updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, "sys");
+            orderBaseService.updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
             throw new CheckException("创建配送单信息失败，配送状态更新为配送异常");
         }
         // 创建配送单成功
-        orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), "sys");
+        orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), operator);
         return true;
     }