|
|
|
@ -119,6 +119,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; |
|
|
|
import com.yxt.anrui.crm.api.crmvehicledemand.CrmOrderVo; |
|
|
|
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicleDemandOrderVo; |
|
|
|
import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; |
|
|
|
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.UnCollectionDto; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
@ -1655,8 +1656,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto()); |
|
|
|
busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType()); |
|
|
|
busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey()); |
|
|
|
String billNo = getApplyCode(dto.getUserSid()); |
|
|
|
busSalesOrder.setBillNo(billNo); |
|
|
|
|
|
|
|
busSalesOrder.setCreateDate(new Date()); |
|
|
|
if ("0".equals(affiliatedType)) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
@ -1689,6 +1689,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
busSalesOrder.setOrgSid(orgSid); |
|
|
|
busSalesOrder.setOrgSidPath(orgSidPath); |
|
|
|
busSalesOrder.setUseOrgSid(useOrgSid); |
|
|
|
String billNo = getApplyCode(useOrgSid); |
|
|
|
busSalesOrder.setBillNo(billNo); |
|
|
|
boolean isSave = save(busSalesOrder); |
|
|
|
if (!isSave) { |
|
|
|
return rb.setMsg("保存失败"); |
|
|
|
@ -1753,10 +1755,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
|
|
|
|
public String getApplyCode(String userSid) { |
|
|
|
public String getApplyCode(String orgSid) { |
|
|
|
//获取分公司sid
|
|
|
|
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); |
|
|
|
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); |
|
|
|
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid); |
|
|
|
String orgCode = resultBean1.getData().getOrgCode(); |
|
|
|
BillNo b = new BillNo(); |
|
|
|
b.setOrgCode(orgCode); |
|
|
|
@ -3270,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(userSid,modelSid).getData(); |
|
|
|
String finalContractNo = commonContractFeign.selectContractNo(appOrderDetailsVo.getUseOrgSid(),modelSid).getData(); |
|
|
|
//甲方
|
|
|
|
String createOrgName = appOrderDetailsVo.getSalesOrg(); |
|
|
|
//乙方
|
|
|
|
@ -3338,7 +3339,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey()); |
|
|
|
commonContractFeign.saveContract(commonContract); |
|
|
|
baseMapper.updateContractNoBySid(commonContract.getContractNo(),sid); |
|
|
|
saveFinSelect(appOrderDetailsVo,commonContract,userSid); |
|
|
|
ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo()); |
|
|
|
List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetailedList = listResultBean.getData(); |
|
|
|
if(finUncollectedReceivablesDetailedList.size() == 0){ |
|
|
|
saveFinSelect(appOrderDetailsVo,commonContract,userSid); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public void saveFinSelect(AppOrderDetailsVo appOrderDetailsVo,CommonContract commonContract,String userSid){ |
|
|
|
@ -3353,7 +3359,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//单台成交价
|
|
|
|
String transactionPrice = priceInfo.getSingleFinalPrice(); |
|
|
|
//单台成交价与单台订金相等
|
|
|
|
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
|
|
|
|
/* 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++) { |
|
|
|
@ -3386,7 +3392,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid()); |
|
|
|
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto); |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//添加推送至款项确认的应收未收明细中
|
|
|
|
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos(); |
|
|
|
//更新销售订单的临时号
|
|
|
|
@ -3499,6 +3505,55 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
busSalesOrderVehicleService.insert(busSalesOrderVehicle); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
//推送款项车款=====================================
|
|
|
|
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); |
|
|
|
} |
|
|
|
} |
|
|
|
//-----------------推送车款款项结束
|
|
|
|
//推送采购渠道待选择
|
|
|
|
BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto(); |
|
|
|
busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid()); |
|
|
|
@ -4028,12 +4083,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
updatePurchaseSystem(purchaseSystemName, purchaseSystemSid, salesOrderSid); |
|
|
|
} |
|
|
|
//销售订单在销售支持部经理审核后，自动生成应收，此时也可以生成合同，生成合同的同时生成合同审核待办。
|
|
|
|
//查询应收是否已生成
|
|
|
|
if("Activity_10w0sy1".equals(bv.getTaskDefKey())){ |
|
|
|
//保存合同
|
|
|
|
OrderContractQuery orderContractQuery = new OrderContractQuery(); |
|
|
|
orderContractQuery.setSid(bv.getBusinessSid()); |
|
|
|
orderContractQuery.setUserSid(busSalesOrder.getCreateBySid()); |
|
|
|
saveContract(orderContractQuery); |
|
|
|
if(StringUtils.isBlank(busSalesOrder.getContractNo())){ |
|
|
|
saveContract(orderContractQuery); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
return rb.setMsg(resultBean.getMsg()); |
|
|
|
|
God
2 years ago