Merge remote-tracking branch 'origin/test'

张志伟
2 parents 61733fdb 595df60c
Showing 8 changed files with 50 additions and 14 deletions
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/oop/OopService.java
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/oop/dto/ShopDTO.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AbstractCustomerService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java
pom.xml
@@ -76,9 +76,10 @@ public class OopService extends AbsBaseRpcService {
      * 根据车系ID获取车系信息
      *
      * @param seriesId 车系ID
+     * @param groupId  集团id
      * @return 车系信息
      */
-    public SeriesDTO getSeriesById(final Long seriesId) {
+    public SeriesDTO getSeriesById(final Long seriesId, final Long groupId) {
         if (seriesId == null) {
             return null;
         }
@@ -88,7 +89,7 @@ public class OopService extends AbsBaseRpcService {
             return seriesDTO;
         }
         try {
-            final Message<CarSeriesInfoVo> msg = carSeriesApiService.getSeriesInfo(seriesId);
+            final Message<CarSeriesInfoVo> msg = carSeriesApiService.getSeriesInfo(groupId, seriesId);
             log.info("carSeriesApiService.getSeriesInfo: msg.code={}, msg.result={}, msg.data={}", msg.getCode(), msg.getResult(), msg.getData());
             if (msg.isSuccess() && !Objects.isNull(msg.getData())) {
                 final SeriesDTO series = new SeriesDTO();
@@ -139,7 +140,7 @@ public class OopService extends AbsBaseRpcService {
      * @return 门店信息
      */
     public ShopDTO shop(final Long shopId) {
-        if (shopId == null || Long.valueOf(146L).equals(shopId)) {
+        if (shopId == null) {
             return null;
         }
         String key = generateKey(OopTypeEnum.SHOP, shopId);
@@ -312,7 +313,7 @@ public class OopService extends AbsBaseRpcService {
         }).collect(Collectors.toList());
     }
  
-    public SpecDTO spec(final Long specId) {
+    public SpecDTO spec(final Long specId, final Long groupId) {
         if (Objects.isNull(specId)) {
             return null;
         }
@@ -322,7 +323,7 @@ public class OopService extends AbsBaseRpcService {
             return JSONObject.parseObject(json, SpecDTO.class);
         }
         try {
-            Message<CarSpecInfoVo> msg = carSpecApiService.getSpecInfo(specId);
+            Message<CarSpecInfoVo> msg = carSpecApiService.getSpecInfo(groupId, specId);
             log.info("carSpecApiService.getSpecInfo: msg.code={}, msg.result={}, msg.data={}", msg.getCode(), msg.getResult(), msg.getData());
             if (msg.isSuccess() && !Objects.isNull(msg.getData())) {
                 final CarSpecInfoVo dto = msg.getData();
@@ -398,12 +399,12 @@ public class OopService extends AbsBaseRpcService {
      * @param brandId 品牌id
      * @return 车系列表
      */
-    public List<CarSeriesInfoVo> getCarSeriesListByBrandId(final Long brandId) {
+    public List<CarSeriesInfoVo> getCarSeriesListByBrandId(final Long brandId, final Long groupId) {
         if (Objects.isNull(brandId)) {
             return Collections.emptyList();
         }
         try {
-            final Message<List<CarSeriesInfoVo>> msg = carSeriesApiService.getSeriesInfoList(brandId);
+            final Message<List<CarSeriesInfoVo>> msg = carSeriesApiService.getSeriesInfoList(groupId, brandId);
             log.info("调用OOP系统获取[根据品牌ID[{}]查询车系列表] 结果：[{}]", brandId, msg.getResult());
             if (!msg.isSuccess() || CollectionUtils.isEmpty(msg.getData())) {
                 return Collections.emptyList();
@@ -4,6 +4,7 @@ import lombok.Data;
  
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
  
 /**
  * 门店信息
@@ -66,22 +67,18 @@ public class ShopDTO implements Serializable {
      * 经度（百度坐标系）
      */
     private BigDecimal lng;
-
     /**
      * 纬度（百度坐标系）
      */
     private BigDecimal lat;
-
     /**
      * 门店地址
      */
     private String addr;
-
     /**
      * 门店地址所属城市区划编码
      */
     private String cityBh;
-
     /**
      * 负责人
      */
@@ -106,4 +103,18 @@ public class ShopDTO implements Serializable {
      * 门店状态
      */
     private Integer status;
+
+    /**
+     * 网络销售门店标记
+     */
+    private Integer onlineSalesTag;
+    /**
+     * 是否自有产权 1 是 0 否
+     */
+    private Boolean owned;
+    /**
+     * 门店开展业务集合
+     * {@link cn.fw.oop.sdk.enums.ShopBusinessTypeEnum}
+     */
+    private List<Integer> authBusinessList;
 }
@@ -210,7 +210,7 @@ public abstract class AbstractCustomerService {
      * @return
      */
     protected Long saveNewOne(Customer customer, CustomerBaseInfo baseInfo, boolean orderCar) {
-        final SpecDTO spec = oopService.spec(customer.getSpecId());
+        final SpecDTO spec = oopService.spec(customer.getSpecId(), customer.getGroupId());
         customer.setCarImage(Optional.ofNullable(spec).orElse(new SpecDTO()).getThumbnail());
         final String plateNo = customer.getPlateNo();
         final int count = customerService.count(Wrappers.<Customer>lambdaQuery()
@@ -880,7 +880,7 @@ public class CustomerBizService extends AbstractCustomerService {
         customer.setUpdateTime(new Date());
         customer.setYn(Boolean.TRUE);
         customer.setTemporary(Boolean.FALSE);
-        final SpecDTO spec = oopService.spec(customerParams.getSpecId());
+        final SpecDTO spec = oopService.spec(customerParams.getSpecId(), customerParams.getGroupId());
         customer.setCarImage(Optional.ofNullable(spec).orElse(new SpecDTO()).getThumbnail());
         customer.setShopId(casShopId);
         Long cid = saveNewOne(customer, baseInfo, true);
 package cn.fw.valhalla.service.bus.follow.strategy;
  
 import cn.fw.oop.sdk.enums.BizTypeEnum;
+import cn.fw.oop.sdk.enums.ShopBusinessTypeEnum;
 import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
 import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
 import cn.fw.shirasawa.sdk.enums.TerminationReason;
@@ -887,4 +888,15 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
             }
         }
     }
+
+    protected boolean isFollowShop(final Long shopId) {
+        ShopDTO shop = oopService.shop(shopId);
+        BV.notNull(shop, () -> "门店数据获取失败");
+        if (!CollectionUtils.isEmpty(shop.getAuthBusinessList())) {
+            Set<Integer> shopAuthSet = new HashSet<>(shop.getAuthBusinessList());
+            return !shopAuthSet.contains(ShopBusinessTypeEnum.BP.getCode()) || shopAuthSet.size() != 1;
+        }
+
+        return true;
+    }
 }
@@ -88,6 +88,13 @@ public class FMFollowStrategy extends AbstractFollowStrategy {
             followClueService.removeById(followClue.getId());
             return;
         }
+        Long shopId = customer.getShopId();
+        boolean followShop = isFollowShop(shopId);
+        if (!followShop) {
+            followClueService.removeById(followClue.getId());
+            return;
+        }
+
         followClue.setPlateNo(customer.getPlateNo());
         final ClueTask clueTask = super.createNewTask(followClue);
         List<PostUserDTO> userByRole = userService.getUserByRole(clueTask.getFollowShop(), RoleCode.FWGW);
@@ -78,6 +78,11 @@ public class RMFollowStrategy extends AbstractFollowStrategy {
                 followClueService.removeById(followClue.getId());
                 return;
             }
+            boolean followShop = isFollowShop(customer.getShopId());
+            if (!followShop) {
+                followClueService.removeById(followClue.getId());
+                return;
+            }
             followClue.setPlateNo(customer.getPlateNo());
             final ClueTask clueTask = super.createNewTask(followClue);
             List<PostUserDTO> userByRole = userService.getUserByRole(clueTask.getFollowShop(), RoleCode.FWGW);
@@ -39,7 +39,7 @@
         <mysql-connector-java.version>5.1.47</mysql-connector-java.version>
         <HikariCP.version>3.3.1</HikariCP.version>
         <!-- fw -->
-        <fw-oop-sdk.version>3.0.0</fw-oop-sdk.version>
+        <fw-oop-sdk.version>4.0.0</fw-oop-sdk.version>
         <fw-mkt-sdk.version>1.0</fw-mkt-sdk.version>
         <fw-member-sdk.version>3.0.0</fw-member-sdk.version>
         <fw-passport-sdk.version>3.0.0</fw-passport-sdk.version>