zhuyifan

refactor(settlement): improve settlement order detail processing logic

......@@ -897,10 +897,10 @@ public class SettlementServiceImpl implements SettlementService {
// 3. 判断已退款
if (orderDetail.getServeStatus() == ServeStatusEnum.SERVE_REJECT) {
SettlementDTO.SettlementOrderDetail refundRecord1 = buildSettlementOrderDetail(
order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), -orderDetail.getCount(), orderDetail.getPrice(), "已退款", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap);
order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), orderDetail.getCount(), orderDetail.getPrice(), "订餐", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap);
classifyOrders.add(refundRecord1);
SettlementDTO.SettlementOrderDetail refundRecord2 = buildSettlementOrderDetail(
order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), orderDetail.getCount(), orderDetail.getPrice(), "已退款", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap);
order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), -orderDetail.getCount(), orderDetail.getPrice(), "已退款", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap);
classifyOrders.add(refundRecord2);
}
......@@ -970,7 +970,7 @@ public class SettlementServiceImpl implements SettlementService {
.avoidRemark(order.getAvoidRemark())
.onlinePay(onlinePayDesc)
.operationType(operationType)
.transactionId(order.getTransactionId())
.transactionId(operationType.equals("已退款") ? "" : order.getTransactionId())
.build();
}
......