Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of…

Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

.gitignore

@@ -2,8 +2,9 @@
 .gitignore
 .idea/
 assortment-ordercenter-sdk/assortment-ordercenter-sdk.iml
-assortment-ordercenter-sdk/readme.md
 assortment-ordercenter-sdk/target/
+assortment-shoppingcart-sdk/assortment-shoppingcart-sdk.iml
+assortment-shoppingcart-sdk/target/
 call-back-service/call-back-service.iml
 call-back-service/target/
 order-application-service/order-application-service.iml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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;
     }
 
@@ -2054,6 +2057,7 @@ public class OrderSdkAdapter {
         result.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
         result.setOrderCode(request.getOrderCode());
         result.setPartnerId(request.getPartnerId());
+        result.setOperator(request.getOperator());
         return result;
     }
 
@@ -2079,7 +2083,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<>();
         //优惠信息转换
@@ -2149,6 +2154,7 @@ public class OrderSdkAdapter {
         deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
         deliveryContactInfoList.add(deliveryContactInfoCreateReq);
         request.setDeliveryContactInfoList(deliveryContactInfoList);
+        request.setOperator(requestVO.getOperator());
         return request;
     }
 
@@ -2216,6 +2222,7 @@ public class OrderSdkAdapter {
         }
         //商品信息赋值
         request.setOrderItemList(orderItemList);
+        request.setOperator(requestVO.getOperator());
         return request;
     }
 
@@ -2452,6 +2459,7 @@ public class OrderSdkAdapter {
         assortmentGroupUpdateOrderRequest.setSettlementAmount(updateOrderProductInfoRequest.getSettlementAmount());
         assortmentGroupUpdateOrderRequest.setUserId(updateOrderProductInfoRequest.getUserId());
         assortmentGroupUpdateOrderRequest.setUserName(updateOrderProductInfoRequest.getUserName());
+        assortmentGroupUpdateOrderRequest.setOperator(updateOrderProductInfoRequest.getUserName());
         return assortmentGroupUpdateOrderRequest;
     }
 

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

@@ -45,6 +45,12 @@ public class ConfirmOrderRequest extends BaseConfig {
      * 第三方流水号
      */
     private String payTransId;
+    /**
+     * 自定义字段
+     */
+    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

@@ -27,6 +27,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;
 }

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.2.RELEASE</version>
+            <version>2.5.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -500,6 +500,7 @@ public class OrderAdapter {
         createOrderDto.setAddInfo(deliveryTypeInfo);
         createOrderDto.setAmount(0L);
         createOrderDto.setBarCounter(createOrderVo.getTableNumber());
+        createOrderDto.setOperator(createOrderVo.getUserName());
         return createOrderDto;
     }
 
@@ -570,9 +571,10 @@ public class OrderAdapter {
         if (userDeliveryInfoDto != null) {
             deliveryAmount = getUserRealDeliveryAmount(userDeliveryInfoDto.getStoreDeliveryInfoDto(), userDeliveryInfoDto.getUserLongitude(), userDeliveryInfoDto.getUserLatitude());
         }
+        Long cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() != null ? shoppingCartGoodsDto.getCardDiscountAmount() : 0L;
         Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
         productOrderInfo.setAmount(shoppingCartGoodsDto.getTotalAmount() + deliveryAmount + packageAmount
-                - shoppingCartGoodsDto.getCardOriginalAmount() + shoppingCartGoodsDto.getCardDiscountAmount());
+                - shoppingCartGoodsDto.getCardOriginalAmount() + cardDiscountAmount);
         // 解析购物车信息
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartGoodsDto.getProducts();
         List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos();
@@ -1689,6 +1691,9 @@ public class OrderAdapter {
         cancelOrderRequest.setReason(reason);
         cancelOrderRequest.setTrackingNo(trackingNo);
         cancelOrderRequest.setRefundSerialNo(refundId);
+        if(AfterSalesType.SYSTEM_CANCEL.getIndex().equals(afterSalesType.getIndex()) ){
+            cancelOrderRequest.setOperator("admin");
+        }
         return cancelOrderRequest;
     }
 
