mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
update 对接内蒙古平台
This commit is contained in:
@@ -25,6 +25,7 @@ import com.jsowell.pile.mapper.MemberBasicInfoMapper;
|
||||
import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper;
|
||||
import com.jsowell.pile.mapper.MemberWalletLogMapper;
|
||||
import com.jsowell.pile.service.*;
|
||||
import com.jsowell.pile.util.MerchantUtils;
|
||||
import com.jsowell.pile.util.UserUtils;
|
||||
import com.jsowell.pile.vo.base.LoginUserDetailVO;
|
||||
import com.jsowell.pile.vo.base.MerchantInfoVO;
|
||||
@@ -214,8 +215,8 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
|
||||
MemberBasicInfo memberInfo = selectInfoByMemberId(memberId);
|
||||
if (memberInfo != null) {
|
||||
// 如果这个会员属于希晓,那么目标运营商就设置为希晓的id
|
||||
if (StringUtils.equals("35", memberInfo.getMerchantId() + "")) {
|
||||
dto.setTargetMerchantId("35");
|
||||
if (MerchantUtils.isXiXiaoMerchant(memberInfo.getMerchantId() + "")) {
|
||||
dto.setTargetMerchantId(MerchantUtils.XIXIAO_MERCHANT_ID);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -430,9 +431,9 @@ public class MemberBasicInfoServiceImpl implements MemberBasicInfoService {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (StringUtils.equals("35", vo.getMerchantId())) {
|
||||
if (MerchantUtils.isXiXiaoMerchant(vo.getMerchantId())) {
|
||||
// 如果会员属于希晓,那么merchantId默认为希晓的运营商id
|
||||
merchantId = "35";
|
||||
merchantId = MerchantUtils.XIXIAO_MERCHANT_ID;
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
@@ -1,9 +1,18 @@
|
||||
package com.jsowell.pile.util;
|
||||
|
||||
import com.jsowell.common.util.StringUtils;
|
||||
|
||||
/**
|
||||
* 运营商工具类
|
||||
*/
|
||||
public class MerchantUtils {
|
||||
|
||||
private String XIXIAO_MERCHANT_ID = "35";
|
||||
// 希晓运营商id
|
||||
public static final String XIXIAO_MERCHANT_ID = "35";
|
||||
|
||||
// 是否是希晓运营商
|
||||
public static boolean isXiXiaoMerchant(String merchantId) {
|
||||
return StringUtils.equals(XIXIAO_MERCHANT_ID, merchantId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user