jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
f27c89a2 1 parent 5765f32d

refactor(settlement): improve settlement order detail processing logic

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
...@@ -897,10 +897,10 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -897,10 +897,10 @@ public class SettlementServiceImpl implements SettlementService {
897 // 3. 判断已退款 897 // 3. 判断已退款
898 if (orderDetail.getServeStatus() == ServeStatusEnum.SERVE_REJECT) { 898 if (orderDetail.getServeStatus() == ServeStatusEnum.SERVE_REJECT) {
899 SettlementDTO.SettlementOrderDetail refundRecord1 = buildSettlementOrderDetail( 899 SettlementDTO.SettlementOrderDetail refundRecord1 = buildSettlementOrderDetail(
900 - order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), -orderDetail.getCount(), orderDetail.getPrice(), "已退款", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap); 900 + order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), orderDetail.getCount(), orderDetail.getPrice(), "订餐", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap);
901 classifyOrders.add(refundRecord1); 901 classifyOrders.add(refundRecord1);
902 SettlementDTO.SettlementOrderDetail refundRecord2 = buildSettlementOrderDetail( 902 SettlementDTO.SettlementOrderDetail refundRecord2 = buildSettlementOrderDetail(
903 - order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), orderDetail.getCount(), orderDetail.getPrice(), "已退款", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap); 903 + order, orderDetail.getMenuDetailId(), orderDetail.getSkuId(), -orderDetail.getCount(), orderDetail.getPrice(), "已退款", menuName, customerName, hisCustomerNo, menuDetailMap, mealMap, skuMap);
904 classifyOrders.add(refundRecord2); 904 classifyOrders.add(refundRecord2);
905 } 905 }
906 906
...@@ -970,7 +970,7 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -970,7 +970,7 @@ public class SettlementServiceImpl implements SettlementService {
970 .avoidRemark(order.getAvoidRemark()) 970 .avoidRemark(order.getAvoidRemark())
971 .onlinePay(onlinePayDesc) 971 .onlinePay(onlinePayDesc)
972 .operationType(operationType) 972 .operationType(operationType)
973 - .transactionId(order.getTransactionId()) 973 + .transactionId(operationType.equals("已退款") ? "" : order.getTransactionId())
974 .build(); 974 .build();
975 } 975 }
976 976
......