From 829e9f02f790dd3dcd4cd3206781ef2d84877f19 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 7 Dec 2023 16:12:54 +0800 Subject: [PATCH] update --- .../java/com/jsowell/service/MemberService.java | 14 +++++++++----- .../transaction/service/TransactionService.java | 11 +++++++---- .../java/com/jsowell/pile/util/MerchantUtils.java | 9 +++++++++ 3 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java 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 37affa5f7..0ac1f07d1 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -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)) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java b/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java index 07954d563..8de1439ad 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java @@ -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()); + } } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java new file mode 100644 index 000000000..15abacf96 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/util/MerchantUtils.java @@ -0,0 +1,9 @@ +package com.jsowell.pile.util; + +/** + * 运营商工具类 + */ +public class MerchantUtils { + + private String XIXIAO_MERCHANT_ID = "35"; +}