Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -54,4 +54,9 @@
 | 1.3.4-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
 | 1.3.5-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.4.9.RELEASE | 售后单任务 | wuping | 2020-05-21 |
+| 1.5.0-RELEASE| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-22 |
+| 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型  | wuping | 2020-05-15 |
+| 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
+| 1.5.1-RELEASE| 增加订单支付方式 | 海波 | 2020-05-25 |
+| 1.5.2-RELEASE| 新增订单完成时间时间戳 | 雷后领 | 2020-05-26 |
 | 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
\ No newline at end of file

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

@@ -1004,11 +1004,11 @@ public class OrderSdkAdapter {
 
         //运单相关信息
         data.setDeliverStatus(orderInfoReqs.getDeliveryState() != null ? orderInfoReqs.getDeliveryState() : 0);
-        data.setReceiveTime(orderInfoReqs.getReceiveTime());
+        data.setReceiveTime("");
         data.setDepatchTime("");
         data.setArriveShopTime("");
         data.setSendTime("");
-        data.setCompleteTime(orderInfoReqs.getReceiveTime());
+        data.setCompleteTime("");
         data.setParentCode(orderInfoReqs.getParentCode());
         data.setIsParent(orderInfoReqs.getIsParent());
         data.setBizType(orderInfoReqs.getBizType());

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

@@ -1402,10 +1402,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 || OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType())
                 || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){
             //外卖预约单
-            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
-                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
-                orderWarnTime = configuration.getDeliveryOrderWarnTime();
-            }
+//            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
+//                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
+//                orderWarnTime = configuration.getDeliveryOrderWarnTime();
+//            }
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(3);
             Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.1.RELEASE</version>
 
     <dependencies>
         <dependency>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>couponcenter-sdk</artifactId>
-            <version>1.9.12-SNAPSHOT</version>
+            <version>1.8.15.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -28,6 +28,7 @@ import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopPr
 import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.productcenter.service.ProductService;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.shoppingcart.adapter.ShoppingCartAdapter;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
@@ -409,7 +410,7 @@ public interface ShoppingCartBaseService {
         couponDetailRequest.setMerchantId(partnerId);
         couponDetailRequest.setPartnerId(partnerId);
         // 券码新增参数：组织机构
-        couponDetailRequest.setChannelIdList(this.getOrgIds(partnerId, storeId));
+        couponDetailRequest.setChannelCodeList(this.getOrgCodes(partnerId, storeId));
         OnlineCouponSdkService onlineCouponSdkService = SDKCommonBaseContextWare.getBean(OnlineCouponSdkService.class);
         com.freemud.application.sdk.api.base.BaseResponse<CouponDetailResponse> couponDetailResponse = onlineCouponSdkService.allDetail(couponDetailRequest, appKey, trackingNo);
         if (couponDetailResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(couponDetailResponse.getCode()) || couponDetailResponse.getData() == null || CollectionUtils.isEmpty(couponDetailResponse.getData().getDetails())) {
@@ -493,6 +494,7 @@ public interface ShoppingCartBaseService {
         couponDetailRequest.setMerchantId(couponAvailableReqVo.getMerchantId());
         couponDetailRequest.setStoreId(couponAvailableReqVo.getStoreId());
         couponDetailRequest.setCodes(couponAvailableReqVo.getCouponCodes());
+        couponDetailRequest.setChannelCodeList(this.getOrgCodes(couponAvailableReqVo.getPartnerId(), couponAvailableReqVo.getStoreId()));
         return couponDetailRequest;
     }
 
@@ -867,5 +869,27 @@ public interface ShoppingCartBaseService {
         }
         return Collections.EMPTY_LIST;
     }
+    /**
+     * 查询门店服务 - 获取组织code集合
+     *
+     * @param partnerId
+     * @param storeCode
+     * @return
+     */
+    default List<String> getOrgCodes(String partnerId, String storeCode) {
+        GetOrgTreeListRequest request = new GetOrgTreeListRequest();
+        request.setPartnerId(partnerId);
+        request.setStoreCode(storeCode);
+        StoreCenterService storeCenterService = SDKCommonBaseContextWare.getBean(StoreCenterService.class);
+        com.freemud.application.sdk.api.base.BaseResponse<GetOrgTreeListResponse> orgList = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+        if (orgList != null && CartResponseConstant.SUCCESS.getCode().equals(orgList.getCode())) {
+            List<GetOrgTreeListResponse.OrgList> orgResponseList = orgList.getData().getOrgList();
+            if (CollectionUtils.isEmpty(orgResponseList)){
+                return null;
+            }
+            return orgResponseList.stream().map(org -> org.getOrganizationCode()).collect(Collectors.toList());
+        }
+        return null;
+    }
 
 }

