update 对接内蒙古平台

jsowell-pile/src/main/java/com/jsowell/pile/mapper/ThirdPartyStationRelationMapper.java

@@ -1,12 +1,13 @@
 package com.jsowell.pile.mapper;
 
-import java.util.List;
-
 import com.jsowell.pile.domain.ThirdPartyStationRelation;
+import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 站点、第三方推送平台配置对应Mapper接口
  *
@@ -85,4 +86,6 @@ public interface ThirdPartyStationRelationMapper {
      * @return
      */
     int updateRelationDelFlag(@Param("stationId") String stationId, @Param("types") List<String> types);
+
+    List<MerchantInfoVO> selectMerchantList(String thirdPlatformType);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/ThirdPartyStationRelationService.java

@@ -1,6 +1,7 @@
 package com.jsowell.pile.service;
 
 import com.jsowell.pile.domain.ThirdPartyStationRelation;
+import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 
 import java.util.List;
@@ -93,4 +94,6 @@ public interface ThirdPartyStationRelationService {
     public int deleteThirdPartyStationRelationById(Long id);
 
     int updateRelationDelFlag(String stationId, List<String> types);
+
+    List<MerchantInfoVO> selectMerchantList(String thirdPlatformType);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ThirdPartyStationRelationServiceImpl.java

@@ -7,6 +7,7 @@ import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.ThirdPartyStationRelation;
 import com.jsowell.pile.mapper.ThirdPartyStationRelationMapper;
 import com.jsowell.pile.service.ThirdPartyStationRelationService;
+import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -165,4 +166,9 @@ public class ThirdPartyStationRelationServiceImpl implements ThirdPartyStationRe
     public int updateRelationDelFlag(String stationId, List<String> types) {
         return thirdPartyStationRelationMapper.updateRelationDelFlag(stationId, types);
     }
+
+    @Override
+    public List<MerchantInfoVO> selectMerchantList(String thirdPlatformType) {
+        return thirdPartyStationRelationMapper.selectMerchantList(thirdPlatformType);
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java

@@ -15,4 +15,12 @@ public class MerchantUtils {
         return StringUtils.equals(XIXIAO_MERCHANT_ID, merchantId);
     }
 
+    /**
+     *
+     * @param organizationCode
+     * @return
+     */
+    public static String getOperatorID(String organizationCode) {
+        return organizationCode.substring(9, 18);
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java

@@ -40,4 +40,9 @@ public class MerchantInfoVO {
 	 */
 	private String deptId;
 
+	/**
+	 * 运营商地址
+	 */
+	private String merchantAddress;
+
 }