@@ -2359,7 +2364,8 @@ public class OrderAdapter {
     /**
      * 购物车信息转换
      */
-    public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingCartGoodsDtoByUpdate(ShoppingCartGoodsDto shoppingCartGoodsDto, AssortmentCustomerInfoVo assortmentCustomerInfoVo, String orderId, Integer dinersNumber) {
+    public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingCartGoodsDtoByUpdate(ShoppingCartGoodsDto shoppingCartGoodsDto,
+            AssortmentCustomerInfoVo assortmentCustomerInfoVo, String orderId, Integer dinersNumber,String nickName) {
         AssortmentSdkUpdateOrderProductInfoRequest orderProductInfoRequest = new AssortmentSdkUpdateOrderProductInfoRequest();
         orderProductInfoRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
         orderProductInfoRequest.setStoreId(assortmentCustomerInfoVo.getStoreId());
@@ -2378,6 +2384,7 @@ public class OrderAdapter {
             }
         }
         orderProductInfoRequest.setOrderItemList(createOrderProductRequests);
+        orderProductInfoRequest.setOperator(nickName);
         orderProductInfoRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         return orderProductInfoRequest;
     }
@@ -2402,6 +2409,7 @@ public class OrderAdapter {
         sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());*/
         sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
         sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName());
+        sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName());
         //商品信息
         /*List<CreateOrderProductRequest> createOrderProductRequests = new ArrayList<>();
         queryOrderByIdResponse.getData().getProductList().forEach(each->{

order-application-service/src/main/java/cn/freemud/amp/body/MessagePushNewMqBody.java

+package cn.freemud.amp.body;
+
+import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: MessagePushNewMqBody
+ * @Package cn.freemud.amp.body
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/18 18:17
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class MessagePushNewMqBody {
+
+    private String partnerId;
+    private String storeId;
+    private String wxappid;
+    private String accessToken;
+    private MpTemplateMsg template;
+    private String orderId;
+
+    public MessagePushNewMqBody() {
+    }
+}

order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java

@@ -184,6 +184,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
             clearTableRequest.setTableNumber(assortmentCustomerInfoVo.getTableNumber());
             clearTableRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
             clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.closeOrder);
+            clearTableRequest.setOperator(assortmentCustomerInfoVo.getNickName());
             orderCenterSdkService.clearTableNumber(clearTableRequest);
             throw e;
         }finally {
@@ -240,6 +241,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
             });
         }
         groupCreateOrderRequest.setProducts(orderProductRequests);
+        groupCreateOrderRequest.setOperator(assortmentCustomerInfoVo.getNickName() == null ? "围餐": assortmentCustomerInfoVo.getNickName());
         return orderCenterSdkService.createGroupOrder(groupCreateOrderRequest);
     }
 
@@ -297,8 +299,10 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                 return ResponseUtil.error(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
             }
             ShoppingCartGoodsDto shoppingCartGoodsDto = apportionResponse.getResult();
+            AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingCartGoodsDtoByUpdate(shoppingCartGoodsDto, assortmentCustomerInfoVo, orderId,
+                    createReserveOrderVo.getRepastNumber(), assortmentCustomerInfoVo.getNickName());
             //修改订单信息
-            OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(orderAdapter.conventShoppingCartGoodsDtoByUpdate(shoppingCartGoodsDto,assortmentCustomerInfoVo,orderId,createReserveOrderVo.getRepastNumber()));
+            OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
             //根据购物车version调用购物车sdk删除购物车版本缓存信息
             if(ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
                 return ResponseUtil.error(ResponseResult.ORDER_EDIT_ERROR);
@@ -438,8 +442,9 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         }
         /*OrderBeanRequest orderBeanRequest = orderAdapter.conventOrderBeanRequest(queryOrderByIdResponse.getData());
         ShoppingCartGoodsResponse shoppingCartGoodsDto = calculationDiscountService.getActivityCalculationDiscount(orderBeanRequest);*/
+        AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(null, queryOrderByIdResponse, assortmentCustomerInfoVo);
         //修改订单信息  --围餐不涉及促销，本次调用促销计算只是为了修改订单金额信息
-        OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(orderAdapter.conventShoppingPromotionInfo(null,queryOrderByIdResponse,assortmentCustomerInfoVo));
+        OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
         if(baseOrderResponse == null || ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
             return ResponseUtil.error(ResponseResult.PREVIEWORDER_UPDATE_ORDERPRICE_ERROR);
         }
