Merge branches 'develop' and 'feature/20200508_9.22需求_wuping' of…

Merge branches 'develop' and 'feature/20200508_9.22需求_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -53,4 +53,6 @@
 | 1.6.0-SNAPSHOT | 增加订单金额字段返回 | 侯书虎 | 2020-05-06 |
 | 1.6.1-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
 | 1.6.2-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
-| 1.6.3-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 |
+| 1.6.3-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 |
\ No newline at end of file
+| 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
+| 1.6.4-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
\ No newline at end of file

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

@@ -246,6 +246,7 @@ public class OrderSdkAdapter {
         request.setOrderExtended(requestVO.getOrderExtended());
         request.setOrderTask(requestVO.getOrderTask());
         request.setOperator(requestVO.getOperator());
+        request.setAppId(requestVO.getAppId());
 
         //订单重量
         Double orderWeight = sumOrderWeight(requestVO.getProducts());
@@ -1021,6 +1022,7 @@ public class OrderSdkAdapter {
         }
         data.setOrderOperationHistoryList(getOrderOperationHistory(orderInfoReqs.getOrderOperationHistoryList()));
         data.setApportionDetails(getApportionDetails(orderInfoReqs));
+        data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
         return data;
     }
 

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

@@ -134,6 +134,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
     private OrderTaskReq orderTask;
     //操作人
     private String operator;
+    /**
+     * 微信、支付宝、APP渠道appid
+     */
+    private String appId;
 
     /**
      * 促销活动扣减库存

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

@@ -162,5 +162,10 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
         //预订单任务
         private OrderTaskReq orderTask;
 
+        /**
+         * 微信、支付宝、APP渠道appid
+         */
+        private String appId;
+
     }
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -13,6 +13,7 @@
 package com.freemud.sdk.api.assortment.order.response.order;
 
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -246,6 +247,8 @@ public class QueryOrdersResponse {
 
             private List<OrderSettlement> apportionDetails;
 
+            private List<OrderCostResp> orderCostDetailList;
+
 
             private AddDeliveryInfo addInfo;
 

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

@@ -257,7 +257,8 @@ public class OrderAdapter {
     }
 
     public CreateFatherSonOrderRequest convertFatherSonOrderRequest(CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto,
-                                                                    OrderExtendedReq orderExtendedReq,StoreResponse.BizVO storeResponseDto) {
+                                                                    OrderExtendedReq orderExtendedReq,StoreResponse.BizVO storeResponseDto,
+                                                                    String appId) {
         CreateFatherSonOrderRequest createFatherSonOrderRequest = new CreateFatherSonOrderRequest();
         createFatherSonOrderRequest.setPartnerId(createOrderVo.getPartnerId());
         createFatherSonOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
@@ -266,6 +267,7 @@ public class OrderAdapter {
         List<CreateFatherSonOrderRequest.OrderInfo> orderInfoList = new ArrayList<>();
         CreateFatherSonOrderRequest.OrderInfo productOrderInfo = convertProductOrderInfo(createOrderVo, deliveryInfoDto, shoppingCartGoodsDto);
         productOrderInfo.setOrderExtended(orderExtendedReq);
+        productOrderInfo.setAppId(appId);
         OrderTaskReq orderTask = null;
         if(StringUtils.isNotEmpty(createOrderVo.getTakeMealTime())){
             Integer orderType = 0;

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

@@ -1717,7 +1717,6 @@ public class OrderServiceImpl implements Orderservice {
                                         AssortmentCustomerInfoVo userLoginInfoDto) {
         CreateOrderOperateDto response = new CreateOrderOperateDto();
         OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
-        String orderWarnTime = storeResponseDto.getOrderWarnTime();
         OrderClientType orderClient = OrderClientType.SAAS;
         String appId = userLoginInfoDto.getWxAppId();
         if("2".equals(userLoginInfoDto.getChannel()) ){
@@ -1734,7 +1733,7 @@ public class OrderServiceImpl implements Orderservice {
             int cardOriginalAmount = shoppingCartGoodsDto.getCardOriginalAmount() == null ? 0 : shoppingCartGoodsDto.getCardOriginalAmount();
             int cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() == null ? 0 : shoppingCartGoodsDto.getCardDiscountAmount();
             cardAmount = cardOriginalAmount - cardDiscountAmount;
-            CreateFatherSonOrderResponse createFatherSonOrderResponse = createFatherSonOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq);
+            CreateFatherSonOrderResponse createFatherSonOrderResponse = createFatherSonOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq,appId);
             if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createFatherSonOrderResponse.getErrcode())) {
                 throw new ServiceException(ResponseResult.ORDER_CREATE_ERROR);
             }
@@ -1749,7 +1748,7 @@ public class OrderServiceImpl implements Orderservice {
             fatherBeanList.get(0).setCompanyId(createOrderVo.getPartnerId());
         } else {
             //普通订单
-            CreateOrderResponse createOrderFlowResponse = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, orderClient);
+            CreateOrderResponse createOrderFlowResponse = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, orderClient,appId);
             if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createOrderFlowResponse.getErrcode())) {
                 throw new ServiceException(ResponseResult.ORDER_CREATE_ERROR);
             }
