|
|
|
@ -77,6 +77,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; |
|
|
|
import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService; |
|
|
|
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService; |
|
|
|
import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService; |
|
|
|
import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; |
|
|
|
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flow.FlowableFeign; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTask; |
|
|
|
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; |
|
|
|
@ -171,6 +173,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
@Autowired |
|
|
|
private CommonContractFeign commonContractFeign; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private CrmCustomerTempFeign crmCustomerTempFeign; |
|
|
|
|
|
|
|
/** |
|
|
|
* 构造查询条件 |
|
|
|
* |
|
|
|
@ -823,12 +828,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
|
|
|
|
private void modifyFlowState(String businessSid, String proDefId, String nodeState, |
|
|
|
String procInsId, |
|
|
|
String taskDefKey,String taskId) { |
|
|
|
String taskDefKey, String taskId) { |
|
|
|
baseMapper.modifyFlowState(businessSid, |
|
|
|
proDefId, |
|
|
|
nodeState, |
|
|
|
procInsId, |
|
|
|
taskDefKey,taskId); |
|
|
|
taskDefKey, taskId); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) { |
|
|
|
@ -962,7 +967,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
ProcDefEnum.SALESORDER.getProDefId(), |
|
|
|
nodeState, |
|
|
|
dto.getInstanceId(), |
|
|
|
taskDefKey,resultBean.getData().get(0).getId_()); |
|
|
|
taskDefKey, resultBean.getData().get(0).getId_()); |
|
|
|
/* Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("businessSid", dto.getBusinessSid()); |
|
|
|
if (inComingSourceRef.contains("start")) { |
|
|
|
@ -1095,11 +1100,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//销售订单类型“”或null 全部 “1” 待办理 “2”已办理
|
|
|
|
if (StringUtils.isNotBlank(query.getType())) { |
|
|
|
//待办理
|
|
|
|
if("1".equals(query.getType())){ |
|
|
|
if ("1".equals(query.getType())) { |
|
|
|
qw.isNull("bo.nodeState"); |
|
|
|
} |
|
|
|
//已办理
|
|
|
|
if("2".equals(query.getType())){ |
|
|
|
if ("2".equals(query.getType())) { |
|
|
|
qw.isNotNull("bo.nodeState"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1123,11 +1128,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw); |
|
|
|
for (AppBusSalesOrderVo record : pagging.getRecords()) { |
|
|
|
if(StringUtils.isNotBlank(record.getCustomerPhoto())){ |
|
|
|
record.setCustomerPhoto(fileUploadComponent.getUrlPrefix()+record.getCustomerPhoto()); |
|
|
|
if (StringUtils.isNotBlank(record.getCustomerImage())) { |
|
|
|
record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage()); |
|
|
|
} |
|
|
|
//根据销售订单sid查询是否有合同，有合同的话，查询合同是否审核。且需补交订金是否为0
|
|
|
|
String sid = record.getSid(); |
|
|
|
String sid = record.getSaleOrderSid(); |
|
|
|
ResultBean<CommonContractBuscenterVo> buscenterVoResultBean = commonContractFeign.selectByBusSid(sid); |
|
|
|
//合同是否已审核通过
|
|
|
|
boolean isTrue = false; |
|
|
|
@ -1158,20 +1163,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} else { |
|
|
|
record.setShowApplyBtn(false); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
//将已交订金转为string
|
|
|
|
deposit = depositBig.toString(); |
|
|
|
} |
|
|
|
record.setDeposit(deposit); |
|
|
|
//查询车型信息
|
|
|
|
/* AppModelInfo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid()); |
|
|
|
if (appModelInfo == null) { |
|
|
|
AppModelInfo modelInfo = new AppModelInfo(); |
|
|
|
record.setModelInfo(modelInfo); |
|
|
|
} else { |
|
|
|
AppModelInfoVo appModelInfo = baseMapper.selectModelInfoByOrderSid(record.getSaleOrderSid()); |
|
|
|
if (appModelInfo != null) { |
|
|
|
record.setModelInfo(appModelInfo); |
|
|
|
}*/ |
|
|
|
} |
|
|
|
//是否保险
|
|
|
|
String insuranceInfo = record.getInsuranceInfo(); |
|
|
|
if(StringUtils.isBlank(insuranceInfo)){ |
|
|
|
record.setInsuranceInfo("-"); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
@ -1206,51 +1212,72 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
* @param dto |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
public ResultBean<String> saveBillInfo(AppBusSalesOrderAllDto dto) { |
|
|
|
ResultBean<String> rb = ResultBean.fireFail(); |
|
|
|
if (StringUtils.isBlank(dto.getUserSid())) { |
|
|
|
return rb.fail().setMsg("用户sid不能为空"); |
|
|
|
return rb.setMsg("用户sid不能为空"); |
|
|
|
} |
|
|
|
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); |
|
|
|
if (StringUtils.isBlank(dto.getSaleOrderSid())) { //订单sid为空新增
|
|
|
|
BusSalesOrder busSalesOrder = new BusSalesOrder(); |
|
|
|
busSalesOrder.setCustomerName(dto.getCustomerName()); |
|
|
|
busSalesOrder.setMobile(dto.getCustomerMobile()); |
|
|
|
busSalesOrder.setPayType(dto.getPayValue()); |
|
|
|
busSalesOrder.setPayTypeKey(dto.getPayType()); |
|
|
|
busSalesOrder.setBillingType(dto.getInvoiceValue()); |
|
|
|
busSalesOrder.setBillingTypeKey(dto.getInvoiceType()); |
|
|
|
busSalesOrder.setStaffName(data.getStaffName()); |
|
|
|
busSalesOrder.setStaffSid(data.getStaffSid()); |
|
|
|
busSalesOrder.setOrgName(data.getOrgName()); |
|
|
|
busSalesOrder.setOrgSid(data.getOrgSid()); |
|
|
|
//根据客户sid查询客户信息
|
|
|
|
ResultBean<AppCrmCustomerTempInfoVo> crmCustomerTempInfoVoResultBean = crmCustomerTempFeign.getAppCustomerTempDetailsBySid(dto.getCustomerSid()); |
|
|
|
String sid = ""; |
|
|
|
if (crmCustomerTempInfoVoResultBean.getSuccess()) { |
|
|
|
AppCrmCustomerTempInfoVo customerTempInfoVo = crmCustomerTempInfoVoResultBean.getData(); |
|
|
|
//挂靠公司填写类型：1选择，0手写
|
|
|
|
String affiliatedType = dto.getAffiliatedType(); |
|
|
|
if (affiliatedType.equals("1")) { |
|
|
|
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid()); |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose()); |
|
|
|
} else if (affiliatedType.equals("0")) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
} |
|
|
|
save(busSalesOrder); |
|
|
|
} else { //订单sid不为空修改
|
|
|
|
BusSalesOrder busSalesOrder = new BusSalesOrder(); |
|
|
|
busSalesOrder.setCustomerName(dto.getCustomerName()); |
|
|
|
busSalesOrder.setMobile(dto.getCustomerMobile()); |
|
|
|
busSalesOrder.setPayType(dto.getPayValue()); |
|
|
|
busSalesOrder.setPayTypeKey(dto.getPayType()); |
|
|
|
busSalesOrder.setBillingType(dto.getInvoiceValue()); |
|
|
|
|
|
|
|
busSalesOrder.setBillingTypeKey(dto.getInvoiceType()); |
|
|
|
String affiliatedType = dto.getAffiliatedType(); |
|
|
|
if (affiliatedType.equals("1")) { |
|
|
|
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid()); |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose()); |
|
|
|
} else if (affiliatedType.equals("2")) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
if (StringUtils.isBlank(dto.getSid())) { |
|
|
|
BusSalesOrder busSalesOrder = new BusSalesOrder(); |
|
|
|
BeanUtil.copyProperties(dto, busSalesOrder, "sid"); |
|
|
|
busSalesOrder.setStaffName(data.getStaffName()); |
|
|
|
busSalesOrder.setStaffSid(data.getStaffSid()); |
|
|
|
busSalesOrder.setOrgName(data.getOrgName()); |
|
|
|
busSalesOrder.setOrgSid(data.getOrgSid()); |
|
|
|
busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto()); |
|
|
|
busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType()); |
|
|
|
busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey()); |
|
|
|
busSalesOrder.setBillNo(generateBillNo(dto.getUserSid()).get("billNo_Num")); |
|
|
|
if ("0".equals(affiliatedType)) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
} |
|
|
|
if ("1".equals(affiliatedType)) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid()); |
|
|
|
} |
|
|
|
boolean isSave = save(busSalesOrder); |
|
|
|
if (!isSave) { |
|
|
|
return rb.setMsg("保存失败"); |
|
|
|
} |
|
|
|
sid = busSalesOrder.getSid(); |
|
|
|
} else { |
|
|
|
BusSalesOrder busSalesOrder = fetchBySid(dto.getSid()); |
|
|
|
if (busSalesOrder == null) { |
|
|
|
return rb.setMsg("该销售订单不存在"); |
|
|
|
} |
|
|
|
BeanUtil.copyProperties(dto, busSalesOrder, "sid"); |
|
|
|
if ("0".equals(affiliatedType)) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
} |
|
|
|
if ("1".equals(affiliatedType)) { |
|
|
|
busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite()); |
|
|
|
busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid()); |
|
|
|
} |
|
|
|
busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto()); |
|
|
|
busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType()); |
|
|
|
busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey()); |
|
|
|
boolean isUpdate = updateById(busSalesOrder); |
|
|
|
if (!isUpdate) { |
|
|
|
return rb.setMsg("修改失败"); |
|
|
|
} |
|
|
|
if ("0".equals(affiliatedType)) { |
|
|
|
baseMapper.updateCompanySidBySid(dto.getSid()); |
|
|
|
} |
|
|
|
sid = busSalesOrder.getSid(); |
|
|
|
} |
|
|
|
updateById(busSalesOrder); |
|
|
|
} |
|
|
|
return rb.success(); |
|
|
|
if (StringUtils.isBlank(sid)) { |
|
|
|
return rb.setMsg("失败！"); |
|
|
|
} |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
|
|
|
|
public AppBusSaleOrderInitModelInfoVo getInitModelInfo(String saleOrderSid, String customerSid, String userSid) { |
|
|
|
|
