Browse Source

1、订单结算和订单结算审核列表接口返回字段变更

jxl 21 hours ago
parent
commit
d9348097dd

+ 2 - 2
leromro-core/src/main/java/com/leromro/core/domain/vo/OrderSettlementApplicationListVO.java

@@ -91,7 +91,7 @@ public class OrderSettlementApplicationListVO {
 
     // 区域公司抽成金额
     @Excel(name = "区域公司抽成比例")
-    private BigDecimal areaDistributionRadio;
+    private BigDecimal areaDistributionRatio;
 
     // 区域公司抽成金额
     @Excel(name = "区域公司抽成金额")
@@ -107,7 +107,7 @@ public class OrderSettlementApplicationListVO {
 
     // 服务中心抽成比例
     @Excel(name = "服务中心抽成比例")
-    private BigDecimal serviceCentreDistributionRadio;
+    private BigDecimal serviceCentreDistributionRatio;
 
     // 服务中心抽成金额
     @Excel(name = "服务中心抽成金额")

+ 2 - 2
leromro-core/src/main/java/com/leromro/core/domain/vo/SettlementOrderListVO.java

@@ -75,7 +75,7 @@ public class SettlementOrderListVO {
 
     // 区域公司抽成金额
     @Excel(name = "区域公司抽成比例")
-    private BigDecimal areaDistributionRadio;
+    private BigDecimal areaDistributionRatio;
 
     // 区域公司抽成金额
     @Excel(name = "区域公司抽成金额(元)")
@@ -133,7 +133,7 @@ public class SettlementOrderListVO {
 
     // 服务中心抽成比例
     @Excel(name = "服务中心抽成比例")
-    private BigDecimal serviceCentreDistributionRadio;
+    private BigDecimal serviceCentreDistributionRatio;
 
     // 服务中心抽成金额
     @Excel(name = "服务中心抽成金额(元)")

+ 4 - 4
leromro-core/src/main/resources/mapper/core/OrderSettlementApplicationMapper.xml

@@ -52,11 +52,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             l_second_order.order_status AS orderStatus,
             area.dept_name AS areaName,
             service_centre.dept_name AS serviceCentreName,
-            l_second_order.area_distribution_radio AS areaDistributionRadio,
+            l_second_order.area_distribution_ratio AS areaDistributionRatio,
             l_second_order.area_distribution_amount AS areaDistributionAmount,
             l_second_order.area_settlement_status AS areaSettlementStatus,
             l_second_order.area_settlement_time AS areaSettlementTime,
-            l_second_order.service_centre_distribution_radio AS serviceCentreDistributionRadio,
+            l_second_order.service_centre_distribution_ratio AS serviceCentreDistributionRatio,
             l_second_order.service_centre_distribution_amount AS serviceCentreDistributionAmount,
             l_second_order.service_centre_settlement_status AS serviceCentreSettlementStatus,
             l_second_order.service_centre_settlement_time AS serviceCentreSettlementTime,
@@ -99,11 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         l_second_order.order_status AS orderStatus,
         area.dept_name AS areaName,
         service_centre.dept_name AS serviceCentreName,
-        l_second_order.area_distribution_radio AS areaDistributionRadio,
+        l_second_order.area_distribution_ratio AS areaDistributionRatio,
         l_second_order.area_distribution_amount AS areaDistributionAmount,
         l_second_order.area_settlement_status AS areaSettlementStatus,
         l_second_order.area_settlement_time AS areaSettlementTime,
-        l_second_order.service_centre_distribution_radio AS serviceCentreDistributionRadio,
+        l_second_order.service_centre_distribution_ratio AS serviceCentreDistributionRatio,
         l_second_order.service_centre_distribution_amount AS serviceCentreDistributionAmount,
         l_second_order.service_centre_settlement_status AS serviceCentreSettlementStatus,
         l_second_order.service_centre_settlement_time AS serviceCentreSettlementTime,

+ 4 - 4
leromro-core/src/main/resources/mapper/core/SecondOrdersMapper.xml

@@ -329,7 +329,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.order_status AS orderStatus,
         area.dept_name AS areaName,
         service_centre.dept_name AS serviceCentreName,
-        a.area_distribution_radio AS areaDistributionRadio,
+        a.area_distribution_ratio AS areaDistributionRatio,
         a.area_distribution_amount AS areaDistributionAmount,
         a.area_settlement_status AS areaSettlementStatus,
         a.area_settlement_time AS areaSettlementTime,
@@ -340,7 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.area_payee_account AS areaPayeeAccount,
         a.area_payee_bank_name AS areaPayeeBankName,
         a.area_payee_name AS areaPayeeName,
-        a.service_centre_distribution_radio AS serviceCentreDistributionRadio,
+        a.service_centre_distribution_ratio AS serviceCentreDistributionRatio,
         a.service_centre_distribution_amount AS serviceCentreDistributionAmount,
         a.service_centre_settlement_status AS serviceCentreSettlementStatus,
         a.service_centre_settlement_time AS serviceCentreSettlementTime,
@@ -464,7 +464,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.order_status AS orderStatus,
         area.dept_name AS areaName,
         service_centre.dept_name AS serviceCentreName,
-        a.area_distribution_radio AS areaDistributionRadio,
+        a.area_distribution_ratio AS areaDistributionRatio,
         a.area_distribution_amount AS areaDistributionAmount,
         a.area_settlement_status AS areaSettlementStatus,
         a.area_settlement_time AS areaSettlementTime,
@@ -475,7 +475,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.area_payee_account AS areaPayeeAccount,
         a.area_payee_bank_name AS areaPayeeBankName,
         a.area_payee_name AS areaPayeeName,
-        a.service_centre_distribution_radio AS serviceCentreDistributionRadio,
+        a.service_centre_distribution_ratio AS serviceCentreDistributionRatio,
         a.service_centre_distribution_amount AS serviceCentreDistributionAmount,
         a.service_centre_settlement_status AS serviceCentreSettlementStatus,
         a.service_centre_settlement_time AS serviceCentreSettlementTime,