聚合订单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;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -126,8 +126,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 || createOrderResponse.getData() == null) {
             return getCreateOrderResponse(createOrderResponse.getErrcode().toString(), createOrderResponse.getErrmsg(), null);
         }
-        updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
+        BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
                 config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest());
+        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
+            return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
+        }
         return createOrderResponse;
     }
 
@@ -174,7 +177,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
                         AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
                 orderCancel(cancelOrderRequest);
-                return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "库存不足");
+                return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
             }
         }
         //TODO 扣减活动库存
@@ -190,7 +193,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                return BaseOrderResponse.getErrorBaseOrderResponse(activityResponse.getCode(), "库存不足");
+                return BaseOrderResponse.getErrorBaseOrderResponse(activityResponse.getCode(), "活动库存不足");
             }
         }
         // 扣减积分，扣减失败冲正积分返回错误
@@ -236,6 +239,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setOrderSettlementDetailList(orderSettlementCreateReqs);
         }
         request.setActualPayAmount(request.getActualPayAmount());
+        request.setOperator(confirmOrderRequest.getOperator());
         QueryOrderByIdResponse orderByIdResponse=new QueryOrderByIdResponse();
         BaseResponse<GetMemberExtendInfoResponse> extendInfo=new BaseResponse();
         try {
@@ -303,6 +307,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public BaseOrderResponse deleteOrder(DeleteOrderRequest deleteOrderRequest) {
         OrderDeleteReq request = new OrderDeleteReq();
         request.setOrderCode(deleteOrderRequest.getOrderId());
+        request.setOperator(deleteOrderRequest.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.deleteOrder(request, deleteOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -326,6 +331,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOrderCode(orderRefundRequest.getOrderId());
         request.setReqRemark(orderRefundRequest.getRemark());
         request.setAfterSalesReason(orderRefundRequest.getReason());
+        request.setOperator(orderRefundRequest.getOperator());
         // 查询门店服务配置，退单模式为2为自动退款，判断自动退款时间,设置为0则不传入timeout,
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(orderRefundRequest.getPartnerId(), orderRefundRequest.getStoreId(), orderRefundRequest.getTrackingNo());
         if (configuration != null && ObjectUtils.equals("2", configuration.getAutoChargebackOrderType())
@@ -420,6 +426,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         request.setCreateEvent(cancelOrderRequest.getCreateEvent());
         request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
+        request.setOperator(cancelOrderRequest.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -458,25 +465,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public BaseOrderResponse orderConfirmTake(BaseQueryOrderRequest baseQueryOrderRequest) {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
-        Integer intervalTime = 0;
-        if(baseQueryOrderRequest.getIntervalTime() != null ){
-            intervalTime = baseQueryOrderRequest.getIntervalTime();
-        }
+        request.setOperator(baseQueryOrderRequest.getOperator());
         // 引入门店基础服务 查询自动制作完成配置时间
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         //自配送外卖单
         if (configuration != null) {
             if (OrderType.GENERAL_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())) {
                 if (baseQueryOrderRequest.isHasSelfDelivery() && org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
-                    request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime()) + intervalTime);
+                    request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime()) );
                 }
             } else {
                 if (org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
-                    request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())+ intervalTime);
+                    request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime()) );
                 }
             }
         } else {
-            request.setTimeout(120+ intervalTime);
+            request.setTimeout(120);
         }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.acceptOrder(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -495,6 +499,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCancelReason(cancelOrderRequest.getReason());
         //若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
         request.setCreateEvent(4);
+        request.setOperator(cancelOrderRequest.getOperator());
         request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -504,6 +509,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public BaseOrderResponse orderSend(BaseQueryOrderRequest baseQueryOrderRequest) {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
+        request.setOperator(baseQueryOrderRequest.getOperator());
         // 调用门店服务查询外卖单自动完成时间
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         if (configuration != null && org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime())) {
@@ -520,6 +526,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         OrderChangeStateReq request = new OrderChangeStateReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
+        request.setOperator(baseQueryOrderRequest.getOperator());
         request.setRemark("已完成");
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -534,6 +541,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
+        request.setOperator(baseQueryOrderRequest.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -545,6 +553,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         request.setOrderClient(OrderClientType.SAAS.getIndex());
         request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
+        request.setOperator(baseQueryOrderRequest.getOperator());
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -559,6 +568,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
         request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
         request.setAdultRemark(baseQueryOrderRequest.getReason());
+        request.setOperator(baseQueryOrderRequest.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithGoodsReturned(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -571,6 +581,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOrderCode(cancelOrderRequest.getOrderId());
         request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode());
         request.setAdultRemark(cancelOrderRequest.getReason());
+        request.setOperator(cancelOrderRequest.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultReject(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -579,6 +590,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public BaseOrderResponse orderDone(BaseQueryOrderRequest baseQueryOrderRequest) {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
+        request.setOperator(baseQueryOrderRequest.getOperator());
         // 调用门店服务查询自动完成配置信息
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
 
@@ -919,6 +931,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         groupOrderClearReq1.setOrderClient(groupOrderClearRequest.getOrderClient());
         groupOrderClearReq1.setPartnerId(groupOrderClearRequest.getCompanyId());
         groupOrderClearReq1.setThirdOrderCode(groupOrderClearRequest.getThirdOrderCode());
+        groupOrderClearReq1.setOperator(groupOrderClearRequest.getOperator());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> baseResponse = orderSdkService.clearGroupOrder(groupOrderClearReq1, groupOrderClearRequest.getTrackingNo());
         return orderSdkAdapter.conventGroupPaySuccessReqs(baseResponse);
     }
@@ -1092,6 +1105,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     groupDiningCloseReq.setPartnerId(orderBean.getCompanyId());
                     //围餐
                     groupDiningCloseReq.setOrderClient(19);
+                    groupDiningCloseReq.setOperator(clearTableRequest.getOperator());
                     com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> baseResponse = orderSdkService.groupClose(groupDiningCloseReq, LogThreadLocal.getTrackingNo());
 
                     if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {