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
76b9cb0240 c89444d91f
commit
099cbecdf1
8 changed files with 208 additions and 48 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. 89
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
  2. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  3. 81
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  4. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  5. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
  6. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
  7. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java
  8. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

89
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml
View File

@ -280,27 +280,71 @@
</select>
<select id="selectListsVoNew" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
select
select a.* from(select
bo.contractNo,
bo.customerName as name,
bo.payType paymentMethod,
RIGHT(bv.linkNo, 8) as vinNo,
bv.linkSid vinSid,
bv.sid busVinSid
from (select busSid from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = '1')) as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND ( finState = '1' OR carryVehicleState = 1 )) AND bbv.vehicleState != '0002'
</where>
order by bo.contractNo desc
order by bo.contractNo desc,bv.id desc) a
</select>
<select id="getRetrievalNotListNew" resultMap="listMaps">
select
select a.* from (SELECT
bo.contractNo,
bo.customerName AS name,
bo.payType paymentMethod,
bbv.vehicleState
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
<if test="name != null and name != ''">
and concat(IFNULL(bo.contractNo
, '')
, ifnull(bo.`customerName`
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND ( finState = '1' OR carryVehicleState = 1 ))
AND bbv.vehicleState != '0002'
</where>
GROUP BY
bo.contractNo
ORDER BY
bo.contractNo DESC)a
<!--select
bo.contractNo,
bo.customerName as name,
bo.payType paymentMethod
@ -311,9 +355,18 @@
<where>
${ew.sqlSegment}
and length(bv.linkSid) > 0
<if test="name != null and name != ''">
and concat(IFNULL(bo.contractNo
, '')
, ifnull(bo.`customerName`
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
and bbv.vehicleState != '0002'
</where>
group by contractNo
order by bo.contractNo desc
order by bo.contractNo desc-->
</select>
<resultMap id="listMaps" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
@ -325,10 +378,26 @@
</collection>
</resultMap>
<select id="vinLists" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
<!-- select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
from (select busSid from anrui_base.base_vehicle_state where busState = '401' and (finState = '1' or carryVehicleState = 1)) as bs
left join bus_sales_order_vehicle bv on bs.busSid = bv.sid
left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo}
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo} and bbv.vehicleState != '0002'-->
select bv.linkSid vinSid,bv.sid busVinSid,RIGHT(bv.linkNo, 8) as vin
FROM
bus_sales_order bo
LEFT JOIN bus_sales_order_vehicle bv ON bo.sid = bv.salesOrderSid
LEFT JOIN anrui_base.base_vehicle bbv ON bbv.sid = bv.linkSid
LEFT JOIN anrui_base.base_vehicle_state bs ON bs.busSid = bv.sid
where length(bv.linkSid)>0 and bo.contractNo = #{contractNo} and bbv.vehicleState != '0002'
AND bv.sid IN (
SELECT
busSid
FROM
anrui_base.base_vehicle_state
WHERE
busState = '401'
AND ( finState = '1' OR carryVehicleState = 1 ))
</select>
</mapper>

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -1648,6 +1648,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
finConfirmDto.setStaffUserSid(busMainDeposit.getCreateBySid());
finConfirmDto.setStaffDeptName(finConfirmDto.getCreateDept());
finConfirmDto.setStaffDeptSid(finConfirmDto.getCreateDeptSid());
finConfirmDto.setOrgSidPath(busMainDeposit.getOrgSidPath());
finConfirmDto.setUseOrgName(busMainDeposit.getOrgName());
finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
}
if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

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

