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; } /**