order-application-service/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>structure-center-sdk</artifactId>
-            <version>1.2.2.RELEASE</version>
+            <version>1.2.3.RELEASE</version>
         </dependency>
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
@@ -124,7 +124,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>4.5.5-SNAPSHOT</version>
+            <version>4.6.1-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -193,12 +194,11 @@ public class CreateOrderVo {
     @Builder.Default
     private String menuType = "saas";
     /**
-     * 渠道类型 OrderChannelType 
+     * 渠道类型 OrderChannelType
      */
     private String channelType;
-    
     /**
-     * 微信配送地址信息 
+     * 微信配送地址信息
      */
     private WeixinDeliveryAddressDto weixinDeliveryAddress;
 

order-management/pom.xml

@@ -64,7 +64,7 @@
         <dependency>
             <artifactId>structure-center-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.2.2.RELEASE</version>
+            <version>1.2.3.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

@@ -8,12 +8,16 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
+import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.lang.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class MessagePushAdapter {
+    @Autowired
+    private OrderSdkAdapter orderSdkAdapter;
 
     public PushMessageNoticeDto convent2PushMessageNoticeDto(Integer targetType, String partnerId,
                                                              String storeId, String userId, String oid, Integer deliveryStatus, Integer cmdType) {
@@ -54,7 +58,7 @@ public class MessagePushAdapter {
         if (extInfo != null) {
             content.setFromAppId(extInfo.getFromAppId());
         }
-        //content.setDeliveryStatus(deliveryStatus);
+        content.setOrderClient(orderSdkAdapter.getNewOrderClient(order.getSource()));
         content.setPickUpGoodsNo(order.getOtherCode());
         content.setUserId(order.getUserId());
         content.setOrderState(order.getStatus());

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -83,7 +83,7 @@ public class SaasOrderHandle {
      * @return
      */
     public BaseResponse orderDelivery(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
+        BaseQueryOrderRequest orderDeliveryRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderSend(orderDeliveryRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             throw new OrderServiceException(ResponseResult.DELIVERY_FAIL);
@@ -99,7 +99,7 @@ public class SaasOrderHandle {
      * @return
      */
     public BaseResponse orderAffirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderDeliveryRequest(request.getOperator(), orderBean);
+        BaseQueryOrderRequest orderAffirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderAffirm(orderAffirmRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             throw new OrderServiceException(ResponseResult.AFFIRM_ORDER_FAIL);

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.2.6.RELEASE</version>
+    <version>1.2.11.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -32,4 +32,5 @@
 | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
 | 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
-| 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
+| 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
\ No newline at end of file
+| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>couponcenter-sdk</artifactId>
-            <version>1.8.14.RELEASE</version>
+            <version>1.8.15.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>
@@ -232,7 +232,7 @@
         <dependency>
             <groupId>com.freemud.card.sdk</groupId>
             <artifactId>freemud-card-sdk</artifactId>
-            <version>2.4.17-RELEASE</version>
+            <version>2.4.18-RELEASE</version>
         </dependency>
 
         <dependency>

shopping-cart-application-service/src/main/java/cn/freemud/interceptor/ConfigInitBean.java

@@ -54,6 +54,6 @@ public class ConfigInitBean {
     @Profile("pre-release")
     @Bean
     IUrlConfig preIUrlConfig() {
-        return new UrlConfig(ConstantProfiles.PRO);
+        return new UrlConfig(ConstantProfiles.PRE);
     }
 }

shopping-cart-application-service/src/main/java/cn/freemud/service/CommonService.java

@@ -6,11 +6,14 @@ import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.google.common.base.Joiner;
 import org.apache.commons.collections4.CollectionUtils;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -45,6 +48,29 @@ public interface CommonService {
         return null;
     }
 
+    /**
+     * 查询门店服务 - 获取组织code集合
+     *
+     * @param partnerId
+     * @param storeCode
+     * @return
+     */
+    default List<String> getOrgCodes(String partnerId, String storeCode) {
+        GetOrgTreeListRequest request = new GetOrgTreeListRequest();
+        request.setPartnerId(partnerId);
+        request.setStoreCode(storeCode);
+        StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
+        BaseResponse<GetOrgTreeListResponse> orgList = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
+            List<GetOrgTreeListResponse.OrgList> orgResponseList = orgList.getData().getOrgList();
+            if (CollectionUtils.isEmpty(orgResponseList)){
+                return null;
+            }
+            return orgResponseList.stream().map(org -> org.getOrganizationCode()).collect(Collectors.toList());
+        }
+        return null;
+    }
+
     default String getOrgIdsAsString(String partnerId, String storeCode) {
         List<String> orgIdList = this.getOrgIds(partnerId, storeCode);
         return CollectionUtils.isNotEmpty(orgIdList) ? Joiner.on(",").join(orgIdList) : "";

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -413,7 +413,7 @@ public class CouponServiceImpl implements CouponService {
         Long totalAmount = createProductRequest(cartGoods, productList);
         couponAvailableReqVo.setTotalAmount(Integer.valueOf(totalAmount + ""));
         couponAvailableReqVo.setProductList(productList);
-        couponAvailableReqVo.setChannelIdList(commonService.getOrgIds(partnerId, storeId));
+        couponAvailableReqVo.setChannelCodeList(commonService.getOrgCodes(partnerId, storeId));
         // 构建计算SDK
         List<CouponStateVo> couponStateList = Lists.newArrayList();
         for (int j = 0; j <= count; j++) {
@@ -809,7 +809,7 @@ public class CouponServiceImpl implements CouponService {
         Long totalAmount = 0L;
         couponAvailableReqVo.setTotalAmount(Integer.valueOf(totalAmount + ""));
         couponAvailableReqVo.setProductList(productList);
-        couponAvailableReqVo.setChannelIdList(commonService.getOrgIds(partnerId, storeId));
+        couponAvailableReqVo.setChannelCodeList(commonService.getOrgCodes(partnerId, storeId));
         // 构建计算SDK
         List<CouponStateVo> couponStateList = Lists.newArrayList();
         for (int j = 0; j <= count; j++) {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java

@@ -11,6 +11,7 @@ import cn.freemud.service.IPromotionService;
 import cn.freemud.utils.WebUtil;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.UnifyActivityRequest;
 import com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
+@Slf4j
 public class FullPromotionService implements IPromotionService {
 
     @Autowired