diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index c6c90506d..6949b0c22 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -261,7 +261,6 @@ public class MemberService { */ public MemberVO getMemberInfoByMemberId(String memberId) { MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId); - return memberVO; } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 4c271d6a0..f60801a2b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -745,7 +745,7 @@ public class OrderService { .build() ); // 如果是希晓的会员,将余额支付添加进去 - if (StringUtils.equals(String.valueOf(memberBasicInfo.getMerchantId()), "35")) { // 35-希晓 + if (StringUtils.equals("35", String.valueOf(memberBasicInfo.getMerchantId()))) { // 35-希晓 // 余额支付 result.add( PayModeVO.builder() diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 2558a4d2a..839e6c39d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -364,6 +364,11 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { return null; } + if (StringUtils.equals("35", vo.getMerchantId())) { + // 如果会员属于希晓,那么merchantId默认为希晓的运营商id + merchantId = "35"; + } + try { BigDecimal totalAccountAmount = BigDecimal.ZERO; BigDecimal principalBalance = BigDecimal.ZERO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java index ee263eef6..fe25f7716 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java @@ -24,6 +24,9 @@ public class MemberVO { */ private String memberId; + /** + * 会员所属一级运营商 + */ private String merchantId; /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index b7aafbd4a..8b451a15c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -185,7 +185,8 @@ t1.STATUS as status, t1.nick_name as nickName, t1.avatar_url as avatarUrl, - t1.mobile_number as mobileNumber + t1.mobile_number as mobileNumber, + t1.merchant_id as merchantId FROM diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index 43490f2fb..542f30423 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -28,8 +28,6 @@ import com.jsowell.pile.domain.ykcCommond.StartChargingCommand; import com.jsowell.pile.domain.ykcCommond.StopChargingCommand; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; -import com.jsowell.pile.service.orderlogic.AbstractOrderLogic; -import com.jsowell.pile.service.orderlogic.OrderLogicFactory; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; @@ -200,7 +198,7 @@ public class LianLianServiceImpl implements LianLianService { // 只取最后一部分 330213 String subAreaCode = split[split.length - 1]; info.setAreaCode(subAreaCode); - if (StringUtils.equals(String.valueOf(pileStationInfo.getMerchantId()), "35")) { + if (StringUtils.equals("35", String.valueOf(pileStationInfo.getMerchantId()))) { // 如果是希晓运营商,则把equipmentOwnerID换成希晓 info.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } @@ -996,7 +994,7 @@ public class LianLianServiceImpl implements LianLianService { .stopReason(0) // .chargeDetails() .build(); - if (StringUtils.equals(orderBasicInfo.getMerchantId(), "35")) { + if (StringUtils.equals("35", orderBasicInfo.getMerchantId())) { orderInfo.setEquipmentOwnerID(Constants.OPERATORID_XI_XIAO); } // 支付方式