angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 去掉国家编号、国际编号；

This commit is contained in:
jiangchao 2025-04-03 13:24:46 +08:00
parent 663c3cec74
commit ebd37ee2af
6 changed files with 81 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -2517,12 +2517,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
updateWrapper.set(CuMemberAccount::getPkCountry, uc.getNewPkSettleCountry());
updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId());
memberAccountService.update(updateWrapper);
//修改国家编号
CuMember cm = baseMapper.queryRecentlyMember(uc.getNewPkSettleCountry());
if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) {
String countryCode = this.createCountryCode(cm.getCountryCode());
member.setCountryCode(countryCode);
}
// //修改国家编号
// CuMember cm = baseMapper.queryRecentlyMember(uc.getNewPkSettleCountry());
// if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) {
// String countryCode = this.createCountryCode(cm.getCountryCode());
// member.setCountryCode(countryCode);
// }
baseMapper.updateById(member);
CuSettleCountryDetailed countryDetailed = new CuSettleCountryDetailed();
countryDetailed.setPkServiceLog(memberLog.getPkId());
@ -2828,12 +2828,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
updateWrapper.set(CuMemberAccount::getPkCountry, Integer.parseInt(uc.getNewSettleCountry()));
updateWrapper.eq(CuMemberAccount::getPkMember, uc.getPkId());
memberAccountService.update(updateWrapper);
//修改国家编号
CuMember cm = baseMapper.queryRecentlyMember(Integer.parseInt(uc.getNewSettleCountry()));
if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) {
String countryCode = this.createCountryCode(cm.getCountryCode());
member.setCountryCode(countryCode);
}
// //修改国家编号
// CuMember cm = baseMapper.queryRecentlyMember(Integer.parseInt(uc.getNewSettleCountry()));
// if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) {
// String countryCode = this.createCountryCode(cm.getCountryCode());
// member.setCountryCode(countryCode);
// }
member.setPkSettleCountry(Integer.parseInt(uc.getNewSettleCountry()));
baseMapper.updateById(member);
}
@ -3160,36 +3160,36 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
**/
@Override
public void generateNumber(CuMember cuMember, Integer pkCountry) {
CuMember cm = baseMapper.queryRecentlyMember(pkCountry);
CuMember cm1 = baseMapper.queryInternationalMember();
//全球编号
String globalCode = "";
//国家编号
String countryCode = "";
if (StringUtils.isNotNull(cm1) && StringUtils.isNotEmpty(cm1.getGlobalCode())) {
globalCode = RandomNumberGenerator.getNextNumber(Integer.parseInt(cm1.getGlobalCode()));
}
if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) {
countryCode = this.createCountryCode(cm.getCountryCode());
}
cuMember.setGlobalCode(globalCode);
cuMember.setCountryCode(countryCode);
// CuMember cm = baseMapper.queryRecentlyMember(pkCountry);
// CuMember cm1 = baseMapper.queryInternationalMember();
// //全球编号
// String globalCode = "";
// //国家编号
// String countryCode = "";
// if (StringUtils.isNotNull(cm1) && StringUtils.isNotEmpty(cm1.getGlobalCode())) {
// globalCode = RandomNumberGenerator.getNextNumber(Integer.parseInt(cm1.getGlobalCode()));
// }
// if (StringUtils.isNotNull(cm) && StringUtils.isNotEmpty(cm.getCountryCode())) {
// countryCode = this.createCountryCode(cm.getCountryCode());
// }
// cuMember.setGlobalCode(globalCode);
// cuMember.setCountryCode(countryCode);
}
/**
* 创建国家最新唯一编号
*
* @param countryCode
* @return
*/
private String createCountryCode(String countryCode) {
countryCode = RandomNumberGenerator.getNextNumber(countryCode, 3);
LambdaQueryWrapper<CuMember> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CuMember::getCountryCode, countryCode);
// 校验是否已经存在，不存在则返回
return baseMapper.selectCount(queryWrapper) == 0 ? countryCode : this.createCountryCode(countryCode);
}
// /**
// * 创建国家最新唯一编号
// *
// * @param countryCode
// * @return
// */
// private String createCountryCode(String countryCode) {
// countryCode = RandomNumberGenerator.getNextNumber(countryCode, 3);
//
// LambdaQueryWrapper<CuMember> queryWrapper = new LambdaQueryWrapper<>();
// queryWrapper.eq(CuMember::getCountryCode, countryCode);
// // 校验是否已经存在，不存在则返回
// return baseMapper.selectCount(queryWrapper) == 0 ? countryCode : this.createCountryCode(countryCode);
// }
/**
* 查询推荐列表

26
hzs-business/hzs-business-member/src/main/java/com/hzs/member/login/service/impl/MemberLoginServiceImpl.java
View File

@ -1,12 +1,10 @@
package com.hzs.member.login.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.hzs.common.core.constant.msg.SystemMsgConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.core.utils.ServletUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.ip.IpUtils;
@ -91,28 +89,28 @@ public class MemberLoginServiceImpl implements IMemberLoginService {
try {
// 是否更新会员
boolean updateFlag = false;
UpdateWrapper<CuMember> updateWrapper = new UpdateWrapper<>();
LambdaUpdateWrapper<CuMember> updateWrapper = new LambdaUpdateWrapper<>();
if (null == member.getPkVertex()) {
// 空单注册会员，如果体系为空处理
CuMemberExt vertexMember = iCuMemberService.queryParentVertex(member.getPkId());
if (null != vertexMember) {
updateWrapper.set("PK_VERTEX", vertexMember.getPkVertex());
updateWrapper.set(CuMember::getPkVertex, vertexMember.getPkVertex());
updateFlag = true;
}
}
if (StringUtils.isAnyEmpty(member.getCountryCode(), member.getGlobalCode())) {
// 国家编码或者全球编码为空，需要处理添加进去
iCuMemberService.generateNumber(member, member.getPkSettleCountry());
updateWrapper.set("COUNTRY_CODE", member.getCountryCode());
updateWrapper.set("GLOBAL_CODE", member.getGlobalCode());
updateFlag = true;
}
// if (StringUtils.isAnyEmpty(member.getCountryCode(), member.getGlobalCode())) {
// // 国家编码或者全球编码为空，需要处理添加进去
// iCuMemberService.generateNumber(member, member.getPkSettleCountry());
// updateWrapper.set(CuMember::getCountryCode, member.getCountryCode());
// updateWrapper.set(CuMember::getGlobalCode, member.getGlobalCode());
// updateFlag = true;
// }
if (updateFlag) {
updateWrapper.eq(SystemFieldConstants.PK_ID, member.getPkId());
updateWrapper.eq(CuMember::getPkId, member.getPkId());
iCuMemberService.update(updateWrapper);
}
} catch (Exception e) {
log.error("会员 {} 补全 国家编码 或 全球编码 或 体系 错误", member.getMemberCode());
log.error("会员 {} 补全 体系 错误", member.getMemberCode());
}
// 用户未支付状态

28
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java
View File

@ -577,20 +577,20 @@ public class SaOrderHandle {
* @param: null null
**/
String validateEnoughShopping(OrderParam orderParam) {
// 商品编号 + sku主键 + 数量
List<BdWaresDetailExt> bdWaresDetailExtList = getWaresDetailExtList(orderParam, null);
BigDecimal orderAchieve = BigDecimal.ZERO;
boolean isMakerGiftFlag = Boolean.FALSE;
for (BdWaresDetailExt bdWaresDetailExt : bdWaresDetailExtList) {
if (Objects.equals(EWaresType.MAKER.getValue(), bdWaresDetailExt.getIsMakerGift())) {
isMakerGiftFlag = Boolean.TRUE;
}
Integer num = bdWaresDetailExt.getQuantity() * bdWaresDetailExt.getWaresQuantity();
orderAchieve = ComputeUtil.computeAdd(orderAchieve, ComputeUtil.computeMultiply(bdWaresDetailExt.getAchieve(), num));
}
if (isMakerGiftFlag && ComputeUtil.compareGreaterThan(MagicNumberConstants.REGISTER_MIN_ACHIEVE, orderAchieve)) {
return TransactionUtils.getContent(MemberMsgConstants.ORDER_PRODUCT_ENOUGH_ACHIEVE);
}
// // 商品编号 + sku主键 + 数量
// List<BdWaresDetailExt> bdWaresDetailExtList = getWaresDetailExtList(orderParam, null);
// BigDecimal orderAchieve = BigDecimal.ZERO;
// boolean isMakerGiftFlag = Boolean.FALSE;
// for (BdWaresDetailExt bdWaresDetailExt : bdWaresDetailExtList) {
// if (Objects.equals(EWaresType.MAKER.getValue(), bdWaresDetailExt.getIsMakerGift())) {
// isMakerGiftFlag = Boolean.TRUE;
// }
// Integer num = bdWaresDetailExt.getQuantity() * bdWaresDetailExt.getWaresQuantity();
// orderAchieve = ComputeUtil.computeAdd(orderAchieve, ComputeUtil.computeMultiply(bdWaresDetailExt.getAchieve(), num));
// }
// if (isMakerGiftFlag && ComputeUtil.compareGreaterThan(MagicNumberConstants.REGISTER_MIN_ACHIEVE, orderAchieve)) {
// return TransactionUtils.getContent(MemberMsgConstants.ORDER_PRODUCT_ENOUGH_ACHIEVE);
// }
return null;
}

