angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 提示信息取消奥国际化转化

This commit is contained in:
zhangheng 2025-09-04 17:05:28 +08:00 committed by cabbage
parent 9731627e0f
commit 01447b0cf5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
View File

@ -577,12 +577,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 查询订单信息 // 查询订单信息
SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry); SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
if (null == saOrder) { if (null == saOrder) {
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST; return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
} }
// 订单支付日期 < 当前日期-7天 // 订单支付日期 < 当前日期-7天
Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7); Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
if (beforeDate.compareTo(saOrder.getPayTime()) > 0) { if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED); return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
} }
// 操作日志内容 // 操作日志内容
@ -654,7 +654,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
// 校验订单原订单价格和调换完货之后的价格不相同不进行换货 // 校验订单原订单价格和调换完货之后的价格不相同不进行换货
if (beforeAmount.compareTo(afterAmount) != 0) { if (beforeAmount.compareTo(afterAmount) != 0) {
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE; return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
} }
if (iSaOrderChargeLogService.save(saOrderChargeLog)) { if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@ -696,12 +696,12 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 查询订单收货地址信息 // 查询订单收货地址信息
SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry); SaOrderExt saOrder = iSaOrderService.queryOrderByCode(orderCode, pkCountry);
if (null == saOrder) { if (null == saOrder) {
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST; return CommonMsgConstants.OPERATION_FAILED + "：" + orderCode + SaOrderMsgConstants.ORDER_NOT_EXIST;
} }
// 订单支付日期 < 当前日期-7天 // 订单支付日期 < 当前日期-7天
Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7); Date beforeDate = DateUtils.addDate(DateUtils.getStartTime(nowDate), -7);
if (beforeDate.compareTo(saOrder.getPayTime()) > 0) { if (beforeDate.compareTo(saOrder.getPayTime()) > 0) {
return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_SETTLED); return DocumentMsgConstants.DOCUMENT_ORDER_SETTLED;
} }
// 涉及会员ID列表 // 涉及会员ID列表
@ -748,7 +748,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal afterAmount = afterData.getOrderAmount().add(param.getPostage()).setScale(2, BigDecimal.ROUND_HALF_UP);
//校验订单原订单价格和调换完货之后的价格不相同不进行换货 //校验订单原订单价格和调换完货之后的价格不相同不进行换货
if (beforeAmount.compareTo(afterAmount) != 0) { if (beforeAmount.compareTo(afterAmount) != 0) {
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE; return CommonMsgConstants.OPERATION_FAILED + "：" + param.getOrderCode() + SaOrderMsgConstants.PRODUCT_CONFIRM_PRICE;
} }
if (iSaOrderChargeLogService.save(saOrderChargeLog)) { if (iSaOrderChargeLogService.save(saOrderChargeLog)) {
@ -762,7 +762,7 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
} }
return submitStr; return submitStr;
} }
return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED); return CommonMsgConstants.OPERATION_FAILED;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)