Переглянути джерело

fix: 修改订单汇总数据字段名称

luofeiyun 1 місяць тому
батько
коміт
182be651b7

+ 1 - 1
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderTotalVO.java

@@ -104,7 +104,7 @@ public class TradeOrderTotalVO {
     private BigDecimal orderMoney;
 
     @Schema(description = "实际总额")
-    private BigDecimal realAmount;
+    private BigDecimal realMoney;
 
     @Schema(description = "实际总额")
     private BigDecimal realOrderMoney;

+ 1 - 1
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/AppOtcTradeOrderServiceImpl.java

@@ -81,7 +81,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
         shipTradeOrderCreateReqVO.setConfirmType(0);
         shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
         shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
-        shipTradeOrderCreateReqVO.setRealMoney(createVO.getSummary().getRealAmount());
+        shipTradeOrderCreateReqVO.setRealMoney(createVO.getSummary().getRealMoney());
         shipTradeOrderCreateReqVO.setOtherMoney(createVO.getSummary().getOtherMoney());
         shipTradeOrderCreateReqVO.setDiscountId(createVO.getSummary().getDiscountId());
         if (createVO.getSummary().getRealOrderMoney() != null) {

+ 2 - 2
ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1861,7 +1861,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
 //        List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         TradeOrderTotalVO summary = createVO.getSummary();
-        BigDecimal realAmount = summary.getRealAmount();
+        BigDecimal realAmount = summary.getRealMoney();
         BigDecimal orderMoney = summary.getOrderMoney();
         Long discountId = summary.getDiscountId();
         BigDecimal realOrderMoney = summary.getRealOrderMoney();
@@ -2158,7 +2158,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setTravelDate(tradeOrderDO.getTravelDate());
         shipTradeOrderCreateReqVO.setOrderId(orderId);
         TradeOrderTotalVO summary = createVO.getSummary();
-        BigDecimal realAmount = summary.getRealAmount();
+        BigDecimal realAmount = summary.getRealMoney();
         BigDecimal orderMoney = summary.getOrderMoney();
         Long discountId = summary.getDiscountId();
         BigDecimal realOrderMoney = summary.getRealOrderMoney();