订单保存操作人

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

-package com.freemud.application.sdk.api.ordercenter.adapter;
-
-import com.freemud.application.sdk.api.ordercenter.response.OrderDownloadResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-public class OrderCenterSdkAdapter {
-
-    public List<OrderDownloadResp> convent2OrderDownloads(List<OrderInfoReqs> orderDtos) {
-        List<OrderDownloadResp> downloads = new ArrayList<>();
-        orderDtos.forEach(orderDto -> {
-            OrderDownloadResp download = new OrderDownloadResp();
-            download.setOid(orderDto.getOrderCode());
-            download.setShopId(orderDto.getStoreId());
-            download.setShopName(orderDto.getStoreName());
-            download.setUserName(orderDto.getUserName());
-            download.setSource("saas");
-            download.setSource("i点餐");
-            download.setType(orderDto.getOrderType().intValue());
-            download.setTypeStr("");
-            download.setStatus(orderDto.getOrderState().intValue());
-//            download.setStatusStr(OrderStatus.getByIndex(orderDto.getOrderState()).getName());
-            download.setOrderAmount(orderDto.getOriginalAmount().intValue());
-            download.setOrderAmountYuan(new Double(orderDto.getOriginalAmount().doubleValue() / 100));
-            download.setAmount(orderDto.getActualPayAmount().intValue());
-            download.setAmountYuan(orderDto.getActualPayAmount().doubleValue() / 100);
-
-            Integer productAmount = 0;
-            for (OrderItemResp orderItemDto : orderDto.getOrderItemList()) {
-                download.setProductId(orderItemDto.getProductId());
-                download.setProductName(orderItemDto.getProductName());
-                download.setProductPrice(orderItemDto.getProductPrice().intValue());
-                download.setProductPriceYuan(orderItemDto.getProductPrice().doubleValue() / 100);
-//                download.setProductDiscountAmountYuan(orderItemDto.getProductPrice().subtract(orderItemDto.getSalePrice()).doubleValue()/100);
-                productAmount += orderItemDto.getProductPrice().intValue() * orderItemDto.getProductQuantity();
-            }
-            download.setProductAmount(productAmount);
-            download.setProductAmountYuan(productAmount.doubleValue() / 100);
-
-            for (OrderCostResp detail : orderDto.getOrderCostDetailList()) {
-//                if(detail.getCostType() .equals(OrderCostType.PACKING_CHARGES.getIndex())) {
-//                    download.setPackageFee(detail.getCostAmount().intValue());
-//                    download.setPackageFeeYuan(detail.getCostAmount().doubleValue()/100);
-//                }
-
-//                if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){
-//                    download.setDeliveryFee(detail.getCostAmount().intValue());
-//                    download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100);
-//                }
-            }
-
-            Integer activyPrice = 0;
-            String activeItem = "";
-            for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) {
-                activyPrice += dto.getSettlementAmount().intValue();
-//                activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName();
-            }
-            download.setAcitviyCost(activyPrice);
-            download.setAcitviyCostYuan(activyPrice.doubleValue() / 100);
-            download.setAcivityItems(activeItem);
-
-//            download.setGmtCreate(orderDto.getCreateTime());
-//            download.setGmtPay(orderDto.getPayTime());
-
-            download.setPayNo(orderDto.getPayRequestNo());
-//            download.setPayStatus(PayStatus.getByIndex(orderDto.getPayState()).getName());
-
-            for (DeliveryContactInfoResp info : orderDto.getDeliveryContactInfoList()) {
-//                if(RelateObjectType.ORDER_ADDRESS.equals(info.getRelateObjectType())){
-//                    download.setPhone(info.getMobile());
-//                    download.setAddress(info.getAddressDetail());
-//                }
-
-//                if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){
-//                    download.setRiderName(info.getContactsName());
-//                    download.setRiderPhone(info.getMobile());
-//                }
-            }
-
-            download.setExpress(orderDto.getExpressChannelName());
-            download.setDeliveryId(orderDto.getExpressNo());
-            downloads.add(download);
-        });
-        return downloads;
-    }
-}
+//package com.freemud.application.sdk.api.ordercenter.adapter;
+//
+//import com.freemud.application.sdk.api.ordercenter.response.OrderDownloadResp;
+//import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//@Component
+//public class OrderCenterSdkAdapter {
+//
+//    public List<OrderDownloadResp> convent2OrderDownloads(List<OrderInfoReqs> orderDtos) {
+//        List<OrderDownloadResp> downloads = new ArrayList<>();
+//        orderDtos.forEach(orderDto -> {
+//            OrderDownloadResp download = new OrderDownloadResp();
+//            download.setOid(orderDto.getOrderCode());
+//            download.setShopId(orderDto.getStoreId());
+//            download.setShopName(orderDto.getStoreName());
+//            download.setUserName(orderDto.getUserName());
+//            download.setSource("saas");
+//            download.setSource("i点餐");
+//            download.setType(orderDto.getOrderType().intValue());
+//            download.setTypeStr("");
+//            download.setStatus(orderDto.getOrderState().intValue());
+////            download.setStatusStr(OrderStatus.getByIndex(orderDto.getOrderState()).getName());
+//            download.setOrderAmount(orderDto.getOriginalAmount().intValue());
+//            download.setOrderAmountYuan(new Double(orderDto.getOriginalAmount().doubleValue() / 100));
+//            download.setAmount(orderDto.getActualPayAmount().intValue());
+//            download.setAmountYuan(orderDto.getActualPayAmount().doubleValue() / 100);
+//
+//            Integer productAmount = 0;
+//            for (OrderItemResp orderItemDto : orderDto.getOrderItemList()) {
+//                download.setProductId(orderItemDto.getProductId());
+//                download.setProductName(orderItemDto.getProductName());
+//                download.setProductPrice(orderItemDto.getProductPrice().intValue());
+//                download.setProductPriceYuan(orderItemDto.getProductPrice().doubleValue() / 100);
+////                download.setProductDiscountAmountYuan(orderItemDto.getProductPrice().subtract(orderItemDto.getSalePrice()).doubleValue()/100);
+//                productAmount += orderItemDto.getProductPrice().intValue() * orderItemDto.getProductQuantity();
+//            }
+//            download.setProductAmount(productAmount);
+//            download.setProductAmountYuan(productAmount.doubleValue() / 100);
+//
+//            for (OrderCostResp detail : orderDto.getOrderCostDetailList()) {
+////                if(detail.getCostType() .equals(OrderCostType.PACKING_CHARGES.getIndex())) {
+////                    download.setPackageFee(detail.getCostAmount().intValue());
+////                    download.setPackageFeeYuan(detail.getCostAmount().doubleValue()/100);
+////                }
+//
+////                if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){
+////                    download.setDeliveryFee(detail.getCostAmount().intValue());
+////                    download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100);
+////                }
+//            }
+//
+//            Integer activyPrice = 0;
+//            String activeItem = "";
+//            for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) {
+//                activyPrice += dto.getSettlementAmount().intValue();
+////                activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName();
+//            }
+//            download.setAcitviyCost(activyPrice);
+//            download.setAcitviyCostYuan(activyPrice.doubleValue() / 100);
+//            download.setAcivityItems(activeItem);
+//
+////            download.setGmtCreate(orderDto.getCreateTime());
+////            download.setGmtPay(orderDto.getPayTime());
+//
+//            download.setPayNo(orderDto.getPayRequestNo());
+////            download.setPayStatus(PayStatus.getByIndex(orderDto.getPayState()).getName());
+//
+//            for (DeliveryContactInfoResp info : orderDto.getDeliveryContactInfoList()) {
+////                if(RelateObjectType.ORDER_ADDRESS.equals(info.getRelateObjectType())){
+////                    download.setPhone(info.getMobile());
+////                    download.setAddress(info.getAddressDetail());
+////                }
+//
+////                if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){
+////                    download.setRiderName(info.getContactsName());
+////                    download.setRiderPhone(info.getMobile());
+////                }
+//            }
+//
+//            download.setExpress(orderDto.getExpressChannelName());
+//            download.setDeliveryId(orderDto.getExpressNo());
+//            downloads.add(download);
+//        });
+//        return downloads;
+//    }
+//}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/AfterSalesOperateReq.java