20
hzs-business/hzs-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -656,16 +656,16 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
SaOrderExt saOrderExt = packageWholeSaOrder(orderParam, cuMember);
if (Objects.equals(saOrderExt.getOrderType(), EOrderType.REGISTER_ORDER.getValue())) {
// 注册订单验证是否存在礼包商品，礼包商品订单业绩需要>=7200
saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
if (null != saOrderItems.getIsMakerGift()
&& EYesNo.YES.getIntValue() == saOrderItems.getIsMakerGift()
&& ComputeUtil.compareGreaterThan(MagicNumberConstants.REGISTER_MIN_ACHIEVE, saOrderExt.getOrderAchieve())) {
throw new RuntimeException(TransactionUtils.getContent(MemberMsgConstants.ORDER_PRODUCT_ENOUGH_ACHIEVE));
}
});
}
// if (Objects.equals(saOrderExt.getOrderType(), EOrderType.REGISTER_ORDER.getValue())) {
// // 注册订单验证是否存在礼包商品，礼包商品订单业绩需要>=7200
// saOrderExt.getOrderItemsList().forEach(saOrderItems -> {
// if (null != saOrderItems.getIsMakerGift()
// && EYesNo.YES.getIntValue() == saOrderItems.getIsMakerGift()
// && ComputeUtil.compareGreaterThan(MagicNumberConstants.REGISTER_MIN_ACHIEVE, saOrderExt.getOrderAchieve())) {
// throw new RuntimeException(TransactionUtils.getContent(MemberMsgConstants.ORDER_PRODUCT_ENOUGH_ACHIEVE));
// }
// });
// }
if (setLastCuMemberGrade(cuMember, saOrderExt)) {
return false;
}

