mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-04 18:10:10 +08:00
update 对接内蒙古平台
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,4 +40,9 @@ public class MerchantInfoVO {
|
||||
*/
|
||||
private String deptId;
|
||||
|
||||
/**
|
||||
* 运营商地址
|
||||
*/
|
||||
private String merchantAddress;
|
||||
|
||||
}
|
||||
|
||||
@@ -209,4 +209,22 @@
|
||||
#{type,jdbcType=VARCHAR}
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
<select id="selectMerchantList" resultType="com.jsowell.pile.vo.base.MerchantInfoVO">
|
||||
select
|
||||
t3.id as merchantId,
|
||||
t3.merchant_name as merchantName,
|
||||
t3.service_phone as merchantTel,
|
||||
t3.organization_code as organizationCode,
|
||||
t3.dept_id as deptId,
|
||||
t3.merchant_level as merchantLevel,
|
||||
t3.address as merchantAddress
|
||||
from
|
||||
thirdparty_station_relation t1
|
||||
join pile_station_info t2 on t2.id = t1.station_id and t2.del_flag = '0'
|
||||
join pile_merchant_info t3 on t3.id = t2.merchant_id and t3.del_flag = '0'
|
||||
where t1.del_flag = '0'
|
||||
and t1.third_party_type = #{thirdPlatformType,jdbcType=VARCHAR}
|
||||
GROUP BY t3.id
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user