diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 88826953b0..aae6dd08f2 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1043,7 +1043,7 @@
or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入'
)
- order by isFictitious desc
+ order by isFictitious,bv.locationName,bv.vinNo desc
@@ -1069,7 +1069,7 @@
- order by isFictitious desc
+ order by isFictitious,bv.locationName,bv.vinNo desc
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 8a6a608880..22ef001e6a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -2038,7 +2038,12 @@ public class BaseVehicleService extends MybatisBaseService baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid, orderVoList.get(i).getVin());
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 984906a163..4cb30ce26d 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1864,34 +1864,49 @@ public class CommonContractService extends MybatisBaseService vinList = appOrderModelInfoVo.getVinListsVos();
- for (int i = 0; i < vinList.size(); i++) {
- UnCollectionDto unCollectionDto = new UnCollectionDto();
- //合同sid
- unCollectionDto.setContractSid(commonContract.getSid());
- //合同编号
- unCollectionDto.setContractNo(commonContract.getContractNo());
- //客户名称
- unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
- //客户sid
- unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
- //客户类型
- unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
- //客户类型
- unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
- //客户头像
- unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
- unCollectionDto.setReceivablesName("订金");
- unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
- unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
- unCollectionDto.setVinNo(vinList.get(i).getVinNo());
- unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
- unCollectionDto.setUserSid(dto.getUserSid());
- unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
- unCollectionDto.setBusVinSid(vinList.get(i).getSid());
- unCollectionDto.setPayType(appOrderDetailsVo.getPayType());
- unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
- finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+ //查询是否是结转金额,如果是,则订金金额为补交金额/台数。若为现金则为单台订金
+ String key = depositInfo.getDepositTypeKey();
+ BigDecimal bigDecimalKeyAll = new BigDecimal("0");
+ if("02".equals(key)){
+ String makeUpAll = depositInfo.getMakeUpDeposit();
+ if(makeUpAll != null){
+ bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num)));
+ }
+ }else{
+ bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit()));
+ }
+ if(bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0){
+ for (int i = 0; i < vinList.size(); i++) {
+ UnCollectionDto unCollectionDto = new UnCollectionDto();
+ //合同sid
+ unCollectionDto.setContractSid(commonContract.getSid());
+ //合同编号
+ unCollectionDto.setContractNo(commonContract.getContractNo());
+ //客户名称
+ unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
+ //客户sid
+ unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+ //客户类型
+ unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
+ //客户类型
+ unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
+ //客户头像
+ unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
+ unCollectionDto.setReceivablesName("订金");
+ unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
+ unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+ unCollectionDto.setVinNo(vinList.get(i).getVinNo());
+// unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
+ unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString());
+ unCollectionDto.setUserSid(dto.getUserSid());
+ unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
+ unCollectionDto.setBusVinSid(vinList.get(i).getSid());
+ unCollectionDto.setPayType(appOrderDetailsVo.getPayType());
+ unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
+ finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+ }
}
+
/*} else {
int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
for (int i = 0; i < qualiy; i++) {
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
index b61c40ef0d..f5ba187926 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
@@ -1,5 +1,6 @@
package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -96,4 +97,10 @@ public class AppOrderDetailsVo implements Vo {
@ApiModelProperty("是否包牌")
private String licensePlateValue;
private String staffSid;
+ //中介人1
+ private SubmitVo intermediary1;
+ //中介人2
+ private SubmitVo intermediary2;
+
+
}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
index e447f40c0f..fa7970d7b6 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java
@@ -29,5 +29,7 @@ public class AppOrderPriceInfoVo implements Vo {
private String singleGuildPrice;
@ApiModelProperty("单台整体成交价")
private String singleFinalPrice;
+ //单车折让
+ private String singleCarDiscountPrice;
}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/SubmitVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/SubmitVo.java
new file mode 100644
index 0000000000..1dd100e135
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/SubmitVo.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesordersubmit;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/29 14:36
+ * @Description
+ */
+@Data
+public class SubmitVo implements Vo {
+ private static final long serialVersionUID = 971941132986290392L;
+ //中介人
+ private String intermediaryName;
+ //联系电话
+ private String intermediaryMobile;
+ //返利费用
+ private String agencyFee;
+}
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 8574f0cb48..6b83e39e8b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -90,6 +90,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsV
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
@@ -2573,7 +2574,7 @@ public class BusSalesOrderService extends MybatisBaseService vinNoList = new ArrayList<>();
- Map vinNoMap = new HashMap<>();
+ Map vinNoMap = new HashMap<>();
String modelSid = orderInfo.getModelSid();
String configSid = orderInfo.getConfigSid();
String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(busSalesOrder.getStaffSid()).getData();
@@ -2585,7 +2586,7 @@ public class BusSalesOrderService extends MybatisBaseService nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(sid);
nowCarList.removeAll(Collections.singleton(null));
if (!nowCarList.isEmpty()) {
- boolean isCheck = isCheck(vinNoList, nowCarList,vinNoMap);
+ boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap);
if (isCheck) {
isVehicle = false;
}
@@ -2818,7 +2819,59 @@ public class BusSalesOrderService extends MybatisBaseService