This commit is contained in:
2024-01-09 14:22:40 +08:00
parent 2764a267ae
commit 9ad40a7717
4 changed files with 891 additions and 259 deletions

View File

@@ -438,7 +438,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
}
/**
* 订单结算
* 订单结算/结算订单逻辑/订单结算逻辑
*/
@Override
public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
@@ -452,6 +452,8 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
returnUpdateOrderBasicInfo(orderBasicInfo, data);
// 获取更新数据后的orderDetail对象/更新订单详情 查询订单详情 修改订单数据
OrderDetail orderDetail = returnUpdateOrderDetail(orderBasicInfo, data);
// 计算订单折扣 calculateOrderDiscounts
calculateOrderDiscounts(orderBasicInfo, orderDetail);
// 更新数据库
OrderTransactionDTO dto = new OrderTransactionDTO();
dto.setOrderBasicInfo(orderBasicInfo);
@@ -480,6 +482,15 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic {
logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSONObject.toJSONString(dto));
}
/**
* 计算订单折扣
* @param orderBasicInfo 订单主表
* @param orderDetail 订单详情
*/
private void calculateOrderDiscounts(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail) {
}
// uniApp 发送停止充电订阅消息
private void sendMsg(OrderBasicInfo orderBasicInfo) {
try {