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

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
2c48678275 4280511f17
commit
572383a9c8
2 changed files with 111 additions and 111 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. 218
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

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

@ -1335,9 +1335,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrderMakeupDetailsVo != null) {
vo.setTopInfoState(1);
vo.setTopName(busSalesOrderMakeupDetailsVo.getTopName());
if(busSalesOrderMakeupDetailsVo.getIsMain() == 0){//主车带上装
if (busSalesOrderMakeupDetailsVo.getIsMain() == 0) {//主车带上装
vo.setMain(false);
}else{
} else {
vo.setMain(true);
}
}
@ -1472,22 +1472,22 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public PagerVo<AppBusSalesOrderVo> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
QueryWrapper<BusSalesOrder> qw = appCreateQueryWrapper(pq.getParams());
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(),"");
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
if(commonContractVoResultBean.getData() != null){
if (commonContractVoResultBean.getData() != null) {
record.setContractId(commonContractVoResultBean.getData().getContractNo());
}
AppOrderDetailsVo appOrderDetailsVo = getSaleOrderDetails(record.getSaleOrderSid()).getData();
List<VinListsVo> vinListsVos = appOrderDetailsVo.getModelInfo().getVinListsVos();
List<String> vinSids = new ArrayList<>();
for (VinListsVo vinListsVo : vinListsVos){
for (VinListsVo vinListsVo : vinListsVos) {
vinSids.add(vinListsVo.getVinSid());
}
int i = busHandoverService.selectByCount(record.getContractId(), vinSids);
if (record.isShowStopBtn() && i < vinSids.size()){
if (record.isShowStopBtn() && i < vinSids.size()) {
record.setShowStopBtn(true);
}else {
} else {
record.setShowStopBtn(false);
}
if (StringUtils.isNotBlank(record.getCustomerImage())) {
@ -1564,9 +1564,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else {
record.setShowInputBtn(false);
}*/
if(commonContract == null){
if (commonContract == null) {
record.setShowInputBtn(false);
}else{
} else {
record.setShowInputBtn(true);
}
}
@ -1574,9 +1574,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//查询销售订单的合同号是否存在，若存在则显示打印合同的按钮
if(StringUtils.isNotBlank(record.getContractId())){
if (StringUtils.isNotBlank(record.getContractId())) {
record.setShowContractBtn(true);
}else{
} else {
record.setShowContractBtn(false);
}
@ -1681,9 +1681,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
}
//获取销售部门
String orgSid = Arrays.asList(orgSidPath.split("/")).get(Arrays.asList(orgSidPath.split("/")).size()-1);
String orgSid = Arrays.asList(orgSidPath.split("/")).get(Arrays.asList(orgSidPath.split("/")).size() - 1);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgSid).getData();
if(sysOrganization != null){
if (sysOrganization != null) {
busSalesOrder.setOrgName(sysOrganization.getName());
}
busSalesOrder.setOrgSid(orgSid);
@ -1915,9 +1915,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
if (details.getData() != null) {
String vehicleKey = details.getData().getVehicleType();
if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){
if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) {
orderInfo.setPublicModelNullable(false);
}else{
} else {
orderInfo.setPublicModelNullable(true);
}
}
@ -2097,9 +2097,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
if (details.getData() != null) {
String vehicleKey = details.getData().getVehicleType();
if(!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)){
if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) {
orderInfo.setPublicModelNullable(false);
}else{
} else {
orderInfo.setPublicModelNullable(true);
}
}
@ -2794,7 +2794,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
AppOrderDetailsVo vo = new AppOrderDetailsVo();
vo = baseMapper.getSaleOrderDetails(sid);
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(sid);
if(commonContractVoResultBean.getData() != null){
if (commonContractVoResultBean.getData() != null) {
vo.setContractId(commonContractVoResultBean.getData().getContractNo());
}
vo.setUserSid(busSalesOrder.getCreateBySid());
@ -2926,7 +2926,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}*/
//颜色
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
topMessage = topMessage + busSalesOrderMakeup.getColor();
topMessage = topMessage + busSalesOrderMakeup.getColor();
}
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTopName())) {
topMessage = topMessage + busSalesOrderMakeup.getTopName();
@ -2946,26 +2946,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
topMessage = topMessage + "、" + busSalesOrderMakeup.getPlateMaterial();
}
//篷布滑道
if(StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide())&& !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())){
if (StringUtils.isNotBlank(busSalesOrderMakeup.getTarpaulinSlide()) && !"-".equals(busSalesOrderMakeup.getTarpaulinSlide())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getTarpaulinSlide();
}
//冷藏冷机
if(StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())){
if (StringUtils.isNotBlank(busSalesOrderMakeup.getRefirgerator())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getRefirgerator();
if(!busSalesOrderMakeup.getRefirgerator().contains("机")){
topMessage = topMessage+"冷机";
if (!busSalesOrderMakeup.getRefirgerator().contains("机")) {
topMessage = topMessage + "冷机";
}
}
//自卸液压盖板
if(StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl())&& !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())){
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSelfUnHyCoPl()) && !"-".equals(busSalesOrderMakeup.getSelfUnHyCoPl())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getSelfUnHyCoPl();
}
//底板加热
if(StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating())&& !"-".equals(busSalesOrderMakeup.getFloorHeating())){
if (StringUtils.isNotBlank(busSalesOrderMakeup.getFloorHeating()) && !"-".equals(busSalesOrderMakeup.getFloorHeating())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getFloorHeating();
}
//更多配置
if(StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig())&& !"-".equals(busSalesOrderMakeup.getMoreConfig())){
if (StringUtils.isNotBlank(busSalesOrderMakeup.getMoreConfig()) && !"-".equals(busSalesOrderMakeup.getMoreConfig())) {
topMessage = topMessage + "、" + busSalesOrderMakeup.getMoreConfig();
}
vo.setTopMessage(topMessage);
@ -3071,9 +3071,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
depositInfo.setImages(stringList);
}
}
if(StringUtils.isNotBlank(depositInfo.getPayDepositDays())){
if (StringUtils.isNotBlank(depositInfo.getPayDepositDays())) {
depositInfo.setPayDepositDays(depositInfo.getPayDepositDays());
}else{
} else {
depositInfo.setPayDepositDays("/");
}
vo.setDepositInfo(depositInfo);
@ -3261,7 +3261,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return r;
}
public void saveContract(OrderContractQuery orderContractQuery){
public void saveContract(OrderContractQuery orderContractQuery) {
String sid = orderContractQuery.getSid();
String userSid = orderContractQuery.getUserSid();
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
@ -3271,7 +3271,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo();
String modelSid = appOrderModelInfoVo.getModelSid();
String finalContractNo = commonContractFeign.selectContractNo(appOrderDetailsVo.getUseOrgSid(),modelSid).getData();
String finalContractNo = commonContractFeign.selectContractNo(appOrderDetailsVo.getUseOrgSid(), modelSid).getData();
//甲方
String createOrgName = appOrderDetailsVo.getSalesOrg();
//乙方
@ -3282,7 +3282,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//根据存放地点查询
ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(priceInfo.getPlannedPickUpLocationKey()).getData();
String finalAddress = "";
if(scmWarehouseVo != null){
if (scmWarehouseVo != null) {
finalAddress = scmWarehouseVo.getWarehouseAttribute();
}
String depositTotal = depositInfo.getDepositTotal();
@ -3338,16 +3338,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
commonContractFeign.saveContract(commonContract);
baseMapper.updateContractNoBySid(commonContract.getContractNo(),sid);
baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo());
List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetailedList = listResultBean.getData();
if(finUncollectedReceivablesDetailedList.size() == 0){
saveFinSelect(appOrderDetailsVo,commonContract,userSid);
if (finUncollectedReceivablesDetailedList.size() == 0) {
saveFinSelect(appOrderDetailsVo, commonContract, userSid);
}
}
public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo,CommonContract commonContract,String userSid){
public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo, CommonContract commonContract, String userSid) {
AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = appOrderDetailsVo.getDepositInfo();
@ -3396,14 +3396,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//添加推送至款项确认的应收未收明细中
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
//更新销售订单的临时号
if("2".equals(appOrderDetailsVo.getPayTypeKey())){//贷款
for(int i = 0; i < vinList.size(); i++){
if ("2".equals(appOrderDetailsVo.getPayTypeKey())) {//贷款
for (int i = 0; i < vinList.size(); i++) {
//销售订单中车辆表的sid
String salesOrderVinSid = vinList.get(i).getSid();
String temporaryNum = String.format("%02d", i + 1);
String temporaryNo = commonContract.getContractNo()+temporaryNum;
String temporaryNo = commonContract.getContractNo() + temporaryNum;
//更新临时号
ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid,temporaryNo);
ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo);
}
}
//查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
@ -3497,69 +3497,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
} /*else {
int num = Integer.parseInt(vo.getPriceInfo().getNumber());
for (int i = 0; i < num; i++) {
BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
busSalesOrderVehicle.setSalesOrderSid(bv.getBusinessSid());
busSalesOrderVehicleService.insert(busSalesOrderVehicle);
}
}*/
}
//查询是否有合同，如果没有则生成合同
OrderContractQuery orderContractQuery = new OrderContractQuery();
orderContractQuery.setSid(bv.getBusinessSid());
orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
if(StringUtils.isBlank(busSalesOrder.getContractNo())){
if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
saveContract(orderContractQuery);
}
//推送款项车款=====================================
AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
AppOrderPriceInfoVo priceInfo = vo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
//查询销售订单的单台订金与单台成交价是否相等，若不相等，则推送车款为成交价减去订金的，推送订金的为单台订金的
String singleFinalPrice = priceInfo.getSingleFinalPrice();
String deposit = depositInfo.getDeposit();
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
CommonContract commonContract = commonContractResultBean.getData();
//单台成交价与单台订金相等
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
List<VinListsVo> 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(vo.getName());
//客户sid
unCollectionDto.setCustomerSid(vo.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(vo.getCustomerKey());
//客户类型
unCollectionDto.setCustomerClassKey(vo.getCustomerType());
//客户头像
unCollectionDto.setCustomerImage(vo.getCustomerImage());
unCollectionDto.setReceivablesName("车款");
unCollectionDto.setCustomerPhone(vo.getPhone());
unCollectionDto.setUseOrgSid(vo.getUseOrgSid());
unCollectionDto.setVinNo(vinList.get(i).getVinNo());
unCollectionDto.setCurrentReceivableMoney(money);
unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setReveivableMoney(money);
unCollectionDto.setBusVinSid(vinList.get(i).getSid());
unCollectionDto.setPayType(vo.getPayType());
unCollectionDto.setPayTypeKey(vo.getPayTypeKey());
unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
//推送车款
createCarFin(vo, busSalesOrder);
//-----------------推送车款款项结束
//推送采购渠道待选择
BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
@ -3588,6 +3536,58 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
public void createCarFin(AppOrderDetailsVo vo, BusSalesOrder busSalesOrder) {
//推送款项车款=====================================
AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
AppOrderPriceInfoVo priceInfo = vo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
//查询销售订单的单台订金与单台成交价是否相等，若不相等，则推送车款为成交价减去订金的，推送订金的为单台订金的
String singleFinalPrice = priceInfo.getSingleFinalPrice();
String deposit = depositInfo.getDeposit();
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(busSalesOrder.getContractNo());
CommonContract commonContract = commonContractResultBean.getData();
//单台成交价与单台订金相等
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
List<VinListsVo> 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(vo.getName());
//客户sid
unCollectionDto.setCustomerSid(vo.getCustomerSid());
//客户类型
unCollectionDto.setCustomerClass(vo.getCustomerKey());
//客户类型
unCollectionDto.setCustomerClassKey(vo.getCustomerType());
//客户头像
unCollectionDto.setCustomerImage(vo.getCustomerImage());
unCollectionDto.setReceivablesName("车款");
unCollectionDto.setCustomerPhone(vo.getPhone());
unCollectionDto.setUseOrgSid(vo.getUseOrgSid());
unCollectionDto.setVinNo(vinList.get(i).getVinNo());
unCollectionDto.setCurrentReceivableMoney(money);
unCollectionDto.setUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setReveivableMoney(money);
unCollectionDto.setBusVinSid(vinList.get(i).getSid());
unCollectionDto.setPayType(vo.getPayType());
unCollectionDto.setPayTypeKey(vo.getPayTypeKey());
unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
}
/**
* 获取上一环节信息
*
@ -3644,13 +3644,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
appMap.put("saleOrderSid", busSalesOrder.getSid());
variables.put("app", appMap);
//是否是全款
if(BusSalesOrderConstantUtils.PayTypeEnum.FULL_PAYMENT.getCode().equals(busSalesOrder.getPayTypeKey())){//全款
if(BusSalesOrderConstantUtils.FinancePlanenum.PURCHASETYPEUP_ONE.getCode().equals(busSalesOrder.getFinancePlan())){
if (BusSalesOrderConstantUtils.PayTypeEnum.FULL_PAYMENT.getCode().equals(busSalesOrder.getPayTypeKey())) {//全款
if (BusSalesOrderConstantUtils.FinancePlanenum.PURCHASETYPEUP_ONE.getCode().equals(busSalesOrder.getFinancePlan())) {
variables.put(BusSalesOrderConstantUtils.IS_LOAN, true);
}else{
} else {
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
}
}else{
} else {
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false);
}
@ -4009,7 +4009,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
// qw.eq("bo.nodeState", "已办结");
String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(),typeState);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
for (AppBusSalesOrderVo record : pagging.getRecords()) {
record.setShowStopBtn(false);
record.setShowContractBtn(false);
@ -4091,12 +4091,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//销售订单在销售支持部经理审核后，自动生成应收，此时也可以生成合同，生成合同的同时生成合同审核待办。
//查询应收是否已生成
if("Activity_10w0sy1".equals(bv.getTaskDefKey())){
if ("Activity_10w0sy1".equals(bv.getTaskDefKey())) {
//保存合同
OrderContractQuery orderContractQuery = new OrderContractQuery();
orderContractQuery.setSid(bv.getBusinessSid());
orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
if(StringUtils.isBlank(busSalesOrder.getContractNo())){
if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
saveContract(orderContractQuery);
}
}
@ -4135,10 +4135,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.success().setData(busSaleOrderVehicleOutVo);
}
//根据客户sid查询客户编码
if(StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getCustomerSid())){
if (StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getCustomerSid())) {
//根据客户sid查询客户编码
CrmCustomerTempVo crmCustomerTemp = crmCustomerTempFeign.fetchSid(busSaleOrderVehicleOutVo.getCustomerSid()).getData();
if(crmCustomerTemp != null){
if (crmCustomerTemp != null) {
busSaleOrderVehicleOutVo.setCustomerNo(crmCustomerTemp.getCustomerNo());
}
}
@ -4174,16 +4174,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//根据中介人sid查询中介人编码
//中介人1编码
if(StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getIntermediarySid())){
if (StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getIntermediarySid())) {
ResultBean<BaseMiddlemanDetailsVo> baseMiddlemanDetailsVoResultBean = baseMiddlemanFeign.fetchDetailsBySid(busSaleOrderVehicleOutVo.getIntermediarySid());
if(baseMiddlemanDetailsVoResultBean.getData() != null){
if (baseMiddlemanDetailsVoResultBean.getData() != null) {
busSaleOrderVehicleOutVo.setIntermediaryCode(baseMiddlemanDetailsVoResultBean.getData().getMiddleCode());
}
}
//中介人2编码
if(StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getIntermediarySid2())){
if (StringUtils.isNotBlank(busSaleOrderVehicleOutVo.getIntermediarySid2())) {
ResultBean<BaseMiddlemanDetailsVo> baseMiddlemanDetailsVoResultBean = baseMiddlemanFeign.fetchDetailsBySid(busSaleOrderVehicleOutVo.getIntermediarySid2());
if(baseMiddlemanDetailsVoResultBean.getData() != null){
if (baseMiddlemanDetailsVoResultBean.getData() != null) {
busSaleOrderVehicleOutVo.setIntermediaryCode2(baseMiddlemanDetailsVoResultBean.getData().getMiddleCode());
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -1362,8 +1362,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
//销售部门
if (StringUtils.isNotBlank(confirmation.getCreateDeptSid())) {
resultBean = sysOrganizationFeign.fetchBySid(confirmation.getCreateDeptSid());
if (StringUtils.isNotBlank(confirmation.getStaffDeptSid())) {
resultBean = sysOrganizationFeign.fetchBySid(confirmation.getStaffDeptSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {

Write Preview
Loading…
Cancel
Save