@ -244,8 +244,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
private BusSalesOrderDepositService busSalesOrderDepositService;
@Autowired
private BusDepositFictitiousService busDepositFictitiousService;
/* @Autowired
private BusPurchaseChannelService busPurchaseChannelService;*/
/* @Autowired
private BusPurchaseChannelService busPurchaseChannelService;*/
@Autowired
private ScmPurchaseChannelFeign scmPurchaseChannelFeign;
@Autowired
@ -1315,7 +1315,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
List<String> initBigDecimalOneList = new ArrayList<>();
//是否是现车//ToDo:促销政策
if ("1".equals(busSalesOrder.getType())) {
if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
@ -2407,9 +2407,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//查询是否有车辆信息:1现车、2采购订单、3排产。需要对应apifox中对应的类型：0现车、1采购订单、2排产
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(busSalesOrder.getType())) {
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())) {
orderInfo.setNowCarUnknownVinNum(busSalesOrder.getNowCarUnknownVinNum());
}else{
} else {
//类型为现车，查询该销售订单的现车车辆信息
List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(saleOrderSid);
nowCarList.removeAll(Collections.singleton(null));
@ -3478,7 +3478,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
String topMessage = "";
if(busSalesOrderMakeup != null){
if (busSalesOrderMakeup != null) {
//颜色
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
topMessage = topMessage + busSalesOrderMakeup.getColor();
@ -5098,6 +5098,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
BusSalesOrder busSalesOrder = fetchBySid(appOrderDetailsVo.getBusSalesOrderSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -5155,11 +5160,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
if(StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isBlank(busSalesOrder.getNowCarUnknownVinNum())) {
//更新已选择的车架号的状态为销售订单锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
list.removeAll(Collections.singleton(null));
if(!list.isEmpty()){
if (!list.isEmpty()) {
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
@ -5232,24 +5237,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//-----------------推送车款款项结束
//推送采购渠道待选择
/* ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
scmPurchaseChannelFeign.save(scmPurchaseChannelDto);*/
if ("3".equals(busSalesOrder.getType())) {
ScmPurchaseChannelDto scmPurchaseChannelDto = new ScmPurchaseChannelDto();
scmPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
scmPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
scmPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
scmPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
scmPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
scmPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
scmPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
scmPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
scmPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
scmPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
scmPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
scmPurchaseChannelFeign.save(scmPurchaseChannelDto);
}
}
return rb.success().setData(resultBean.getData());
} else {
@ -5308,6 +5316,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -5358,6 +5371,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -5408,6 +5426,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setPurchaseSystemName(vo.getPurchaseSystemName());
unCollectionDto.setPurchaseSystemSid(vo.getPurchaseSystemSid());
unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
unCollectionDto.setStaffUserSid(busSalesOrder.getCreateBySid());
unCollectionDto.setStaffName(busSalesOrder.getStaffName());
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -6597,12 +6620,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
newSalesOrder.setContractNo(null);
newSalesOrder.setCreateTime(createTime);
newSalesOrder.setModifyTime(modifyTime);
if(StringUtils.isNotBlank(customerSid)){
if (StringUtils.isNotBlank(customerSid)) {
newSalesOrder.setCustomerSid(customerSid);
newSalesOrder.setCustomerName(customerName);
newSalesOrder.setMobile(customerMobile);
ResultBean<CrmCustomerTempVo> crmCustomerTempVoResultBean = crmCustomerTempFeign.fetchSid(customerSid);
if(crmCustomerTempVoResultBean.getData() != null){
if (crmCustomerTempVoResultBean.getData() != null) {
newSalesOrder.setCustomerClass(crmCustomerTempVoResultBean.getData().getCustomerClass());
newSalesOrder.setCustomerClassKey(crmCustomerTempVoResultBean.getData().getCustomerClassKey());
}
@ -6868,7 +6891,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.fetchBySid(baseVehicleTempstate.getBusSid());
//根据合同和车辆查询该合同下是否还存在未提车的数据
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(), baseVehicleTempstate.getVehSid());
if(busSalesOrderVehicle != null){
if (busSalesOrderVehicle != null) {
stringList.add(busSalesOrderVehicle.getSid());
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
View File

@ -138,4 +138,7 @@ public class FinCollectionConfirmation extends BaseEntity {
private String downNum;
@ApiModelProperty("组织全路径")
private String orgSidPath;
@ApiModelProperty("分公司名称")
private String useOrgName;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
View File

@ -101,6 +101,9 @@ public class FinConfirmDto implements Dto {
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
private String orgSidPath;
private String useOrgName;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
View File

@ -100,4 +100,10 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
@ApiModelProperty("申请人组织路径")
private String orgSidPath;
private String staffName;
private String staffUserSid;
private String staffDeptName;
private String staffDeptSid;
private String useOrgName;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java
View File

@ -66,4 +66,10 @@ public class UnCollectionDto implements Dto {
@ApiModelProperty("申请人组织路径")
private String orgSidPath;
private String staffName;
private String staffUserSid;
private String staffDeptName;
private String staffDeptSid;
private String useOrgName;
}

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

@ -408,23 +408,44 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("认款选择的数据存在问题，请检查是否重复");
}
}
//根据用户sid查询分公司sid
String useOrgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
}
//对收款申请进行赋值操作
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
if (StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())) {
//收款
finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
String orgPath = dto.getOrgPath();
finCollectionConfirmation.setOrgSidPath(orgPath);
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if(sysOrganizationVoResultBean.getData() != null){
finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
}else{
//代收款
String orgPath = dto.getOrgPath();
finCollectionConfirmation.setOrgSidPath(orgPath);
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
if(sysOrganizationVoResultBean.getData() != null){
finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
List<String> orgList = Arrays.asList(orgPath.split("/"));
orgList.set(orgList.size()-1,dto.getStaffDeptSid());
finCollectionConfirmation.setOrgSidPath(String.join("/",orgList));
}
sid = finCollectionConfirmation.getSid();
//根据用户sid查询分公司sid
String useOrgSid = "";
if (StringUtils.isNotBlank(dto.getOrgPath())) {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
} else {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
}
finCollectionConfirmation.setCreateBySid(dto.getUserSid());
finCollectionConfirmation.setUseOrgSid(useOrgSid);
//附件保存:打款凭证附件
@ -476,10 +497,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//认款日期默认为当天的日期
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
// finSelectedReceivablesDetailed.setBalance(v.getSubscriptionMoney());
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
finSelectedReceivablesDetailed.setStaffName(finUncollectedReceivablesDetailed.getStaffName());
finSelectedReceivablesDetailed.setStaffUserSid(finUncollectedReceivablesDetailed.getStaffUserSid());
finSelectedReceivablesDetailed.setStaffDeptSid(finUncollectedReceivablesDetailed.getStaffDeptSid());
finSelectedReceivablesDetailed.setStaffDeptName(finUncollectedReceivablesDetailed.getStaffDeptName());
finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath());
finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
if (v.getSubscribedOf() == 0) {
//应收未收减去相应的认款
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
@ -779,6 +808,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finCollectionConfirmation.setStaffUserSid(dto.getUserSid());
finCollectionConfirmation.setStaffDeptSid(createDeptSid);
finCollectionConfirmation.setStaffDeptName(deptName);
String orgPath = dto.getOrgPath();
finCollectionConfirmation.setOrgSidPath(orgPath);
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(finCollectionConfirmation.getUseOrgSid());
if(sysOrganizationVoResultBean.getData() != null){
finCollectionConfirmation.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
if ("03".equals(dto.getCollectionTypeKey()) || "05".equals(dto.getCollectionTypeKey())) {
if (StringUtils.isBlank(dto.getCollectionBankNum())) {
return rb.setMsg("收款银行账号不能为空");
@ -996,9 +1031,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setCustomerSid(paymentDetail.getCustomerSid());
finSelectedReceivablesDetailed.setSubscribedOf(paymentDetail.getSubscribedOf());
// finSelectedReceivablesDetailed.setBalance(paymentDetail.getConfirmMoney().toString());
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
finSelectedReceivablesDetailed.setStaffName(finUncollectedReceivablesDetailed.getStaffName());
finSelectedReceivablesDetailed.setStaffUserSid(finUncollectedReceivablesDetailed.getStaffUserSid());
finSelectedReceivablesDetailed.setStaffDeptSid(finUncollectedReceivablesDetailed.getStaffDeptSid());
finSelectedReceivablesDetailed.setStaffDeptName(finUncollectedReceivablesDetailed.getStaffDeptName());
finSelectedReceivablesDetailed.setOrgSidPath(finCollectionConfirmation.getOrgSidPath());
finSelectedReceivablesDetailed.setUseOrgName(finCollectionConfirmation.getUseOrgName());
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
if (paymentDetail.getSubscribedOf() == 0) {
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
BigDecimal currentReceivableMoney = finUncollectedReceivablesDetailed.getCurrentReceivableMoney().subtract(finSelectedReceivablesDetailed.getSubscriptionMoney());
finUncollectedReceivablesDetailed.setCurrentReceivableMoney(currentReceivableMoney);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
@ -2591,6 +2633,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setSubscriptionDate(DateUtil.today());
finSelectedReceivablesDetailed.setPurchaseSystemSid(confirmation.getPurchaseSystemSid());
finSelectedReceivablesDetailed.setPurchaseSystemName(confirmation.getPurchaseSystemName());
finSelectedReceivablesDetailed.setStaffName(confirmation.getStaffName());
finSelectedReceivablesDetailed.setStaffUserSid(confirmation.getStaffUserSid());
finSelectedReceivablesDetailed.setStaffDeptSid(confirmation.getStaffDeptSid());
finSelectedReceivablesDetailed.setStaffDeptName(confirmation.getStaffDeptName());
finSelectedReceivablesDetailed.setOrgSidPath(confirmation.getOrgSidPath());
finSelectedReceivablesDetailed.setUseOrgName(confirmation.getUseOrgName());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
//添加进附件表

Write Preview
Loading…
Cancel
Save