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

优化

master
God 2 years ago
parent
a3faeb2270
commit
2aaf2dcf51
13 changed files with 434 additions and 21 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. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  3. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  4. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFiling.java
  5. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
  6. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java
  7. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java
  8. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml
  9. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java
  10. 72
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
  11. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
  12. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  13. 333
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
View File

@ -524,4 +524,8 @@ public interface BaseVehicleFeign {
@PostMapping("/updateStateForReturnVeh")
public ResultBean updateStateForReturnVeh(@RequestParam("vehSid") String vehSid);
@ApiOperation("单独查询车辆信息")
@PostMapping("/fetchBySid")
@ResponseBody
ResultBean<BaseVehicle> fetchBySid(@RequestParam("vinSid") String vinSid);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
View File

@ -422,6 +422,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<BaseVehicle> fetchBySid(String vinSid) {
return null;
}
@Override
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
return null;

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
View File

@ -1494,6 +1494,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return baseVehicleService.updateStateForReturnVeh(vehSid);
}
@Override
public ResultBean<BaseVehicle> fetchBySid(String vinSid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vinSid);
return rb.success().setData(baseVehicle);
}
@Override
public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFiling.java
View File

@ -94,6 +94,8 @@ public class BusValcustFiling extends BaseEntity {
private String saleOrderSid;
@ApiModelProperty("业务sid")
private String busSid;
@ApiModelProperty("业务来源")
private String busSource;
@ApiModelProperty("组织机构全路径sid")
private String orgSidPath; // 组织机构全路径sid

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDto.java
View File

@ -87,6 +87,8 @@ public class BusValcustFilingDto implements Dto {
private String saleOrderSid;
@ApiModelProperty("业务sid")
private String busSid;
@ApiModelProperty("业务来源")
private String busSource;
@ApiModelProperty("组织机构全路径sid")
private String orgSidPath; // 组织机构全路径sid

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingFeign.java
View File

@ -106,4 +106,9 @@ public interface BusValcustFilingFeign {
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody BusValcustFilingTaskQuery query);
@ApiOperation("根据合同号和车架号查询")
@PostMapping("/selectByContractNoAndVinNo")
@ResponseBody
ResultBean<BusValcustFiling> selectByContractNoAndVinNo(@RequestParam("contractNo") String contractNo,@RequestParam("vinNo") String vinNo);
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.java
View File

@ -67,4 +67,6 @@ public interface BusValcustFilingMapper extends BaseMapper<BusValcustFiling> {
int updateFlowFiled(Map<String, Object> map);
String selectNum(String billNo);
BusValcustFiling selectByContractNoAndVinNo(@Param("contractNo") String contractNo,@Param("vinNo") String vinNo);
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingMapper.xml
View File

@ -57,4 +57,11 @@
order by billNo desc
limit 1
</select>
<select id="selectByContractNoAndVinNo" resultType="com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling">
SELECT *
FROM bus_valcust_filing bf
WHERE contractNo = #{contractNo}
AND vinNo LIKE concat(#{vinNo}, '%')
</select>
</mapper>

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingRest.java
View File

@ -139,4 +139,9 @@ public class BusValcustFilingRest implements BusValcustFilingFeign {
public ResultBean breakProcess(BusValcustFilingTaskQuery query) {
return busValcustFilingService.breakProcess(query);
}
@Override
public ResultBean<BusValcustFiling> selectByContractNoAndVinNo(String contractNo, String vinNo) {
return busValcustFilingService.selectByContractNoAndVinNo(contractNo,vinNo);
}
}

72
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
View File

@ -32,17 +32,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeQuery;
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingNodeVo;
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.BusValcustFilingTaskQuery;
import com.yxt.anrui.buscenter.api.busvalcustfiling.flowable.SubmitBusValcustFilingDto;
import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
@ -54,6 +58,10 @@ import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
@ -137,7 +145,13 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
@Autowired
private BaseTrailerFeign baseTrailerFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BusSalesOrderService busSalesOrderService;
@Autowired
private BusSalesOrderVehicleService busSalesOrderVehicleService;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
public PagerVo<BusValcustFilingVo> listPageVo(PagerQuery<BusValcustFilingQuery> pq) {
BusValcustFilingQuery query = pq.getParams();
@ -187,15 +201,15 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("bf.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getModelName())){
qw.like("bf.modelName",query.getModelName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
}
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("bf.modelName", query.getModelName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bf.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (bf.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
}
IPage<BusValcustFiling> page = PagerUtil.queryToPage(pq);
IPage<BusValcustFilingVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BusValcustFilingVo> p = PagerUtil.pageToVo(pagging, null);
@ -367,9 +381,33 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
if ("0".equals(busValcustFiling.getIsGdk())){//高开
}else {
if ("0".equals(busValcustFiling.getIsGdk())) {//高开
String[] vinSids = busValcustFiling.getVinSid().split(",");
for (String vinSid : vinSids) {
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
finUncollectedReceivablesDetailedDto.setCreateByName(busValcustFiling.getCreateByName());
finUncollectedReceivablesDetailedDto.setCreateBySid(busValcustFiling.getCreateBySid());
finUncollectedReceivablesDetailedDto.setContractNo(busValcustFiling.getContractNo());
BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(busValcustFiling.getSaleOrderSid());
finUncollectedReceivablesDetailedDto.setCustomerSid(busSalesOrder.getCustomerSid());
finUncollectedReceivablesDetailedDto.setCustomerName(busSalesOrder.getCustomerName());
BaseVehicle baseVehicle = baseVehicleFeign.fetchBySid(vinSid).getData();
finUncollectedReceivablesDetailedDto.setVIN(baseVehicle.getVinNo());
finUncollectedReceivablesDetailedDto.setCustomerPhone(busSalesOrder.getMobile());
finUncollectedReceivablesDetailedDto.setUseOrgSid(busValcustFiling.getUseOrgSid());
finUncollectedReceivablesDetailedDto.setReceivablesName("加装配置手续费");
finUncollectedReceivablesDetailedDto.setCurrentReceivableMoney(busValcustFiling.getSsMoney());
finUncollectedReceivablesDetailedDto.setReveivableMoney(busValcustFiling.getSsMoney());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busValcustFiling.getContractNo(), vinSid);
finUncollectedReceivablesDetailedDto.setOrgSidPath(busValcustFiling.getOrgSidPath());
finUncollectedReceivablesDetailedDto.setBusVinSid(busSalesOrderVehicle.getSid());
finUncollectedReceivablesDetailedDto.setPayTypeKey(busSalesOrder.getPayTypeKey());
finUncollectedReceivablesDetailedDto.setPayType(busSalesOrder.getPayType());
finUncollectedReceivablesDetailedDto.setUseOrgName(busValcustFiling.getUseOrgName());
finUncollectedReceivablesDetailedDto.setKxState("01");
finUncollectedReceivablesDetailedFeign.saveOrUpdate(finUncollectedReceivablesDetailedDto);
}
} else {
FinBillApplication finBillApplication = finBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleFeign.fetchVehBySid(busValcustFiling.getBusSid()).getData();
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerFeign.fetchByMainSid(busValcustFiling.getBusSid()).getData();
@ -394,10 +432,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyService.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null){
if (busArrearsCarryVehicleApplyVo == null) {
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
}else {
} else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
@ -632,4 +670,10 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean<BusValcustFiling> selectByContractNoAndVinNo(String contractNo, String vinNo) {
ResultBean rb = ResultBean.fireFail();
BusValcustFiling busValcustFiling = baseMapper.selectByContractNoAndVinNo(contractNo,vinNo);
return rb.success().setData(busValcustFiling);
}
}

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedDto.java
View File

@ -72,6 +72,16 @@ public class FinUncollectedReceivablesDetailedDto implements Dto {
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额")
private String currentReceivableMoney; // 当前应收金额
@ApiModelProperty("应收金额（不变）")
private String reveivableMoney;
private String busVinSid;
@ApiModelProperty("付款方式")
private String payTypeKey;
private String payType;
@ApiModelProperty("应收款项状态")
private String kxState;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("申请人组织路径")
private String orgSidPath;
}

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
View File

@ -794,6 +794,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
busValcustFilingDto.setMoney(money.abs().toString());
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid());
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSid("0");
busValcustFilingFeign.save(busValcustFilingDto);
}else {//不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {

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

@ -33,6 +33,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
@ -45,6 +47,8 @@ import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
@ -59,22 +63,37 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFiling;
import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService;
import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
import com.yxt.anrui.fin.biz.finfundscarriedforwardveh.FinFundsCarriedForwardVehService;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
@ -144,6 +163,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BaseTrailerFeign baseTrailerFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private BusDeliveredFeign busDeliveredFeign;
@ -167,6 +188,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private FinFundsCarriedForwardVehService finFundsCarriedForwardVehService;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private ReceivableBillService receivableBillService;
@Autowired
private BusValcustFilingFeign busValcustFilingFeign;
@Autowired
private FinBillApplicationService finBillApplicationService;
@Autowired
private FinBillVehicleService finBillVehicleService;
@Autowired
private FinBillTrailerService finBillTrailerService;
@Autowired
private FinVehicleInvoiceService finVehicleInvoiceService;
@Autowired
private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
@Autowired
private FinCompanyInvoicingService finCompanyInvoicingService;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -1601,6 +1638,112 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
baseMapper.updateById(confirmation);
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
//判断加装配置手续费推送应收单
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
if ("加装配置手续费".equals(finSelectedReceivablesDetailedVo.getReceivablesName())){
BusValcustFiling busValcustFiling = busValcustFilingFeign.selectByContractNoAndVinNo(finSelectedReceivablesDetailedVo.getContractNo(), finSelectedReceivablesDetailedVo.getVIN()).getData();
if (busValcustFiling.getBusSource().equals("0")){//单独开票
FinBillApplication finBillApplication = finBillApplicationService.fetchBySid(busValcustFiling.getBusSid());
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(finBillApplication.getSid());
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(finBillApplication.getSid());
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(finBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null){
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
}else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
if (finBillTrailerVos != null) {
for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
String gcVinNo = finBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(finBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finSelectedReceivablesDetailedVo.getContractNo()).getData();
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
}
}else {//出库开票申请
}
}
}
return rb.success().setMsg("款项确认成功");
}
@ -1662,6 +1805,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//推送全款订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "订金", "1");
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
//加装配置手续费(全款)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos3_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "加装配置手续费", "1");
finSelectedReceivablesDetailedVos3_1.removeAll(Collections.singleton(null));
//贷款推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "车款", "2");
finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null));
@ -1671,6 +1817,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//贷款推送车款(应收未收中为首付款的)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "首付款及费用", "2");
finSelectedReceivablesDetailedVos1_1_2.removeAll(Collections.singleton(null));
//加装配置手续费(贷款)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos3_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "加装配置手续费", "2");
finSelectedReceivablesDetailedVos3_2.removeAll(Collections.singleton(null));
int carSize = 0;
//全款推送车款
if (finSelectedReceivablesDetailedVos1.size() > 0) {
@ -1680,7 +1829,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = fullPaymentPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1, freceivebillentry, one, orgCode);
@ -1693,7 +1844,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = fullPaymentPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_1, freceivebillentry, one, orgCode);
@ -1707,11 +1860,28 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos2.size() == 1 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = fullPaymentPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2, freceivebillentry, one, orgCode);
}
//全款推送加装配置手续费
if (finSelectedReceivablesDetailedVos3_1.size() > 0) {
boolean one = false;
if (finSelectedReceivablesDetailedVos1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 1 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = fullInstaConfigFee(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos3_1, freceivebillentry, one, orgCode);
}
//担保贷款推送车款
if (finSelectedReceivablesDetailedVos1_1.size() > 0) {
@ -1721,7 +1891,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 1 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = loanPushCar(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1, freceivebillentry, one, orgCode);
@ -1734,7 +1906,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 1) {
finSelectedReceivablesDetailedVos1_1_2.size() == 1 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = loanPushCarFirst(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos1_1_2, freceivebillentry, one, orgCode);
@ -1747,11 +1921,28 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 1 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 0) {
one = true;
}
carSize = loanPushDeposit(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos2_1, freceivebillentry, one, orgCode);
}
//贷款推送加装配置手续费
if (finSelectedReceivablesDetailedVos3_2.size() > 0) {
boolean one = false;
if (finSelectedReceivablesDetailedVos1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2.size() == 0 &&
finSelectedReceivablesDetailedVos1_1.size() == 0 &&
finSelectedReceivablesDetailedVos2_1.size() == 0 &&
finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
finSelectedReceivablesDetailedVos3_1.size() == 0 &&
finSelectedReceivablesDetailedVos3_2.size() == 1) {
one = true;
}
carSize = loanInstaConfigFee(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos3_2, freceivebillentry, one, orgCode);
}
//简易订单-订金收取
if (finSelectedReceivablesDetailedVos1.isEmpty() &&
@ -1759,7 +1950,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailedVos1_1.isEmpty() &&
finSelectedReceivablesDetailedVos2_1.isEmpty() &&
finSelectedReceivablesDetailedVos1_1_1.isEmpty() &&
finSelectedReceivablesDetailedVos1_1_2.isEmpty() && confirmation.getPushMessgae() == 1) {
finSelectedReceivablesDetailedVos1_1_2.isEmpty() &&
finSelectedReceivablesDetailedVos3_1.isEmpty() &&
finSelectedReceivablesDetailedVos3_2.isEmpty() && confirmation.getPushMessgae() == 1) {
//先推送客户
AppBusDepositBuscenterDetailVo busDeposit = busDepositFeign.getDepositInfoDetails(confirmation.getBusSid()).getData();
BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), busDeposit.getPayName(), busDeposit.getPhone(), "", sid);
@ -2123,6 +2316,82 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return carSize;
}
//全款推送加装配置手续费
private int fullInstaConfigFee(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos3_1,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<FinSelectedReceivablesDetailedVo> voListv =
finSelectedReceivablesDetailedService.selectDetailsList(sid, "加装配置手续费");
finSelectedReceivablesDetailedVos3_1.removeAll(Collections.singleton(null));
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos3_1.size(); i++) {
FinSelectedReceivablesDetailedVo v = finSelectedReceivablesDetailedVos3_1.get(i);
//推送客户
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, "加装配置手续费", contractNo);
vinListVo.removeAll(Collections.singleton(null));
if (!vinListVo.isEmpty()) {
for (FinSelectedReceivablesDetailedVo vv : vinListVo) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if (vv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vv.getVIN().substring(vv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
}
//查询该合同编号的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, "加装配置手续费", contractNo);
if (vvVo != null) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvVo.getSumAll());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
}
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
if (one) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
carSize = carSize + 1;
arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
//担保贷款推送车款
public int loanPushCar(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill,
@ -2289,6 +2558,56 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return carSize;
}
//贷款推送加装配置手续费
private int loanInstaConfigFee(FinCollectionConfirmation confirmation,
ARReceivebill arReceivebill, int carSize,
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos3_2,
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry,
boolean one,
String orgCode) {
String sid = confirmation.getSid();
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos3_2.size(); i++) {
FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos3_2.get(i);
//推送客户
String customerNo = createCustomerQuery(2, vvvv, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
String uncollSid = "";
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
freceivebillentry.setFSETTLETYPEIDType("customerPayType");
//收款金额
freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
//登记日期
freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
if (vvvv.getVIN().length() >= 8) {
freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
}
//收款用途
freceivebillentry.setFPURPOSEIDKey("001");
freceivebillentry.setFPURPOSEIDType("cw_skyt");
freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
fEntityList.add(freceivebillentry);
uncollSid = vvvv.getReceivablesSid();
//项目类别key、value
arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
arReceivebill.setF_PAEZ_AssistantKey("006");
arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
if (one) {
arReceivebill.setFBillNo(confirmation.getBillNo());
} else {
//单据编号
carSize = carSize + 1;
arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
}
ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
}
return carSize;
}
public String getPrefix(String collSid, String name, String mobile) {
String customerNoPrefix = "";
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(collSid);

Write Preview
Loading…
Cancel
Save