autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 10:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

希晓会员查询会员详情

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-11-27 15:50:26 +08:00
parent 0ca1542f67
commit f656203530
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -261,7 +261,6 @@ public class MemberService {
*/
public MemberVO getMemberInfoByMemberId(String memberId) {
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId);
return memberVO;
}

2
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -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()

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -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;

3
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java
View File

@@ -24,6 +24,9 @@ public class MemberVO {
*/
private String memberId;
/**
* 会员所属一级运营商
*/
private String merchantId;
/**

3
jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
View File

@@ -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
<!--t2.principal_balance as principalBalance,
t2.gift_balance as giftBalance-->
FROM

6
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -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);
}
// 支付方式