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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-07 16:12:54 +08:00
parent fd4e88c78e
commit 829e9f02f7
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,12 +160,16 @@ public class MemberService {
memberBasicInfo.setMerchantId(Long.valueOf(merchantId));
memberBasicInfo.setOpenId(openId);
MemberTransactionDTO memberTransactionDTO = new MemberTransactionDTO();
memberTransactionDTO.setMemberBasicInfo(memberBasicInfo);
// 首次新建会员，同时新建会员钱包
// MemberWalletInfo memberWalletInfo = MemberWalletInfo.builder().memberId(memberId).build();
MemberTransactionDTO memberTransactionDTO = MemberTransactionDTO.builder()
.memberBasicInfo(memberBasicInfo)
// .memberWalletInfo(memberWalletInfo)
.build();
if (StringUtils.equals("35", merchantId)) {
MemberWalletInfo memberWalletInfo = MemberWalletInfo.builder()
.memberId(memberId)
.merchantId("35")
.build();
memberTransactionDTO.setMemberWalletInfo(memberWalletInfo);
}
transactionService.createMember(memberTransactionDTO);
} else {
if (!StringUtils.equals(memberBasicInfo.getOpenId(), openId)) {

11
jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java
View File

@@ -180,10 +180,13 @@ public class TransactionService {
if (Objects.nonNull(dto.getMemberBasicInfo())) {
memberBasicInfoMapper.insertMemberBasicInfo(dto.getMemberBasicInfo());
}
// 2023年11月11日17点01分修改逻辑 新建会员的时候不用新建钱包了，由在后管充值的时候创建
// if (Objects.nonNull(dto.getMemberWalletInfo())) {
// memberWalletInfoMapper.insertSelective(dto.getMemberWalletInfo());
// }
/*
2023年11月11日17点01分修改逻辑 新建会员的时候不用新建钱包了，由在后管充值的时候创建
2023年12月7日15点13分 修改逻辑，前面传过来钱包信息就创建
*/
if (Objects.nonNull(dto.getMemberWalletInfo())) {
memberWalletInfoMapper.insertSelective(dto.getMemberWalletInfo());
}
}
/**

9
jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java Normal file
View File

@@ -0,0 +1,9 @@
package com.jsowell.pile.util;
/**
* 运营商工具类
*/
public class MerchantUtils {
private String XIXIAO_MERCHANT_ID = "35";
}