@@ -583,6 +588,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                 clearTableRequest.setTableNumber(assortmentCustomerInfoVo.getTableNumber());
                 clearTableRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
                 clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.closeOrder);
+                clearTableRequest.setOperator(assortmentCustomerInfoVo.getNickName());
                 orderCenterSdkService.clearTableNumber(clearTableRequest);
             }
             queryTableStatusReponseVo.setTableNumberStatus(false);

order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java

@@ -252,6 +252,7 @@ public class OrderCommonService {
         clearTableRequest.setTableNumber(orderBean.getBarCounter());
         clearTableRequest.setUserId(extInfo == null ? "" : extInfo.getPrePayUserId());
         clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.noOperationOrder);
+        clearTableRequest.setOperator(orderBean.getUserName());
         orderCenterSdkService.clearTableNumber(clearTableRequest);
         //调用清除购物车接口
         NewShoppingCartClearDto shoppingCartClearDto = new NewShoppingCartClearDto();
@@ -279,6 +280,7 @@ public class OrderCommonService {
             affirmRequest.setMobile(extInfo.getPhone());
             affirmRequest.setExtInfo(JSON.toJSONString(extInfo));
         }
+        affirmRequest.setOperator(orderBean.getUserName());
         AssortmentAffirmGroupOrderResponse groupOrderResponse = orderCenterSdkService.affirmGroupOrder(affirmRequest);
         if(ObjectUtils.notEqual(RESPONSE_SUCCESS_CODE,groupOrderResponse.getErrcode())){
             LogUtil.error("paySuccessCallback_payAccess_faild", JSON.toJSONString(message), JSON.toJSONString(groupOrderResponse));

order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java

@@ -16,6 +16,7 @@ import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.OrderExtInfoDto;
 import cn.freemud.entities.dto.OrderRefundDto;
+import cn.freemud.entities.dto.QueryOrderByIdResponseDto;
 import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
@@ -27,12 +28,11 @@ import cn.freemud.service.impl.OrderServiceImpl;
 import cn.freemud.service.thirdparty.PaymentClient;
 import cn.freemud.utils.ValidationCode;
 import com.alibaba.fastjson.JSON;
-import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupCreateOrderRequest;
-import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupOrderAffirmRequest;
-import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupOrderClearRequest;
-import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
+import com.alibaba.fastjson.JSONObject;
+import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.AssortmentAffirmGroupOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -76,6 +76,23 @@ public class OrderServiceTest {
         System.out.println("baseResponse : " + baseResponse);
     }
 
+    @Test
+    public void sendApplyRefundSubscriptionNoticeTest() {
+        OrderRefundRequest request = new OrderRefundRequest();
+        request.setReason("下错单");
+        request.setRemark("不要了");
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId("16420126386356464000002");
+        QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        String string = JSONObject.toJSONString(queryOrderByIdResponse);
+        JSONObject jsonObject = JSONObject.parseObject(string);
+        QueryOrderByIdResponseDto orderByIdResponseDto = jsonObject.toJavaObject(QueryOrderByIdResponseDto.class);
+        QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderByIdResponseDto.getData();
+        orderService.sendApplyRefundSubscriptionNotice(orderBean,request);
+
+    }
+
+
 
 
     @Test

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -59,3 +59,4 @@
 |  2.6.5-SNAPSHOT |增加 订单业务类型，会员使用|  伍平  |   2019-10-24 |
 |  2.7.3.RELEASE | 基于2.7.2.RELEASE升级|  丁凯 |   2019-10-24 |
 |  2.7.4.RELEASE | 2.6.5-SNAPSHOT升级RELEASE|  伍平  |   2019-11-07 |
+| 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
\ No newline at end of file

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);
+//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();
 //            }
-
-//                if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){
-//                    download.setDeliveryFee(detail.getCostAmount().intValue());
-//                    download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100);
+//            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());
+//
+//            Integer activyPrice = 0;
+//            String activeItem = "";
+//            for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) {
+//                activyPrice += dto.getSettlementAmount().intValue();
+////                activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName();
 //            }
-
-//                if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){
-//                    download.setRiderName(info.getContactsName());
-//                    download.setRiderPhone(info.getMobile());
+//            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;
-    }
-}
+//
+//            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";