@@ -1821,13 +1820,15 @@ public class OrderServiceImpl implements Orderservice {
     /**
      * 创建普通订单
      */
-    public CreateOrderResponse createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto, OrderExtendedReq orderExtendedReq, OrderClientType orderClient) {
+    public CreateOrderResponse createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
+                                           OrderExtendedReq orderExtendedReq, OrderClientType orderClient,String appId) {
         BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto, storeResponseDto);
         //查询第三方商品编号
         baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
         //保存门店渠道信息
         baseCreateOrderRequest.setOrderExtended(orderExtendedReq);
         baseCreateOrderRequest.setOrderClient(orderClient);
+        baseCreateOrderRequest.setAppId(appId);
         CreateOrderRequest createOrderRequest = new CreateOrderRequest();
         baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
@@ -1841,8 +1842,10 @@ public class OrderServiceImpl implements Orderservice {
     /**
      * 创建父子订单
      */
-    public CreateFatherSonOrderResponse createFatherSonOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto, OrderExtendedReq orderExtendedReq) {
-        CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq,storeResponseDto);
+    public CreateFatherSonOrderResponse createFatherSonOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto,
+                                                             ShoppingCartGoodsDto shoppingCartGoodsDto, OrderExtendedReq orderExtendedReq,
+                                                             String appId) {
+        CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq,storeResponseDto,appId);
         //查询第三方商品编号
         createFatherSonOrderRequest = getProductCustomerCodeNew(createFatherSonOrderRequest);
         MqMessageRequest mqMessageRequest = new MqMessageRequest();
@@ -2197,7 +2200,7 @@ public class OrderServiceImpl implements Orderservice {
     private BaseResponse createOrderAndPay(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                            AssortmentCustomerInfoVo userLoginInfoDto, OrderExtInfoDTO orderExtInfoDTO) {
         //创建订单--包括下单购买会员卡创建父子订单
-        CreateOrderOperateDto operateDto = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto);
+        CreateOrderOperateDto operateDto = createOrderForFace(createOrderVo, storeResponseDto, shoppingCartGoodsDto,userLoginInfoDto.getWxAppId());
         long totalAmount = operateDto.getTotalAmount();
         int cardAmount =  operateDto.getCardAmount();
         QueryOrdersResponse.DataBean.OrderBean fatherOrderBean = operateDto.getFatherOrderBean();
@@ -2245,11 +2248,10 @@ public class OrderServiceImpl implements Orderservice {
     /**
      * 创建订单
      */
-    private CreateOrderOperateDto createOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto,
-                                              ShoppingCartGoodsDto shoppingCartGoodsDto){
+    private CreateOrderOperateDto createOrderForFace(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto,
+                                              ShoppingCartGoodsDto shoppingCartGoodsDto,String appId){
         CreateOrderOperateDto response = new CreateOrderOperateDto();
         OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
-        String orderWarnTime = storeResponseDto.getOrderWarnTime();
         //创建普通订单
         Function<Object, CreateOrderResponse> createOrder = (var -> {
             BaseCreateOrderRequest baseCreateOrderRequest = orderAdapter.convent2CreateOrderDto(createOrderVo, shoppingCartGoodsDto,storeResponseDto);
@@ -2257,6 +2259,7 @@ public class OrderServiceImpl implements Orderservice {
             baseCreateOrderRequest = getProductCustomerCode(baseCreateOrderRequest);
             //保存门店渠道信息
             baseCreateOrderRequest.setOrderExtended(orderExtendedReq);
+            baseCreateOrderRequest.setAppId(appId);
             CreateOrderRequest createOrderRequest = new CreateOrderRequest();
             baseCreateOrderRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
             createOrderRequest.setBaseCreateOrderRequest(baseCreateOrderRequest);
@@ -2269,7 +2272,7 @@ public class OrderServiceImpl implements Orderservice {
         });
         //创建父子订单
         Function<Object, CreateFatherSonOrderResponse> createFatherSonOrder = (var -> {
-            CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq,storeResponseDto);
+            CreateFatherSonOrderRequest createFatherSonOrderRequest = orderAdapter.convertFatherSonOrderRequest(createOrderVo, shoppingCartGoodsDto, orderExtendedReq,storeResponseDto,appId);
             //查询第三方商品编号
             createFatherSonOrderRequest = getProductCustomerCodeNew(createFatherSonOrderRequest);
             MqMessageRequest mqMessageRequest = new MqMessageRequest();

ordercenter-sdk/readme.md

@@ -27,4 +27,6 @@
 | 1.3.5-SNAPSHOT | 费用实体添加字段:实际费用 | 胡超 | 2020-04-29 |
 | 1.3.6-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
 | 1.4.0-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
-| 1.4.1-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 |
+| 1.4.1-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 |
\ No newline at end of file
+| 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
+| 1.4.2-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
\ No newline at end of file

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

@@ -211,4 +211,9 @@ public class CreateOrderRequest extends BaseRequest {
     //操作人
     private String operator;
 
+    /**
+     * 微信、支付宝、APP渠道appid
+     */
+    private String appId;
+
 }