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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-10-29 09:07:13 +08:00
parent 4cc3685af0 09b3ce07f5
commit 47dfd8ba9e
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -26,6 +26,7 @@ import com.hzs.common.domain.sale.order.*;
import com.hzs.common.domain.sale.product.BdProduct; import com.hzs.common.domain.sale.product.BdProduct;
import com.hzs.common.domain.sale.wares.BdWaresRange; import com.hzs.common.domain.sale.wares.BdWaresRange;
import com.hzs.common.domain.system.base.BdStorehouse; import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.common.domain.system.config.BdAwards;
import com.hzs.common.domain.system.config.BdGrade; import com.hzs.common.domain.system.config.BdGrade;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.account.IMemberAccountServiceApi; import com.hzs.member.account.IMemberAccountServiceApi;
@ -117,7 +118,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
newMember.setPhone(registerParam.getPhone()); newMember.setPhone(registerParam.getPhone());
newMember.setPkSettleGrade(gradeList.get(0).getPkId()); newMember.setPkSettleGrade(gradeList.get(0).getPkId());
newMember.setPkSettleCountry(1); newMember.setPkSettleCountry(1);
newMember.setPkAwards(1); // newMember.setPkAwards(gradeList.get(0).getPkAwards());
// 封装订单信息 // 封装订单信息
SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember); SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember);
@ -213,21 +214,44 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (null != cuMember) { if (null != cuMember) {
cuMember.setPkSettleGrade(newGrade.getPkId()); cuMember.setPkSettleGrade(newGrade.getPkId());
cuMember.setPkAwards(newGrade.getPkAwards()); cuMember.setPkAwards(newGrade.getPkAwards());
// if (null == cuMember.getPkAwards()) { if (null == cuMember.getPkAwards()) {
// // 新会员没有奖衔，则进行赋值 // 新会员没有奖衔，则进行赋值
// cuMember.setPkAwards(newGrade.getPkAwards()); cuMember.setPkAwards(newGrade.getPkAwards());
// } else { } else {
// // 老会员奖衔如果为无，也进行赋值 // 老会员奖衔如果为无，也进行赋值
// BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
// if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue() if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()
// && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) { && EAwards.MEMBER.getValue() != newGrade.getPkAwards()) {
// cuMember.setPkAwards(newGrade.getPkAwards()); cuMember.setPkAwards(newGrade.getPkAwards());
// } }
// } }
} }
} else if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()) { } else if (ESpecialArea.RETAIL_REPURCHASE.getValue() == orderParam.getSpecialArea()) {
// saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().add(orderParam.getPostage())); // saOrderExt.setOrderAmount(saOrderExt.getOrderAmount().add(orderParam.getPostage()));
saOrderExt.setPostage(orderParam.getPostage()); saOrderExt.setPostage(orderParam.getPostage());
// 注册、升级订单，计算会员等级
BdGrade newGrade = this.calculateGrade(orderParam.getSpecialArea(), orderParam.getOrderItemsParams(),
gradeList, cuMember, orderAchieve);
if (null == newGrade) {
throw new ServiceException("会员不满足升级条件");
}
saOrderExt.setPkGrade(newGrade.getPkId());
// 会员信息
if (null != cuMember) {
cuMember.setPkSettleGrade(newGrade.getPkId());
cuMember.setPkAwards(newGrade.getPkAwards());
if (null == cuMember.getPkAwards()) {
// 新会员没有奖衔，则进行赋值
cuMember.setPkAwards(newGrade.getPkAwards());
} else {
// 老会员奖衔如果为无，也进行赋值
BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData();
if (EAwards.MEMBER.getValue() == bdAwards.getAwardsValue()
&& EAwards.MEMBER.getValue() != newGrade.getPkAwards()) {
cuMember.setPkAwards(newGrade.getPkAwards());
}
}
}
} else if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea()) { } else if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea()) {
saOrderExt.setSpecialArea(ESpecialArea.RETAIL_UPGRADE.getValue()); saOrderExt.setSpecialArea(ESpecialArea.RETAIL_UPGRADE.getValue());
saOrderExt.setOrderType(ESpecialArea.RETAIL_UPGRADE.getValue()); saOrderExt.setOrderType(ESpecialArea.RETAIL_UPGRADE.getValue());

1
文档/mybatis说明.txt
View File

@ -3,3 +3,4 @@ mybatis 配置的 configuration 属性下添加:
default-fetch-size: 100 default-fetch-size: 100
说明： 修改mybatis默认提取数据大小（默认为10），修改后每次查询数据提取一次100条，大批量查询数数据时，减少与oracle数据库交互提高加载数据速度，但是数据库每次查询使用内存増大，需要谨慎使用，防止OOM 说明： 修改mybatis默认提取数据大小（默认为10），修改后每次查询数据提取一次100条，大批量查询数数据时，减少与oracle数据库交互提高加载数据速度，但是数据库每次查询使用内存増大，需要谨慎使用，防止OOM
1