From 61aaec624403af0471d9eae1230c16c45d7fc476 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 30 Jul 2025 10:42:42 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=B7=BB=E5=8A=A0=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E7=99=BD=E5=90=8D=E5=8D=95=E5=90=8E=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=92=B1=E5=8C=85=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/PileStationWhitelistController.java | 2 +- .../impl/PileStationWhitelistServiceImpl.java | 28 +++++++++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java index 701a435ec..cbe289bf7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationWhitelistController.java @@ -70,7 +70,7 @@ public class PileStationWhitelistController extends BaseController { } /** - * 新增站点白名单 + * 新增站点白名单(带新增钱包账户) */ @PreAuthorize("@ss.hasPermi('pile:whitelist:add')") @Log(title = "站点白名单", businessType = BusinessType.INSERT) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java index 564475344..6278a54dc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationWhitelistServiceImpl.java @@ -1,21 +1,21 @@ package com.jsowell.pile.service.impl; +import com.jsowell.common.constant.Constants; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.domain.PileStationWhitelist; import com.jsowell.pile.mapper.PileStationWhitelistMapper; -import com.jsowell.pile.service.MemberBasicInfoService; -import com.jsowell.pile.service.PileMerchantInfoService; -import com.jsowell.pile.service.PileStationInfoService; -import com.jsowell.pile.service.PileStationWhitelistService; +import com.jsowell.pile.service.*; import com.jsowell.pile.vo.web.PileStationVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; /** @@ -38,6 +38,9 @@ public class PileStationWhitelistServiceImpl implements PileStationWhitelistServ @Autowired private PileMerchantInfoService pileMerchantInfoService; + @Autowired + private MemberWalletInfoService memberWalletInfoService; + /** * 查询站点白名单 * @@ -85,7 +88,22 @@ public class PileStationWhitelistServiceImpl implements PileStationWhitelistServ return 0; } pileStationWhitelist.setCreateTime(DateUtils.getNowDate()); - return pileStationWhitelistMapper.insertPileStationWhitelist(pileStationWhitelist); + pileStationWhitelistMapper.insertPileStationWhitelist(pileStationWhitelist); + + // 查询该会员在该运营商下是否有钱包账户，如果没有，则新增一条钱包账户 + MemberWalletInfo walletInfo = memberWalletInfoService.selectByMemberId(memberInfo.getMemberId(), stationInfo.getMerchantId()); + if (walletInfo == null) { + walletInfo = MemberWalletInfo.builder() + .memberId(memberInfo.getMemberId()) + .walletCode(memberBasicInfoService.generateWalletCode()) + .merchantId(stationInfo.getMerchantId()) + .principalBalance(BigDecimal.ZERO) + .giftBalance(BigDecimal.ZERO) + .version(Constants.zero) + .build(); + memberWalletInfoService.insertSelective(walletInfo); + } + return 1; } /**