[修改] 自提车辆,异常数据bug

backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/query/SelfPickupCar.mk

@@ -116,6 +116,11 @@
         <type>string</type>
         <description></description>
       </field>
+        <field title='合同状态'>
+            <name>contract.contractState</name>
+            <type>string</type>
+            <description></description>
+        </field>
       <field title='车辆信息'>
         <name>carInfo</name>
         <type>string</type>

backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/query/SelfPickupCar.jmx

@@ -126,6 +126,16 @@
 					</m:ref>
 					<m:desc></m:desc>
 				</m:field>
+			    <m:field>
+                    <m:name>contract.contractState</m:name>
+                    <m:title>合同状态</m:title>
+                    <m:type>string</m:type>
+                    <m:ref>
+                        <m:name></m:name>
+                        <m:type></m:type>
+                    </m:ref>
+                    <m:desc></m:desc>
+                </m:field>
 				<m:field>
 					<m:name>contract.contractName</m:name>
 					<m:title>合同名称</m:title>

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesRecordServiceImpl.java

@@ -527,7 +527,7 @@ public class SalesRecordServiceImpl implements SalesRecordService {
                                 KObject kObject = contractService.queryContract(contractId);
                                 BigDecimal advanceBalance = kObject.getBigDecimal("advanceBalance");
                                 if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(salesRecordInfo.getString(SalesRecordConstant.AMOUNT))) == -1) {
-                                return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").getUuid("contractName") +"的预付款余额不足");
+                                return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").get("contractName") +"的预付款余额不足");
                             }
                                 //获取当前异常数据的总价
                                 amount = BigDecimal.ZERO.subtract(BigDecimal.valueOf(salesRecordInfo.getDouble(SalesRecordConstant.AMOUNT)));
@@ -538,7 +538,7 @@ public class SalesRecordServiceImpl implements SalesRecordService {
                                 KObject kObject = contractService.queryContract(contractId);
                                 BigDecimal advanceBalance = kObject.getBigDecimal("advanceBalance");
                                 if (advanceBalance == null || advanceBalance.compareTo(new BigDecimal(salesRecordInfo.getString(SalesRecordConstant.AMOUNT))) == -1) {
-                                    return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").getUuid("contractName") +"的预付款余额不足");
+                                    return ResponseObj.error(400,"合同名称为："+salesRecordInfo.get("contract").get("contractName") +"的预付款余额不足");
                                 }
                                 //获取当前异常数据的总价
                                 amount = BigDecimal.ZERO.subtract(BigDecimal.valueOf(salesRecordInfo.getDouble(SalesRecordConstant.AMOUNT)));