10
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java
View File

@ -92,11 +92,11 @@ public class MagicNumberConstants {
public static final BigDecimal MAKER_SHARE_INCOME = BigDecimal.valueOf(1500);
public static final BigDecimal REGISTER_SHARE_INCOME = BigDecimal.valueOf(3000);
/**
* 购买创客礼包需要最小的业绩
* 2023.10.09 进行修改，注册升级时，7200也可以购买沙棘果油礼包
*/
public static final BigDecimal REGISTER_MIN_ACHIEVE = BigDecimal.valueOf(7200);
// /**
// * 购买创客礼包需要最小的业绩
// * 2023.10.09 进行修改，注册升级时，7200也可以购买沙棘果油礼包
// */
// public static final BigDecimal REGISTER_MIN_ACHIEVE = BigDecimal.valueOf(7200);
/**
* 户籍变更次数

7
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/RandomNumberGenerator.java
View File

@ -71,11 +71,4 @@ public class RandomNumberGenerator {
return MagicNumberConstants.GLOBAL_PREFIX + String.format("%08d", value);
}
public static void main(String[] args) {
String gbNum1 = RandomNumberGenerator.generate("CN",2);
String gbNum2 = RandomNumberGenerator.getNextNumber("CNN00010002",3);
System.out.println("==="+gbNum1);
System.out.println("==="+gbNum2);
}
}