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

Merge remote-tracking branch 'origin/master'

master
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. 64
      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

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

@ -3497,14 +3497,7 @@ 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());
@ -3512,6 +3505,38 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
saveContract(orderContractQuery);
}
//推送车款
createCarFin(vo, busSalesOrder);
//-----------------推送车款款项结束
//推送采购渠道待选择
BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
busPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
busPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
busPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
busPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
busPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
busPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
busPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
busPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
busPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
busPurchaseChannelService.saveOrUpdateDto(busPurchaseChannelDto);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public void createCarFin(AppOrderDetailsVo vo, BusSalesOrder busSalesOrder) {
//推送款项车款=====================================
AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
AppOrderPriceInfoVo priceInfo = vo.getPriceInfo();
@ -3560,31 +3585,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
//-----------------推送车款款项结束
//推送采购渠道待选择
BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
busPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
busPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
busPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
busPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
busPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
busPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
busPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
busPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
busPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
busPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
busPurchaseChannelService.saveOrUpdateDto(busPurchaseChannelDto);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}

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