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-28 09:50:05 +08:00
parent 4f4e7e6062 58d19e59fd
commit 878cf0f6b2
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java
View File

@ -344,9 +344,9 @@ public class ApiRetailOrderController {
String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList); String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList);
// redis 拿金额 // redis 拿金额
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode()); SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) { if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAchieve().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode()); redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限"); return AjaxResult.error("订单业绩超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
} }
return confirmOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode()); return confirmOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode());
@ -463,9 +463,9 @@ public class ApiRetailOrderController {
// 确认订单 // 确认订单
String str = iRetailOrderService.confirmOtherOrder(orderParam); String str = iRetailOrderService.confirmOtherOrder(orderParam);
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode()); SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) { if (ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea() && saOrder.getOrderAchieve().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode()); redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + orderParam.getPkCreator() + orderParam.getOrderCode());
return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限"); return AjaxResult.error("订单业绩超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
} }
return confirmOrderReturn(str, orderParam.getPkCreator(), orderParam.getShopList(), orderParam.getOrderCode()); return confirmOrderReturn(str, orderParam.getPkCreator(), orderParam.getShopList(), orderParam.getOrderCode());
} }
@ -822,9 +822,9 @@ public class ApiRetailOrderController {
String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList); String str = iRetailOrderService.confirmRegOrder(registerParam, gradeList);
// redis 拿金额 // redis 拿金额
SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode()); SaOrderExt saOrder = redisService.getCacheObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAmount().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) { if (ESpecialArea.RETAIL_REGISTER.getValue() == registerParam.getSpecialArea() && saOrder.getOrderAchieve().compareTo(RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT) > 0) {
redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode()); redisService.deleteObject(CacheConstants.RETAIL_TEMP_ORDER + registerParam.getPkCreator() + registerParam.getOrderCode());
return AjaxResult.error("订单金额超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限"); return AjaxResult.error("订单业绩超过" + RetailConstants.SPECIAL_AREA_41_MAX_ORDER_AMOUNT + "上限");
} }
return confirmSharedOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode(), saOrder.getOrderAmount().add(saOrder.getPostage())); return confirmSharedOrderReturn(str, registerParam.getPkCreator(), registerParam.getShopList(), registerParam.getOrderCode(), saOrder.getOrderAmount().add(saOrder.getPostage()));

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

@ -39,6 +39,7 @@ import com.hzs.sale.order.param.OrderItemsParam;
import com.hzs.sale.order.param.WaresNumberParam; import com.hzs.sale.order.param.WaresNumberParam;
import com.hzs.sale.order.service.*; import com.hzs.sale.order.service.*;
import com.hzs.sale.order.service.impl.SaOrderHandle; import com.hzs.sale.order.service.impl.SaOrderHandle;
import com.hzs.sale.order.service.impl.SaOrderServiceImpl;
import com.hzs.sale.product.service.IBdProductService; import com.hzs.sale.product.service.IBdProductService;
import com.hzs.sale.wares.service.IBdWaresDetailService; import com.hzs.sale.wares.service.IBdWaresDetailService;
import com.hzs.sale.wares.service.IBdWaresExtendService; import com.hzs.sale.wares.service.IBdWaresExtendService;
@ -108,7 +109,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
@DubboReference @DubboReference
ISmsServiceApi iSmsServiceApi; ISmsServiceApi iSmsServiceApi;
@Override @Override
public String confirmRegOrder(RetailOrderRegisterParam registerParam, List<BdGrade> gradeList) { public String confirmRegOrder(RetailOrderRegisterParam registerParam, List<BdGrade> gradeList) {
// 新会员 // 新会员
@ -301,6 +301,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (CollectionUtil.isEmpty(gradeList)) { if (CollectionUtil.isEmpty(gradeList)) {
gradeList = iGradeServiceApi.getRetailGradeList().getData(); gradeList = iGradeServiceApi.getRetailGradeList().getData();
} }
if(ObjectUtil.isEmpty(updateGradeMember.getPkSettleGrade())){
updateGradeMember.setPkSettleGrade(iSaOrderService.calculateGrade().getPkId());
}
BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get(); BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get();
if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) { if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) {
@ -715,7 +718,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
|| EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) { || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) {
// 处理等级 // 处理等级
CuMember sourceMember = iMemberServiceApi.getMember(gradeMember.getPkId()).getData(); CuMember sourceMember = iMemberServiceApi.getMember(gradeMember.getPkId()).getData();
GradeDTO bdGrade = iGradeServiceApi.getGrade(sourceMember.getPkSettleGrade()).getData(); Integer pkSettleGrade = ObjectUtil.isNotEmpty(sourceMember) ? sourceMember.getPkSettleGrade() : gradeMember.getPkSettleGrade();
GradeDTO bdGrade = iGradeServiceApi.getGrade(pkSettleGrade).getData();
if (bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()) { if (bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()) {
List<BdGrade> tmpGradeList = iGradeServiceApi.getRetailGradeList().getData(); List<BdGrade> tmpGradeList = iGradeServiceApi.getRetailGradeList().getData();
// 等级值倒序 // 等级值倒序