@@ -37,4 +37,7 @@ public class AfterSalesOperateReq {
 
     //同意审核原因
     private String adultRemark;
+
+    //操作人
+    private String operator;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupCreateOrderRequest.java

@@ -74,4 +74,7 @@ public class GroupCreateOrderRequest {
     //订单商信息
     List<OrderItemCreateReq> orderItemList;
 
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupDiningCloseReq.java

@@ -34,4 +34,7 @@ public class GroupDiningCloseReq {
      */
     private Integer orderClient;
 
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderAffirmReq.java

@@ -102,5 +102,7 @@ public class GroupOrderAffirmReq {
     //配送联系人信息
     List<DeliveryContactInfoCreateReq> deliveryContactInfoList;
 
+    //操作人
+    private String operator;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderClearReq.java

@@ -36,4 +36,7 @@ public class GroupOrderClearReq {
      */
     private String thirdOrderCode;
 
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderUpdateReq.java

@@ -87,4 +87,7 @@ public class GroupOrderUpdateReq {
     //订单商品信息
     List<OrderItemCreateReq> orderItemList;
 
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

@@ -40,7 +40,6 @@ public class OrderCancelReq {
      */
     private String afterSalesReason;
     /**
-     *
      * 用户自身描述的取消原因
      */
     private String reqRemark;
@@ -57,4 +56,7 @@ public class OrderCancelReq {
      * 退款流水号
      */
     private String afterSerialNo;
+
+    //操作人
+    private String operator;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderChangeStateReq.java

@@ -19,4 +19,6 @@ public class OrderChangeStateReq {
     private String orderCode;
     private Integer orderState;
     private String remark;
+    //操作人
+    private String operator;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderDeleteReq.java

@@ -19,4 +19,7 @@ public class OrderDeleteReq {
 
     private String orderCode;
 
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/PaySuccessReq.java

@@ -45,4 +45,7 @@ public class PaySuccessReq {
 
     //扩展字段
     private String extInfo;
+
+    //操作人
+    private String operator;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/SdkUpdateAbnormalState.java

@@ -43,4 +43,8 @@ public class SdkUpdateAbnormalState {
      * 第三方订单号
      */
     private String thirdOrderCode;
+
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

@@ -208,4 +208,7 @@ public class CreateOrderRequest extends BaseRequest {
     //预订单任务
     private OrderTaskReq orderTask;
 
+    //操作人
+    private String operator;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -46,8 +46,6 @@ public class OrderSdkService {
     private RestTemplate restTemplate;
     @Autowired
     private OrderCenterProperties orderCenterProperties;
-//    @Autowired
-//    private OrderCenterSdkAdapter orderCenterSdkAdapter;
 
 
     public static final String SUCCESS_RESPONSE_CODE = "100";