Merge remote-tracking branch 'remotes/origin/feature/20200309_1.9.1415_TAPD1007005' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.2.0.RELEASE</version>
+    <version>1.2.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>1.6.RELEASE</version>
+            <version>2.2.1.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/readme.md

@@ -14,3 +14,5 @@
 | 1.1.7.RELEASE| 1.9.11商品组  | 胡超 | 2020-02-13 |
 | 1.1.9.RELEASE| pos渠道  | 丁凯 | 2020-02-22 |
 | 1.2.0.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24 |
+| 1.2.1.RELEASE| 基于1.2.0.RELEASE  | 丁凯 | 2020-03-04 |
+| 1.2.2.RELEASE| 升级RELEASE  | wuping | 2020-03-04 |
\ No newline at end of file

assortment-shoppingcart-sdk/readme.md

+#### 购物车sdk更新记录
+| 版本号        | 版本说明     | 更新人        | 更新时间   |
+| --------------| ------------ | ------------- | ---------- |
+| 1.1.0.RELEASE| 第一个release版本  | 丁凯 | 2020-03-04  |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.2.0.RELEASE</version>
+            <version>1.2.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.6.2-SNAPSHOT</version>
+            <version>2.6.3.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>
@@ -82,13 +82,13 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>deliverycenter-sdk</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.5.RELEASE</version>
         </dependency>
         <!--  商户门店sdk  -->
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>1.8.1-SNAPSHOT</version>
+            <version>2.2.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -30,14 +30,12 @@ import com.freemud.sdk.api.assortment.order.request.order.AssortmentUpdateDelive
 import com.freemud.sdk.api.assortment.order.request.order.UpdateDeliveryInfoByIdRequest;
 import com.freemud.sdk.api.assortment.order.response.order.OrderBaseResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
-import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -112,8 +110,12 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             // 订单已完成
             sendPosService(deliveryStatus,posBaseRequestDto);
         } else if (deliveryStatus == DeliveryStatus.DELIVERYERROR.getCode() || deliveryStatus == DeliveryStatus.DELIVERYCANCEL.getCode()) {
+
             // 取消外卖中台配送单 订单异常
+            // 如果 "配送单异常并且顾客更改配送地址" 不取消配送单
+            if (!isDeliveryAbnormalAndCustomerChangedAddress(request)) {
                 partnerCancelOrder(request.getDeliveryId());
+            }
             // 运单异常，取消订单
             posBaseRequestDto.setReason("没有骑手接单");
             posBaseRequestDto.setDeliveryId(request.getDeliveryId());
@@ -132,6 +134,21 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         return ResponseUtil.success();
     }
 
+    /**
+     * 配送单异常并且顾客更改配送地址
+     *
+     * @return
+     */
+    public boolean isDeliveryAbnormalAndCustomerChangedAddress(CallbackUrlRequestDto request) {
+        String str = "顾客更改配送地址";
+        if (DeliveryStatus.DELIVERYERROR.getCode() == request.getDeliveryStatus()
+                && StringUtils.isNotBlank(request.getRemark()) && request.getRemark().contains(str)) {
+            log.info("isDeliveryAbnormalAndCustomerChangedAddress.true of {}", JSONObject.toJSONString(request));
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public BaseResponse mallCallbackUrl(CallbackUrlRequestDto request) {
         return ResponseUtil.success();

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

@@ -200,8 +200,6 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private AssortmentCustomerInfoManager customerInfoManager;
     @Autowired
-    private WechatPushProcessor wechatPushProcessor;
-    @Autowired
     private CheckOrder checkOrder;
     @Autowired
     private RedisCache redisCache;
@@ -465,11 +463,11 @@ public class OrderServiceImpl implements Orderservice {
         buriedPointService.BuriedPointPayment(requestDto, orderBean);
 
         // 推荐优惠插件用户支付完成数据上报
-        if (message.getTotal_fee() != 0) {
-            orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
-            wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
-                    , message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
-        }
+//        if (message.getTotal_fee() != 0) {
+//            orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
+//            wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
+//                    , message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
+//        }
 
         // 开通会员卡
         if (StringUtils.isNotBlank(ruleId)) {
@@ -1824,7 +1822,7 @@ public class OrderServiceImpl implements Orderservice {
             createOrderResponse.setPaySuccess(true);
         }
         // 推荐优惠插件用户下单数据上报
-        wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
+        //wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
         if (!createOrderResponse.getPaySuccess()) {
             return ResponseUtil.success(createOrderResponse);
         } else {
@@ -2204,7 +2202,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         CreateOrderResponseVo createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, productOrderBean);
         // 推荐优惠插件用户下单数据上报
-        wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
+        //wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
         //设置是否唤起微信支付
         if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
             createOrderResponse.setPaySuccess(false);

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -7,4 +7,6 @@
 | 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
 | 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
 | 1.1.3.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24  |
+| 1.1.4-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
 | 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 |
+| 1.1.6.RELEASE | 升级RELEASE | wuping | 2020-03-04 |
\ No newline at end of file

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

@@ -106,4 +106,9 @@ public class OrderConditionsReq {
     //订单业务类型 1:普通订单 2:虚拟订单
     private Integer bizType;
 
+    // 外部对象ID 如:活动ID
+    private List<String> externalObjectIds;
+    // 外部对象ID 如:活动类型
+    private List<Integer> settlementTypes;
+
 }