yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
5026f88369 bf50159759
commit
f3b5a41a4f
8 changed files with 223 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerVo.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java
  3. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java
  4. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  5. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
  6. 157
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  7. 105
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  8. 16
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerVo.java
View File

@ -64,6 +64,8 @@ public class BaseTrailerVo implements Vo {
private String settlementPrice; // 厂商结算价
@ApiModelProperty("销售指导价")
private String guidePrice; // 销售指导价
@ApiModelProperty("主车sid")
private String vehSid;
@ApiModelProperty("主车车架号")
private String zcvinNo;
@ApiModelProperty("客户名称")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelQuery.java
View File

@ -27,6 +27,8 @@ public class BaseVehicleModelQuery implements Query {
private String configSid;
@ApiModelProperty(value = "分公司sid")
private String createOrgSId;
@ApiModelProperty(value = "分公司名称")
private String createOrgName;
@ApiModelProperty("所属归属")
private String orgSid;
@ApiModelProperty(value = "车型sid")

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java
View File

@ -93,4 +93,7 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
@Select("select * from base_trailer where vinNo = #{gcVinNo}")
BaseTrailerDetailsVo fetchByGcVinNo(String gcVinNo);
@Select("select * from base_trailer where vehSid = #{materialSid}")
List<BaseTrailerVo> fetchAllByVehSid(String materialSid);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
View File

@ -753,4 +753,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNo(gcVinNo);
return rb.success().setData(baseTrailerDetailsVo);
}
public List<BaseTrailerVo> fetchAllByVehSid(String materialSid) {
return baseMapper.fetchAllByVehSid(materialSid);
}
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java
View File

@ -85,8 +85,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
if (pagerQuery != null) {
qw.eq("bvm.isDelete", "0");
qw.like("bvb.useOrg", pagerQuery.getCreateOrgSId());
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bvm.createOrg", pagerQuery.getOrgSid());
if (StringUtils.isNotBlank(pagerQuery.getCreateOrgName())) {
qw.like("bvm.createOrgName", pagerQuery.getCreateOrgName());
}
if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
qw.eq("bvm.sid", pagerQuery.getModelSid());

157
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
View File

@ -9,6 +9,8 @@ import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerVo;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
@ -1419,62 +1421,43 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
public ResultBean vehicleZSOut(BaseVehicleZSOutApplyDto baseVehicleZSOutApplyDto) {
ResultBean rb = ResultBean.fireFail();
List<BaseVehicleZSOutDto> dtos = baseVehicleZSOutApplyDto.getBaseVehicleZSOutDtos();
List<BaseVehicleZSOutDto> zcDtos = baseVehicleZSOutApplyDto.getBaseVehicleZSOutDtos();
List<BaseVehicleZSOutDto> gcOrSzDtos = new ArrayList<>();
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseVehicleZSOutApplyDto.getCreateOrgSid()).getData();
for (BaseVehicleZSOutDto dto : dtos) {
for (BaseVehicleZSOutDto dto : zcDtos) {
Boolean b = false;
String vinSid = dto.getVinSid();
BdCustomer bdCustomer = new BdCustomer();
//获取主车sid
String materialSid = dto.getMaterialSid();
List<BdCustomer> bdCustomers = new ArrayList<>();
BaseVehicle baseVehicle = null;
if (StringUtils.isNotBlank(vinSid)) {
String payTypeKey = baseVehicleZSOutApplyDto.getSaleTypeKey();
baseVehicle = baseVehicleService.fetchBySid(vinSid);
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
//出库类型是否为全款车（001全款车）
if ("001".equals(payTypeKey)) {
Boolean aBoolean = finKingDeeFeign.customerExistState(baseVehicleZSOutApplyDto.getCustomerNo()).getData();
bdCustomer.setFNumber(baseVehicleZSOutApplyDto.getCustomerNo());
if (!aBoolean) {
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + baseVehicleZSOutApplyDto.getMobile());
}
} else {
String FNumber = HanZiConverterPinYin.getPinYinFirst(baseVehicleZSOutApplyDto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
if (!aBoolean) {
//查询合同是否存在
ResultBean<CommonContract> commonContract = commonContractService.selectByNo(baseVehicleZSOutApplyDto.getContractNo());
if (commonContract.getSuccess()) {
//查询合同编号和车辆sid客户的临时编码
ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid(), baseVehicleZSOutApplyDto.getContractNo());
if (!stringResultBean.getSuccess()) {
return rb.setMsg("请检查合同是否存在");
}
String temporaryNo = stringResultBean.getData();
Boolean aBoolean1 = finKingDeeFeign.customerExistState(temporaryNo).getData();
if (!aBoolean1) {
Boolean aBoolean2 = finKingDeeFeign.customerExistState(baseVehicleZSOutApplyDto.getCustomerNo()).getData();
if (!aBoolean2) {
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
String FNumber1 = HanZiConverterPinYin.getPinYinFirst(baseVehicleZSOutApplyDto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
if (FNumber1.length() > 30) {
FNumber1 = FNumber1.substring(0, 30);
bdCustomer.setFNumber(FNumber1);
} else {
bdCustomer.setFNumber(FNumber1);
}
bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getContractNo());
} else {
b = true;
return rb.success().setData(b);
}
} else {
finCollectionConfirmationFeign.updateVin(dto.getVinNo(), baseVehicleZSOutApplyDto.getContractNo(), temporaryNo.substring(temporaryNo.length() - 2));
}
} else {
Boolean aBoolean1 = finKingDeeFeign.customerExistState(baseVehicleZSOutApplyDto.getCustomerNo()).getData();
if (!aBoolean1) {
BdCustomer bdCustomer = new BdCustomer();
String payTypeKey = baseVehicleZSOutApplyDto.getSaleTypeKey();
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(materialSid);
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
bdCustomer.setTOrgIds(data.getOrgCode());
//出库类型是否为全款车（001全款车）
if ("001".equals(payTypeKey)) {
Boolean aBoolean = finKingDeeFeign.customerExistState(baseVehicleZSOutApplyDto.getContractNo()).getData();
if (!aBoolean) {
bdCustomer.setFNumber(baseVehicleZSOutApplyDto.getContractNo());
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + bdCustomer.getFNumber());
}
} else {
String FNumber = baseVehicleZSOutApplyDto.getContractNo() + "-" + "";
Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
if (!aBoolean) {
//查询合同是否存在
ResultBean<CommonContract> commonContract = commonContractService.selectByNo(baseVehicleZSOutApplyDto.getContractNo());
if (commonContract.getSuccess()) {
//查询合同编号和车辆sid客户的临时编码
ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid(), baseVehicleZSOutApplyDto.getContractNo());
if (!stringResultBean.getSuccess()) {
return rb.setMsg("请检查合同是否存在");
}
String temporaryNo = stringResultBean.getData();
Boolean aBoolean1 = finKingDeeFeign.customerExistState(temporaryNo).getData();
if (!aBoolean1) {
Boolean aBoolean2 = finKingDeeFeign.customerExistState(baseVehicleZSOutApplyDto.getCustomerNo()).getData();
if (!aBoolean2) {
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
String FNumber1 = HanZiConverterPinYin.getPinYinFirst(baseVehicleZSOutApplyDto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
if (FNumber1.length() > 30) {
@ -1488,16 +1471,34 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
b = true;
return rb.success().setData(b);
}
} else {
finCollectionConfirmationFeign.updateVin(dto.getVinNo(), baseVehicleZSOutApplyDto.getContractNo(), temporaryNo.substring(temporaryNo.length() - 2));
}
} else {
Boolean aBoolean1 = finKingDeeFeign.customerExistState(baseVehicleZSOutApplyDto.getCustomerNo()).getData();
if (!aBoolean1) {
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
String FNumber1 = HanZiConverterPinYin.getPinYinFirst(baseVehicleZSOutApplyDto.getCustomerName()) + dto.getVinNo().substring(dto.getVinNo().length() - 8);
if (FNumber1.length() > 30) {
FNumber1 = FNumber1.substring(0, 30);
bdCustomer.setFNumber(FNumber1);
} else {
bdCustomer.setFNumber(FNumber1);
}
bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getContractNo());
} else {
b = true;
return rb.success().setData(b);
}
}
//修改客户简称为合同编号
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getContractNo());
bdCustomer.setFNumber(FNumber);
bdCustomer.setOldFNumber(FNumber);
bdCustomers.add(bdCustomer);
finKingDeeFeign.saveBdCustomers(bdCustomers);
}
//修改客户简称为合同编号
bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getContractNo());
bdCustomer.setFNumber(FNumber);
bdCustomer.setOldFNumber(FNumber);
bdCustomers.add(bdCustomer);
finKingDeeFeign.saveBdCustomers(bdCustomers);
}
//查询出库的车辆是否满足出库条件
int count = baseMapper.selectCountByVinSid(dto.getVinSid());
@ -1509,6 +1510,35 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
if (counts > 0) {
return rb.setMsg("该车辆已出库，不允许重复出库");
}
//查询主车对应的挂车或上装
BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
List<BaseTrailerVo> baseTrailerVos = baseTrailerService.fetchAllByVehSid(materialSid);
if (baseTrailerVos.size() > 0) {
for (BaseTrailerVo baseTrailerVo : baseTrailerVos) {
baseVehicleZSOutDto.setPrice(baseTrailerVo.getDealPrice());
baseVehicleZSOutDto.setMaterialCode(baseTrailerVo.getVinNo() + "G");
baseVehicleZSOutDto.setMaterialSid(baseTrailerVo.getSid());
baseVehicleZSOutDto.setMaterialName("挂车");
baseVehicleZSOutDto.setMaterialTypeKey("002");
baseVehicleZSOutDto.setMaterialTypeValue("挂车");
baseVehicleZSOutDto.setVinSid(baseTrailerVo.getVehSid());
baseVehicleZSOutDto.setVinNo(baseTrailerVo.getVinNo());
gcOrSzDtos.add(baseVehicleZSOutDto);
}
} else {
List<BaseVehinstall> baseVehinstalls = baseVehinstallService.selectByOrgSidAndVin(baseVehicleZSOutApplyDto.getCreateOrgSid(), dto.getVinNo());
for (BaseVehinstall baseVehinstall : baseVehinstalls) {
baseVehicleZSOutDto.setPrice(baseVehinstall.getGuidePrice());
baseVehicleZSOutDto.setMaterialCode(dto.getVinNo() + "SZ");
baseVehicleZSOutDto.setMaterialSid(baseVehinstall.getSid());
baseVehicleZSOutDto.setMaterialName("上装");
baseVehicleZSOutDto.setMaterialTypeKey("003");
baseVehicleZSOutDto.setMaterialTypeValue("上装");
baseVehicleZSOutDto.setVinSid(materialSid);
baseVehicleZSOutDto.setVinNo(baseVehinstall.getVinNo());
gcOrSzDtos.add(baseVehicleZSOutDto);
}
}
//生成出库单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
@ -1541,7 +1571,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOutApply.setInnerName(baseVehicleZSOutApplyDto.getInnerName());
baseVehicleOutApply.setInnerUserSid(baseVehicleZSOutApplyDto.getInnerUserSid());
baseVehicleOutApply.setContractNo(baseVehicleZSOutApplyDto.getContractNo());
baseVehicleOutApply.setIsTerminal(baseVehicleZSOutApplyDto.getIsTerminal());
baseVehicleOutApply.setCustomerNo(bdCustomer.getFNumber());
baseVehicleOutApply.setCwCustomerNo(bdCustomer.getFNumber());
baseVehicleOutApply.setBusSid(baseVehicleZSOutApplyDto.getBusSid());
@ -1637,14 +1666,14 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
log.info("BaseVehicleOutService-vehicleOut-289:{}", JSONObject.toJSONString(salOutStock));
//推送销售专员信息
BDEmpinfo bdEmpinfo = new BDEmpinfo();
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
String staffSid = baseVehicleZSOutApplyDto.getStaffSid();
SysStaffinfoDetailsVo sysStaffinfoDetailsVo = sysStaffinfoFeign.fetchBySid(staffSid).getData();
bdEmpinfo.setFName(baseVehicleZSOutApplyDto.getStaffName());
bdEmpinfo.setFNumber(sysStaffinfoDetailsVo.getJobNumber());
bdEmpinfo.setFAddress(sysStaffinfoDetailsVo.getAddress());
bdEmpinfo.setFCreateOrgId(data.getOrgCode());
bdEmpinfo.setFUseOrgId(data.getOrgCode());
bdEmpinfo.setFCreateOrgId(basePurchaseSystemDetailsVo.getOrgCode());
bdEmpinfo.setFUseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
bdEmpinfo.setFMobile(sysStaffinfoDetailsVo.getMobile());
finKingDeeFeign.saveBDEmpinfo(bdEmpinfo);
}

105
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
View File

@ -30,11 +30,17 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutApplyDto;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleZSOutDto;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.base.common.utils.Rule;
@ -167,6 +173,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
private BusDiscountpackageHandoverService busDiscountpackageHandoverService;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
@Autowired
private BaseMiddlemanFeign baseMiddlemanFeign;
@Autowired
private BaseVehicleOutFeign baseVehicleOutFeign;
/**
* 构造出库申请的查询条件
@ -192,7 +202,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
qw.like("bd.applyName", query.getApplyName());
}
qw.eq("bd.applySid", query.getApplySid());
if(StringUtils.isNotBlank(query.getPaymentMethodKey())){
if (StringUtils.isNotBlank(query.getPaymentMethodKey())) {
qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
}
}
@ -437,7 +447,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
qw.eq("bd.useOrgSid", orgSid);
qw.ne("bd.state", 1);
if(StringUtils.isNotBlank(query.getPaymentMethodKey())){
if (StringUtils.isNotBlank(query.getPaymentMethodKey())) {
qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
}
}
@ -709,7 +719,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
List<BusDiscountpackageHandoverListDto> busDiscountpackageHandoverLists = new ArrayList<>();
discountList.removeAll(Collections.singleton(null));
if(!discountList.isEmpty()){
if (!discountList.isEmpty()) {
for (int i = 0; i < discountList.size(); i++) {
BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = discountList.get(i);
BusDiscountpackageHandoverListDto busDiscountpackageHandoverListDto = new BusDiscountpackageHandoverListDto();
@ -726,6 +736,93 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDiscountpackageHandoverDto.setBusDiscountpackageHandoverLists(busDiscountpackageHandoverLists);
busDiscountpackageHandoverService.saveOrUpdateDto(busDiscountpackageHandoverDto);
//推送出库查询
BaseVehicleZSOutApplyDto baseVehicleZSOutApplyDto = new BaseVehicleZSOutApplyDto();
baseVehicleZSOutApplyDto.setCreateBySid(busDeliveredApply.getApplySid());
baseVehicleZSOutApplyDto.setCreateByName(busDeliveredApply.getApplyName());
baseVehicleZSOutApplyDto.setSaleTypeKey(busDeliveredApply.getPaymentMethodKey());
baseVehicleZSOutApplyDto.setSaleTypeValue(busDeliveredApply.getPaymentMethod());
baseVehicleZSOutApplyDto.setSaleDate(DateUtil.today());
baseVehicleZSOutApplyDto.setOrgSid(busDeliveredApply.getStaffDeptSid());
baseVehicleZSOutApplyDto.setOrgName(busDeliveredApply.getStaffDeptName());
baseVehicleZSOutApplyDto.setStaffSid(userVoResultBean.getData().getStaffSid());
baseVehicleZSOutApplyDto.setStaffName(busDeliveredApply.getStaffName());
baseVehicleZSOutApplyDto.setCustomerName(busDeliveredApply.getName());
baseVehicleZSOutApplyDto.setMobile(busDeliveredApply.getMobile());
baseVehicleZSOutApplyDto.setCustomerSid(busDeliveredApply.getCustomerSid());
//总成交价
baseVehicleZSOutApplyDto.setTotalDealPrice(new BigDecimal(busDeliveredApply.getPrice()).multiply(new BigDecimal(detailsList.size())).toString());
baseVehicleZSOutApplyDto.setCreateOrgSid(busDeliveredApply.getUseOrgSid());
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(busDeliveredApply.getUseOrgSid());
if (organizationVoResultBean.getData() != null) {
baseVehicleZSOutApplyDto.setCreateOrgName(organizationVoResultBean.getData().getName());
}
//内部引荐人姓名
if (orderDetailsVoResultBean.getData() != null) {
baseVehicleZSOutApplyDto.setInnerUserSid(orderDetailsVoResultBean.getData().getRecommenderUserSid());
baseVehicleZSOutApplyDto.setInnerName(orderDetailsVoResultBean.getData().getRecommender());
}
//合同编号
baseVehicleZSOutApplyDto.setContractNo(busDeliveredApply.getContractNo());
//客户编码
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(busDeliveredApply.getCustomerSid());
if (crmCustomerTempVoResultBean.getData() != null) {
baseVehicleZSOutApplyDto.setCustomerNo(crmCustomerTempVoResultBean.getData().getCustomerNo());
}
//实际购车人key
baseVehicleZSOutApplyDto.setBuyerTypeKey(busDeliveredApply.getTypeKey());
baseVehicleZSOutApplyDto.setBuyerTypeValue(busDeliveredApply.getType());
baseVehicleZSOutApplyDto.setBusSid(busDeliveredApply.getSid());
List<BaseVehicleZSOutDto> baseVehicleZSOutDtos = new ArrayList<>();
for (int i = 0; i < detailsList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
//主车
BaseVehicleZSOutDto baseVehicleZSOutDto = new BaseVehicleZSOutDto();
baseVehicleZSOutDto.setVinSid(busDeliveredApplyDetails.getVinSid());
baseVehicleZSOutDto.setVinNo(busDeliveredApplyDetails.getVinNo());
baseVehicleZSOutDto.setPrice(busDeliveredApply.getPrice());
//赠品价值
baseVehicleZSOutDto.setGiftsDescription(busDeliveredApplyDetails.getDiscountAll());
baseVehicleZSOutDto.setSalesAllowance(busDeliveredApplyDetails.getSingleCarDiscountPrice());
//中介人
baseVehicleZSOutDto.setMiddleOne(busDeliveredApply.getDistributorName());
if (orderDetailsVoResultBean.getData() != null) {
if (orderDetailsVoResultBean.getData().getIntermediary1() != null) {
baseVehicleZSOutDto.setMiddleOneSid(orderDetailsVoResultBean.getData().getIntermediary1().getIntermediarySid());
ResultBean<BaseMiddlemanDetailsVo> resultBean1 = baseMiddlemanFeign.fetchDetailsBySid(baseVehicleZSOutDto.getMiddleOneSid());
if(resultBean1.getData() != null){
baseVehicleZSOutDto.setMiddleCodeOne(resultBean1.getData().getMiddleCode());
}
}
if (orderDetailsVoResultBean.getData().getIntermediary2() != null) {
baseVehicleZSOutDto.setMiddleTwoSid(orderDetailsVoResultBean.getData().getIntermediary2().getIntermediarySid());
ResultBean<BaseMiddlemanDetailsVo> resultBean1 = baseMiddlemanFeign.fetchDetailsBySid(baseVehicleZSOutDto.getMiddleTwoSid());
if(resultBean1.getData() != null){
baseVehicleZSOutDto.setMiddleCodeTwo(resultBean1.getData().getMiddleCode());
}
}
}
baseVehicleZSOutDto.setRebateMoneyOne(busDeliveredApply.getDistributorPrice());
baseVehicleZSOutDto.setMiddleTwo(busDeliveredApply.getDistributorNameTwo());
baseVehicleZSOutDto.setRebateMoneyTwo(busDeliveredApply.getDistributorPriceTwo());
baseVehicleZSOutDto.setRemarks(busDeliveredApplyDetails.getRemarks());
ResultBean<BaseVehicleSelectVo> vehicleResultBean = baseVehicleFeign.details(baseVehicleZSOutDto.getVinSid());
if(vehicleResultBean.getData() != null){
BaseVehicleSelectVo baseVehicleSelectVo = vehicleResultBean.getData();
baseVehicleZSOutDto.setManPurOrderTypeKey(baseVehicleSelectVo.getManPurOrderTypeKey());
baseVehicleZSOutDto.setManPurOrderTypeValue(baseVehicleSelectVo.getManPurOrderTypeValue());
}
baseVehicleZSOutDto.setMaterialCode(busDeliveredApplyDetails.getVinNo());
baseVehicleZSOutDto.setMaterialName("主车");
baseVehicleZSOutDto.setMaterialSid(busDeliveredApplyDetails.getVinSid());
baseVehicleZSOutDto.setMaterialTypeKey("001");
baseVehicleZSOutDto.setMaterialTypeValue("主车");
baseVehicleZSOutDtos.add(baseVehicleZSOutDto);
}
baseVehicleZSOutApplyDto.setBaseVehicleZSOutDtos(baseVehicleZSOutDtos);
ResultBean vehicleZsOutResultBean = baseVehicleOutFeign.vehicleZSOut(baseVehicleZSOutApplyDto);
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
@ -1331,7 +1428,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
List<AppCarListVo> carList = new ArrayList<>();
List<BusDeliveredApplyDetails> detailsList = busDeliveredApplyDetailsService.selectByApplySid(sid);
detailsList.removeAll(Collections.singleton(null));
if(!detailsList.isEmpty()){
if (!detailsList.isEmpty()) {
for (int i = 0; i < detailsList.size(); i++) {
BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
AppCarListVo appCarListVo = new AppCarListVo();

16
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -3436,9 +3436,25 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) {
if(priceInfo != null){
priceInfo.setGcPrice(solutionsDetailsVo.getTrailerAmount());
BigDecimal finalPriceAll = BigDecimal.ZERO;
if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
}
if(StringUtils.isNotBlank(priceInfo.getGcPrice())){
finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getGcPrice()));
}
priceInfo.setSingleFinalPrice(finalPriceAll.toString());
}
}
}else{
BigDecimal finalPriceAll = BigDecimal.ZERO;
if(priceInfo != null){
if(StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())){
finalPriceAll = finalPriceAll.add(new BigDecimal(priceInfo.getSingleFinalPrice()));
}
priceInfo.setSingleFinalPrice(finalPriceAll.toString());
}
}
if(priceInfo != null){

Write Preview
Loading…
Cancel
Save