聚合订单sdk保存操作人

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -52,6 +52,7 @@ public class OrderSdkAdapter {
         cancelOrderRequest.setAfterSalesType(afterSalesType);
         cancelOrderRequest.setReason(reason);
         cancelOrderRequest.setTrackingNo(trackingNo);
+        cancelOrderRequest.setOperator("admin");
         if (refund_id != null) {
             cancelOrderRequest.setRefundSerialNo(refund_id.toString());
         }
@@ -136,6 +137,7 @@ public class OrderSdkAdapter {
         //保存门店渠道信息
         request.setOrderExtended(requestVO.getOrderExtended());
         request.setOrderTask(requestVO.getOrderTask());
+        request.setOperator(requestVO.getOperator());
 
         return request;
     }
@@ -150,6 +152,7 @@ public class OrderSdkAdapter {
         }
         createFatherSonOrderReq.setOrders(orderList);
         createFatherSonOrderReq.setParentOrder(convertOrderInfo2CreateOrderRequest(request.getParentOrder()));
+        createFatherSonOrderReq.setOperator(request.getOperator());
         return createFatherSonOrderReq;
     }
 
@@ -2053,6 +2056,7 @@ public class OrderSdkAdapter {
         result.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
         result.setOrderCode(request.getOrderCode());
         result.setPartnerId(request.getPartnerId());
+        result.setOperator(request.getOperator());
         return result;
     }
 
@@ -2078,7 +2082,8 @@ public class OrderSdkAdapter {
         request.setExtInfo(requestVO.getExtInfo());
         request.setBarCounter(requestVO.getBarCounter());
         request.setDinersNumber(requestVO.getDinersNumber());
-        DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+        request.setOperator(requestVO.getOperator());
+//        DecimalFormat decimalFormat = new DecimalFormat("#0.00");
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
         //优惠信息转换
@@ -2148,6 +2153,7 @@ public class OrderSdkAdapter {
         deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
         deliveryContactInfoList.add(deliveryContactInfoCreateReq);
         request.setDeliveryContactInfoList(deliveryContactInfoList);
+        request.setOperator(requestVO.getOperator());
         return request;
     }
 
@@ -2215,6 +2221,7 @@ public class OrderSdkAdapter {
         }
         //商品信息赋值
         request.setOrderItemList(orderItemList);
+        request.setOperator(requestVO.getOperator());
         return request;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupCreateOrderRequest.java

@@ -97,4 +97,7 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig {
      */
     private List<CreateOrderProductRequest> products;
 
+    //操作人
+    private String operator;
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupOrderAffirmRequest.java

@@ -147,5 +147,7 @@ public class AssortmentGroupOrderAffirmRequest extends BaseConfig {
      * 手机号
      */
     private String mobile;
+    //操作人
+    private String operator;
 
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupOrderClearRequest.java

@@ -35,4 +35,6 @@ public class AssortmentGroupOrderClearRequest extends BaseConfig {
      * 三方订单号
      */
     private String thirdOrderCode;
+    //操作人
+    private String operator;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupUpdateOrderRequest.java

@@ -56,4 +56,7 @@ public class AssortmentGroupUpdateOrderRequest extends AssortmentGroupCreateOrde
      */
     private List<CreateOrderAccountRequest> accounts;
 
+    //操作人
+    private String operator;
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentSdkUpdateOrderProductInfoRequest.java

@@ -81,4 +81,7 @@ public class AssortmentSdkUpdateOrderProductInfoRequest extends BaseConfig {
         deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct
     }
     private List<CreateOrderProductRequest> orderItemList;
+
+    //操作人
+    private String operator;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentUpdateDeliveryAbnormalRequest.java

@@ -34,4 +34,8 @@ public class AssortmentUpdateDeliveryAbnormalRequest {
      * 第三方运单号
      */
     private String deliveryId;
+
+    //操作人
+    private String operator;
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -123,6 +123,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
 
     //预订单任务
     private OrderTaskReq orderTask;
+    //操作人
+    private String operator;
 
     /**
      * 促销活动扣减库存

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseQueryOrderRequest.java

@@ -53,7 +53,7 @@ public class BaseQueryOrderRequest extends BaseConfig {
      */
     private Integer withOperationHistory;
 
-    //预约单与当前时间间隔（分钟）
-    private Integer intervalTime;
+    //操作人
+    private String operator;
 
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -58,4 +58,7 @@ public class CancelOrderRequest extends BaseConfig {
      */
     private Integer createEvent;
     private Integer orderClient= OrderClientType.SAAS.getIndex();
+
+    //操作人
+    private String operator;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ClearTableRequest.java

@@ -43,6 +43,9 @@ public class ClearTableRequest extends BaseConfig {
 
     private OpClearTableEnum opClearTableEnum;
 
+    //操作人
+    private String operator;
+
     /**
      * closeOrder   关闭订单
      * noOperationOrder 不操作订单

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java

@@ -24,6 +24,12 @@ public class ConfirmOrderRequest extends BaseConfig {
     private Integer timeout;
     //实际支付金额
     private String actualPayAmount;
+    /**
+     * 自定义字段
+     */
+    private String extInfo;
+    //操作人
+    private String operator;
     private List<OrderSettlement>orderSettlements;
     @Data
     public static class OrderSettlement{

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateFatherSonOrderRequest.java

@@ -26,6 +26,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
     private OrderInfo parentOrder;
     private List<OrderInfo> orderInfoList;
     private String partnerId;
+    //操作人
+    private String operator;
     /**
      * 消息Queue信息
      */

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderRequest.java

@@ -11,10 +11,6 @@ public class CreateOrderRequest extends BaseConfig {
      */
     BaseCreateOrderRequest baseCreateOrderRequest;
     /**
-     * 支付信息
-     */
-//    PaymentRequest paymentRequest;
-    /**
      * 消息Queue信息
      */
     MqMessageRequest mqMessageRequest;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/DeleteOrderRequest.java

@@ -7,4 +7,7 @@ import lombok.Data;
 public class DeleteOrderRequest extends BaseConfig {
 
     private String orderId;
+
+    //操作人
+    private String operator;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderRefundRequest.java

@@ -30,4 +30,7 @@ public class OrderRefundRequest extends BaseConfig {
     private String remark;
 
     private String storeId;
+
+    //操作人
+    private String operator;
 }