From b51f6f0d5564b843aeb11f088873faa5aa2116ce Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 22:22:54 +0800
Subject: [PATCH] feat(mall): 为订单支付流程添加订单号生成和更新功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 760eb53..9b9e8b8 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -65,30 +65,13 @@
private final MallMemberWalletMapper mallMemberWalletMapper;
private final ICommonService commonService;
private final RedisUtils redisUtils;
- private final MallOrderInfoMapper mallOrderInfoMapper;
- private final MallShoppingCartMapper mallShoppingCartMapper;
private final MallMoneyFlowMapper mallMoneyFlowMapper;
- private final IApiMallMemberWalletService walletService;
- private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallShopApplyMapper mallShopApplyMapper;
- private final MallRegisterAppealMapper mallRegisterAppealMapper;
- private final MallTeamLeaderMapper mallTeamLeaderMapper;
- private final SpringContextHolder springContextHolder;
private final MallAgentRecordMapper mallAgentRecordMapper;
- private final IMallMoneyFlowService mallMoneyFlowService;
- private final IMallMemberCollectionService mallMemberCollectionService;
- private final IMallMemberFootprintService mallMemberFootprintService;
- private final SalemanCouponMapper salemanCouponMapper;
private final CouponGoodsMapper couponGoodsMapper;
- private final MallGoodsCouponMapper mallGoodsCouponMapper;
private final MallMemberCouponMapper mallMemberCouponMapper;
- private final MallGoodsMapper mallGoodsMapper;
-
- private final MallVipConfigMapper mallVipConfigMapper;
- private final MallStoreMapper mallStoreMapper;
- private final MallStoreItemMapper mallStoreItemMapper;
- private final MallStoreMemberMapper mallStoreMemberMapper;
+ private final MallAddressInfoMapper mallAddressInfoMapper;
@Value("${spring.profiles.active}")
@@ -106,13 +89,26 @@
* 验证两次密码是否一致
*/
String password = registerDto.getPassword();
+ String confirmPassword = registerDto.getConfirmPassword();
+ if (!password.equals(confirmPassword)) {
+ throw new FebsException("The two passwords are inconsistent");
+ }
mallMember = new MallMember();
- mallMember.setName(account);
+ mallMember.setName(registerDto.getLastName() + registerDto.getFirstName());
+ mallMember.setPhone(registerDto.getPhoneNumber());
mallMember.setEmail(registerDto.getAccount());
mallMember.setPassword(SecureUtil.md5(password));
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
this.baseMapper.insert(mallMember);
+
+ MallAddressInfo mallAddressInfo = new MallAddressInfo();
+ mallAddressInfo.setMemberId(mallMember.getId());
+ mallAddressInfo.setName(registerDto.getLastName());
+ mallAddressInfo.setFristName(registerDto.getFirstName());
+ mallAddressInfo.setPhone(registerDto.getPhoneNumber());
+ mallAddressInfoMapper.insert(mallAddressInfo);
+
MallMemberWallet wallet = new MallMemberWallet();
wallet.setBalance(BigDecimal.ZERO);
@@ -208,6 +204,7 @@
MallMemberVo mallMemberVo = new MallMemberVo();
mallMemberVo.setName(mallMember.getName());
mallMemberVo.setEmail(mallMember.getEmail());
+ mallMemberVo.setPhoneNumber(mallMember.getPhone());
mallMemberVo.setAvatar(mallMember.getAvatar());
return new FebsResponse().success().data(mallMemberVo);
}
@@ -220,10 +217,6 @@
MallMember mallMember = this.baseMapper.selectById(memberId);
if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) {
mallMember.setName(modifyMemberInfoDto.getName());
- }
-
- if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
- mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
}
this.baseMapper.updateById(mallMember);
@@ -309,7 +302,7 @@
}
- private final XcxProperties xcxProperties = SpringContextHolder.getBean(XcxProperties.class);
+ private final XcxProperties xcxProperties;
@@ -400,8 +393,6 @@
@Override
public FebsResponse salesService() {
- LoginUserUtil.getLoginUser().getId();
-
MallSalesServiceVo mallSalesServiceVo = new MallSalesServiceVo();
List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(
@@ -419,12 +410,38 @@
if (SalesServiceEnums.EMAIL.getCode().equals(dataDictionaryCustom.getCode())){
mallSalesServiceVo.setEmail(dataDictionaryCustom.getValue());
}
+ if (SalesServiceEnums.WORKINGHOURS.getCode().equals(dataDictionaryCustom.getCode())){
+ mallSalesServiceVo.setWorkingHours(dataDictionaryCustom.getValue());
+ }
+ if (SalesServiceEnums.ADDRESS.getCode().equals(dataDictionaryCustom.getCode())){
+ mallSalesServiceVo.setAddress(dataDictionaryCustom.getValue());
+ }
}
}
return new FebsResponse().success().data(mallSalesServiceVo);
}
+ @Override
+ public FebsResponse moneyChange() {
+ List<MallMoneyChangeVo> vos = new ArrayList<>();
+ List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(
+ SalesServiceEnums.USD.getType()
+ );
+ if (dataDictionaryCustoms.size() > 0){
+ for (DataDictionaryCustom dataDictionaryCustom : dataDictionaryCustoms){
+ MallMoneyChangeVo vo = new MallMoneyChangeVo();
+ vo.setMoneyChange(dataDictionaryCustom.getValue());
+ vo.setCode(dataDictionaryCustom.getCode());
+ vo.setMoneyCode(dataDictionaryCustom.getDescription());
+ vos.add(vo);
+ }
+
+ }
+ return new FebsResponse().success().data(vos);
+
+ }
+
public static void main(String[] args) {
Long userld = 173L;
String shopAccount = "luohu";
--
Gitblit v1.9.1