订单推送开放平台配置由sdk实现

call-back-service/pom.xml

@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-orderdistributor-sdk</artifactId>
-            <version>3.5.8.RELEASE</version>
+            <version>3.5.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
@@ -70,11 +70,6 @@
             <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
-            <groupId>com.freemud.sdk.api.assortment</groupId>
-            <artifactId>assortment-dynamic-queue</artifactId>
-            <version>1.7.RELEASE</version>
-        </dependency>
-        <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
         </dependency>

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

@@ -17,24 +17,23 @@ import cn.freemud.amqp.Header;
 import cn.freemud.amqp.MQAction;
 import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
-import cn.freemud.config.PushOrderConfig;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.entities.dto.OrderExtInfoDto;
 import cn.freemud.entities.dto.OrderStatusChangeRequestDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.WechatReportOrderDto;
-import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
 import cn.freemud.redis.RedisCache;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
 import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
@@ -67,8 +66,6 @@ public class OrderCallBackMQService {
     private static final String backOrdersNotifyActivityExchange="program.backorders_notify_activity_exchange";
     @Autowired
     private LogUtil logUtil;
-    @Autowired
-    private PushOrderConfig pushOrderConfig;
 
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         OrderInfoReqs orderInfoReqs = getOrderInfoReqs(body);
@@ -194,8 +191,7 @@ public class OrderCallBackMQService {
         if (checkParkingOrders(orderInfoReqs)) {
             return false;
         }
-        //订单推送改造， 过渡期部分聚合层推送， 部分不推送，由基础服务推送
-        return pushOrderConfig.needPushOrder(orderInfoReqs.getPartnerId(), orderInfoReqs.getStoreId());
+        return true;
     }
 
     private OrderInfoReqs getWechatReportOrderInfoReqs(OrderCallBackRequestVo body) {

call-back-service/src/main/java/cn/freemud/config/PushOrderConfig.java

-package cn.freemud.config;
-
-import lombok.Data;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.*;
-
-/**
- * @author Clover.z
- * @version 1.0.0
- * @since 1.0.0
- */
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "push-order")
-public class PushOrderConfig {
-
-    /**
-     * 不推送开放平台的商户和门店配置
-     * 格式： 商户号:门店号,门店号,...;商户号:门店号,门店号,...;...
-     * 如果只配置了商户号， 则表示全门店都不推送
-     */
-    private String config;
-
-    /**
-     * 不推送开放平台的商户门店信息
-     * key:商户号
-     */
-    private Map<String, List<String>> notPushMap;
-
-
-    public synchronized void initMap() {
-        if (null == notPushMap) {
-            notPushMap = new HashMap<>();
-            if (StringUtils.isBlank(config)) return;
-            String[] cfgList = config.split(";");
-            for (String cfg : cfgList) {
-                //格式必须是 商户号:门店号
-                String[] s = cfg.split(":");
-                if (s.length == 1) {
-                    //全商户
-                    notPushMap.put(s[0], new ArrayList<>());
-                } else {
-                    // 不满足格式直接忽略
-                    if (s.length != 2) continue;
-                    notPushMap.put(s[0], Arrays.asList(s[1].split(",")));
-                }
-            }
-        }
-    }
-
-
-    /**
-     * 判断门店的订单 是否需要推送三方
-     * @param partnerId 商户号
-     * @param storeCode 门店号
-     * @return 是否需要推送
-     */
-    public boolean needPushOrder(String partnerId, String storeCode) {
-        // 未配置， 聚合层全部不推送，由基础服务统一推送开放平台
-        if (StringUtils.isBlank(config)) return false;
-
-        if (null == notPushMap) initMap();
-        // 商户号是否在推送黑名单配置中
-        List<String> storeList = notPushMap.get(partnerId);
-        // 配置了商户，没有配置门店， 表示所有门店都不推送
-        if (CollectionUtils.isEmpty(storeList)) return false;
-        return !storeList.contains(storeCode);
-    }
-
-}