Merge branch 'feature/20201120-甩手添加事件通知-lcf' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -151,7 +151,7 @@ public class OrderCallBackMQService {
 
     private OrderInfoReqs getOrderInfoReqs(OrderCallBackRequestVo body) {
         // 订单所有状态正常变化通知通知开放平台
-        if (!ObjectUtils.equals("1", body.getMsgType()) || body.getOperateType() == null || body.getOperateType() == 0) {
+        if ((!ObjectUtils.equals("1", body.getMsgType()) && !ObjectUtils.equals("3", body.getMsgType())) || body.getOperateType() == null || body.getOperateType() == 0) {
             return null;
         }
         OrderInfoReqs orderInfoReqs = null;

call-back-service/src/main/java/cn/freemud/entities/vo/OrderCallBackRequestVo.java

@@ -28,7 +28,7 @@ public class OrderCallBackRequestVo {
      * 2 未支付超时关单
      */
     private Integer delayMsgEventType;
-    //操作类型 0= 其他信息修改，1=订单正向操作，2=订单逆向操作
+    //操作类型 0= 其他信息修改，1=订单正向操作，2=订单逆向操作,3=通知消息
     private Integer operateType;
     //渠道编号
     private Integer orderClient;
@@ -47,6 +47,7 @@ public class OrderCallBackRequestVo {
      * 消息类型
      1.	1订单所有状态正常变化通知
      2.	2超时订单
+     3.	3通知
      */
     private String msgType;
 

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

@@ -181,6 +181,21 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         if(ObjectUtils.notEqual(baseResponse.getCode(),ResponseResult.SUCCESS.getCode())){
             return baseResponse;
         }
+
+        // 添加分布式锁，如果没有取得锁直接返回失败；整个方法执行完毕后会删掉该锁
+        // 锁定秒数从apollo获取，如果apollo没有设置，默认5秒
+//        String createOrderKey = CREATE_ORDER_KEY + assortmentCustomerInfoVo.getMemberId();
+//        try {
+//            Long expire = Long.valueOf(createOrderKeyExpire);
+//            if(!LockUtils.lock(redisCache.getRedisTemplate(),createOrderKey,expire)){
+//                return ResponseUtil.error(ResponseResult.ORDER_NOT_CREATE_ERROR);
+//            }
+//            return mcCafeOrderService.createMCCafeOrder(createOrderVo);
+//        } catch (Exception e) {
+//            throw e;
+//        } finally {
+//            //LockUtils.unlock(redisCache.getRedisTemplate(),createOrderKey);
+//        }
         return mcCafeOrderService.createMCCafeOrder(createOrderVo);
     }