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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 2 years ago
parent
436f9d2418 370045443d
commit
298ec13249
28 changed files with 715 additions and 596 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. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  2. 37
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  3. 20
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
  4. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java
  5. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java
  6. 30
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailed.java
  7. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  8. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  9. 18
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/StateQuery.java
  10. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/UnCollectionDto.java
  11. 522
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  12. 46
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  13. 32
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  14. 57
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  15. 98
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  16. 11
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  17. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  18. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  19. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  20. 2
      anrui-fin/anrui-fin-biz/src/main/resources/application-pro.yml
  21. 66
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java
  22. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java
  23. 34
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/CompleteHomeAppealDto.java
  24. 17
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/HomeAppealQuery.java
  25. 42
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/HomeAppealTaskQuery.java
  26. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/SubmitHomeAppealApplyDto.java
  27. 34
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java
  28. 98
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
View File

@ -104,8 +104,8 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
}else{
if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
//销售订单办理通过后更新业务阶段为出库开票、小状态为待出库，款项状态为0
baseVehicleState.setBusSid(dto.getBusSid());
baseVehicleState.setFinState("0");
baseVehicleState.setCarryVehicleState("0");
baseVehicleState.setCarryInvoiceState("0");
@ -115,10 +115,11 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
baseVehicleState.setSaleOrderSid(busSalesOrder.getSid());
baseMapper.insert(baseVehicleState);
}else if (BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey().equals(operateType)) {
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
baseVehicleState.setBusSid(dto.getBusSid());
//认款办理确认以及结转审核通过的更新款项状态为1 已交清，否则为0
baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
baseVehicleState.setCarryVehicleState("0");
@ -129,10 +130,11 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
baseVehicleState.setSaleOrderSid(busSalesOrder.getSid());
baseMapper.insert(baseVehicleState);
}else if(BaseVehicleStateEnum.OperateTypeEnum.QKTCTJ.getTypeKey().equals(operateType)){
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
baseVehicleState.setBusSid(dto.getBusSid());
//欠款提车提交后，将提车状态修改为1,0为未提交过，1为审核通过，2为审核中
baseVehicleState.setCarryVehicleState("2");
baseVehicleState.setFinState("0");
@ -142,10 +144,11 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
BusSalesOrder busSalesOrder = baseMapper.selevtByBusSid(baseVehicleState.getBusSid());
baseVehicleState.setSaleTypeKey(busSalesOrder.getPayTypeKey());
baseVehicleState.setFinSourceKey(busSalesOrder.getFinancePlan());
baseVehicleState.setSaleOrderSid(busSalesOrder.getSid());
baseMapper.insert(baseVehicleState);
}else if(BaseVehicleStateEnum.OperateTypeEnum.TC.getTypeKey().equals(operateType)){
baseVehicleState = new BaseVehicleState();
BeanUtil.copyProperties(dto, baseVehicleState, "sid");
baseVehicleState.setBusSid(dto.getBusSid());
//如果为终止或作废，则更新小状态为业务终止602
baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.YWJS_STATE_2.getStateKey());
baseVehicleState.setRemarks("退车");

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

@ -160,6 +160,7 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
@ -4881,7 +4882,34 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
baseVehicleStateDto.setSaleOrderSid(finalBusSalesOrderOne.getSid());
baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
// baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
if("2".equals(finalBusSalesOrderOne.getPayTypeKey())){//贷款
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrderOne.getSid()).getData();
if(loanSolutions != null){
if(StringUtils.isBlank(loanSolutions.getTypeKey())){
baseVehicleStateDto.setFinSourceKey("4");
}else{
baseVehicleStateDto.setFinSourceKey("3");
}
}
}else{
if("2".equals(finalBusSalesOrderOne.getFinancePlan())){
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrderOne.getSid()).getData();
if(loanSolutions != null){
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())) {
if("02".equals(loanSolutions.getTypeKey())){
baseVehicleStateDto.setFinSourceKey("2");
}else{
baseVehicleStateDto.setFinSourceKey("3");
}
}
}
}else{
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
}
}
baseVehicleStateDto.setBusSid(v.getSid());
dtoList.add(baseVehicleStateDto);
});
@ -5167,6 +5195,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -5387,7 +5416,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
String contractSid = baseMapper.selectBySid(busSalesOrder.getSid());
//单台成交价与单台订金相等
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
for (int i = 0; i < vinList.size(); i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
@ -5421,6 +5450,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
unCollectionDto.setOtherReceivableMoney(new BigDecimal(solutionsDetailsVo.getDiscountCar()));
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -5476,6 +5507,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}
@ -5531,6 +5563,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
unCollectionDto.setStaffDeptName(busSalesOrder.getOrgName());
unCollectionDto.setStaffDeptSid(busSalesOrder.getOrgSid());
unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
unCollectionDto.setKxState("01");
finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
}
}

20
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java
View File

@ -66,6 +66,7 @@ import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivabl
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowFeign;
@ -586,7 +587,6 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
//------------------------修改车辆持久状态--------------------------
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectOneByVehSidAndOrderSid(vehSid, orderSid);
vehicleList.add(busSalesOrderVehicle);
//------------------------修改车辆持久状态--------------------------
}
//------------------------修改车辆持久状态--------------------------
vehicleList.removeAll(Collections.singleton(null));
@ -594,12 +594,6 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
vehicleList.stream().forEach(v -> {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.TC.getTypeKey());
if (StringUtils.isNotBlank(v.getLinkSid())) {
baseVehicleStateDto.setVinSid(v.getLinkSid());
baseVehicleStateDto.setVinNo(v.getLinkNo());
}
baseVehicleStateDto.setSaleTypeKey(finalBusSalesOrderOne.getPayTypeKey());
baseVehicleStateDto.setFinSourceKey(finalBusSalesOrderOne.getFinancePlan());
baseVehicleStateDto.setBusSid(v.getSid());
dtoList.add(baseVehicleStateDto);
});
@ -623,7 +617,17 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
busSalesOrderService.updateById(salesOrder);
}
}
//------------------------修改车辆持久状态--------------------------
//-------修改应收未收款项表中的款项状态为02作废------------
StateQuery stateQuery = new StateQuery();
List<String> busVinSidListState = new ArrayList<>();
if (!vehicleList.isEmpty()) {
vehicleList.stream().forEach(v -> {
busVinSidListState.add(v.getSid());
});
stateQuery.setKxState("02");
stateQuery.setBusVinSid(busVinSidListState);
ResultBean updateStateResultBean = finUncollectedReceivablesDetailedFeign.updateKxState(stateQuery);
}
}
return rb.success().setData(resultBean.getData());
} else {

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/FinFundsCarriedForwardApplyVo.java
View File

@ -79,7 +79,7 @@ public class FinFundsCarriedForwardApplyVo implements Vo {
@ApiModelProperty("pdf路径")
private String downloadUrl;
@ApiModelProperty("是否可以修改")
private Boolean showUpdateBtn;
private Boolean showUpdateBtn = false;
@ApiModelProperty("是否可以下载")
private Boolean showDownloadBtn;
private Boolean showDownloadBtn = false;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finfundscarriedforwardapply/TzDto.java
View File

@ -12,7 +12,7 @@ public class TzDto {
@ApiModelProperty("调账类型")
private String tzType;
@ApiModelProperty("业务sud")
@ApiModelProperty("业务sid")
private String busSid;
@ApiModelProperty("合同编号")
private String conNo;
@ -25,7 +25,7 @@ public class TzDto {
@ApiModelProperty("物料编码")
private String vinNo;
@ApiModelProperty("调出金额")
private Integer dcje = 0;
private Double dcje = 0.00;
@ApiModelProperty("调入金额")
private Integer drje = 0;
private Double drje = 0.00;
}

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

@ -53,34 +53,34 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口")
@ApiModelProperty("创建人接口")
private String createByName; // 创建人接口
@ApiModelProperty("合同sid")
@ApiModelProperty("合同sid")
private String contractSid; // 合同sid
@ApiModelProperty("合同编号")
@ApiModelProperty("合同编号")
private String contractNo; // 合同编号
@ApiModelProperty("客户sid")
@ApiModelProperty("客户sid")
private String customerSid; // 客户sid
@ApiModelProperty("客户名称")
@ApiModelProperty("客户名称")
private String customerName; // 客户名称
@ApiModelProperty("车架号")
@ApiModelProperty("车架号")
private String VIN; // 车架号
@ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("联系电话")
@ApiModelProperty("联系电话")
private String customerPhone; // 联系电话
@ApiModelProperty("应收项目名称")
@ApiModelProperty("应收项目名称")
private String receivablesName; // 应收项目名称
@ApiModelProperty("当前应收金额")
@ApiModelProperty("当前应收金额")
private BigDecimal currentReceivableMoney; // 当前应收金额
@ApiModelProperty("应收金额（不变）")
@ -100,10 +100,18 @@ public class FinUncollectedReceivablesDetailed extends BaseEntity {
@ApiModelProperty("申请人组织路径")
private String orgSidPath;
@ApiModelProperty("销售专员")
private String staffName;
@ApiModelProperty("销售专员用户sid")
private String staffUserSid;
@ApiModelProperty("销售专员部门")
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("应收款项状态")
private String kxState;
@ApiModelProperty("其他应收金额：即贴息抵车款")
private BigDecimal otherReceivableMoney;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
View File

@ -123,4 +123,8 @@ public interface FinUncollectedReceivablesDetailedFeign {
@ApiOperation("根据销售订单车辆sid查询应收已收sid")
@GetMapping("/fetchYsSidByOrderVehSid")
ResultBean<List<String>> fetchYsSidByOrderVehSid(@RequestParam("sid") String sid);
@ApiOperation("应收款项状态修改")
@PostMapping("/updateKxState")
ResultBean updateKxState(@RequestBody StateQuery stateQuery);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
View File

@ -136,4 +136,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
return null;
}
@Override
public ResultBean updateKxState(StateQuery stateQuery) {
return null;
}
}

18
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/StateQuery.java
View File

@ -0,0 +1,18 @@
package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2023/8/18
**/
@Data
public class StateQuery {
private List<String> busVinSid;
private String kxState;
}

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

@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Author dimengzhe
* @Date 2022/11/2 15:11
@ -72,4 +74,9 @@ public class UnCollectionDto implements Dto {
private String staffDeptSid;
private String useOrgName;
@ApiModelProperty("应收款项状态")
private String kxState;
@ApiModelProperty("其他应收金额：即贴息抵车款")
private BigDecimal otherReceivableMoney;
}

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

@ -1073,7 +1073,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param pagerQuery
* @return
*/
public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList111(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
/* public IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList111(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
AppFinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
String orgPath = pagerQuery.getParams().getOrgPath();
@ -1186,7 +1186,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
page1.setCurrent(pagerQuery.getCurrent());
page1.setSize(pagerQuery.getSize());
return page1;
}
}*/
/**
@ -1315,14 +1315,24 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
* @param userSid
* @return
*/
public ResultBean cashierConfirmOld(String sid, String userSid) {
public ResultBean cashierConfirm(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
return rb.setMsg("该申请不存在");
}
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
//推送收款单
if ("3".equals(confirmation.getAuditState())) {
return rb.setMsg("该申请已审核通过，不允许重复操作");
}
if ("2".equals(confirmation.getAuditState())) {
return rb.setMsg("该申请已驳回，不允许确认");
}
if ("4".equals(confirmation.getAuditState())) {
return rb.setMsg("该申请已撤回，不允许确认");
}
confirmation.setAuditState(3);
baseMapper.updateById(confirmation);
/* //推送收款单
ARReceivebill arReceivebill = new ARReceivebill();
//业务日期
arReceivebill.setFDATE(DateUtil.today());
@ -1360,22 +1370,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//推送全款车款
//根据合同编号分组-车款-待审核-全款-收款单明细
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, 1, "车款", "1");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "车款", "1");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
//全款推送车款(应收未收中为首付款的)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, 1, "首付款及费用", "1");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "首付款及费用", "1");
finSelectedReceivablesDetailedVos1_1_1.removeAll(Collections.singleton(null));
//推送全款订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, 1, "订金", "1");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "订金", "1");
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
//贷款推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款", "2");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "车款", "2");
finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null));
//贷款推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金", "2");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "订金", "2");
finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null));
//贷款推送车款(应收未收中为首付款的)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "首付款及费用", "2");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "首付款及费用", "2");
finSelectedReceivablesDetailedVos1_1_2.removeAll(Collections.singleton(null));
int carSize = 0;
//全款推送车款
@ -1499,154 +1509,86 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
arReceivebill.setFBillNo(confirmation.getBillNo());
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
log.info("收款单推送：" + resultBean2.getMsg());
}
}*/
cashierPushConfirm(sid);
//===========================================
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
//查询该申请下的所有待审核的款项明细
BigDecimal subscriptionMoneyAll = new BigDecimal("0");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
if (finSelectedReceivablesDetailedVos.size() > 0) {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
//应收未收款项明细sid
String receivablesSid = v.getReceivablesSid();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
if (v.getSubscribedOf() == 0) {
//更新认款状态
finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
//更新已选款项明细的审核状态1待审核/2已驳回/3已审核
finSelectedReceivablesDetailed.setAuditState(3);
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
//ToDo:查询是否符合待出库的条件
//该合同编号下的该车架号的所有认款金额
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//查询该合同编号下的销售订单的单车成交价
ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(v.getContractNo());
if (commonContractResultBean.getSuccess()) {
CommonContract commonContract = commonContractResultBean.getData();
if (commonContract != null) {
ResultBean<AppOrderDetailsVo> orderDetails = busSalesOrderFeign.getSaleOrderDetails(commonContract.getBusSid());
AppOrderDetailsVo vo = orderDetails.getData();
if (vo != null) {
AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
if (depositInfo != null) {
if ("02".equals(depositInfo.getDepositTypeKey())) {//订金结转
BigDecimal decimalDeposit = BigDecimal.ZERO;
if (StringUtils.isNotBlank(depositInfo.getDepositTotal())) {
decimalDeposit = new BigDecimal(depositInfo.getDepositTotal());
}
if (StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())) {
decimalDeposit = decimalDeposit.subtract(new BigDecimal(depositInfo.getMakeUpDeposit()));
}
decimalDeposit = decimalDeposit.divide(new BigDecimal(priceInfoVo.getNumber()), BigDecimal.ROUND_CEILING);
bigDecimalVinAll = bigDecimalVinAll.add(decimalDeposit);
}
}
//单台整体成交价
BigDecimal singleFinalPrice = new BigDecimal(priceInfoVo.getSingleFinalPrice());
BigDecimal leftAll = BigDecimal.ZERO;
BigDecimal rightAll = BigDecimal.ZERO;
if ("2".equals(vo.getFinancePlan()) || "2".equals(vo.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(commonContract.getBusSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
}
rightAll = rightAll.add(bigDecimalVinAll);
} else {
//自营非担保： 实收订金 = 首付款及费用+订金
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}
} else {//担保贷款： 实收订金 = 首付款及费用+订金
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}
} else {
// 成交价 = 车款+订金
leftAll = leftAll.add(singleFinalPrice);
rightAll = rightAll.add(bigDecimalVinAll);
}
} else {
// 成交价 = 车款+订金
leftAll = leftAll.add(singleFinalPrice);
rightAll = rightAll.add(bigDecimalVinAll);
}
//根据busVinSid查询待出库中是否存在该数据
ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
if (busDeliveredResultBean.getData() == null) {
if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks());
busDeliveredDto.setPaymentMethodKey(vo.getPayTypeKey());
busDeliveredDto.setPaymentMethod(vo.getPayType());
busDeliveredDto.setContractNo(v.getContractNo());
busDeliveredDto.setName(v.getCustomerName());
busDeliveredDto.setVinNo(v.getVIN());
busDeliveredDto.setMobile(v.getCustomerPhone());
busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice());
busDeliveredDto.setCreateBySid(confirmation.getStaffUserSid());
SubmitVo intermediary1 = vo.getIntermediary1();
if (intermediary1 != null) {
busDeliveredDto.setDistributorName(intermediary1.getIntermediaryName());
busDeliveredDto.setDistributorPrice(intermediary1.getAgencyFee());
}
SubmitVo intermediary2 = vo.getIntermediary2();
if (intermediary2 != null) {
busDeliveredDto.setDistributorNameTwo(intermediary2.getIntermediaryName());
busDeliveredDto.setDistributorPriceTwo(intermediary2.getAgencyFee());
}
busDeliveredDto.setSingleCarDiscountPrice(priceInfoVo.getSingleCarDiscountPrice());
//根据客户sid查询客户的身份证号
AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName());
busDeliveredDto.setUseOrgSid(confirmation.getUseOrgSid());
ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(confirmation.getUseOrgSid());
if (sysOrganizationVoResultBean.getData() != null) {
busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
}
busDeliveredDto.setBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
}
}
}
if (confirmation.getPushMessgae() == 1) {//简易订单定金
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
//更新已选款项明细的审核状态1待审核/2已驳回/3已审核
finSelectedReceivablesDetailed.setAuditState(3);
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
});
} else {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
//应收未收款项明细sid
String receivablesSid = v.getReceivablesSid();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
if (v.getSubscribedOf() == 0) {
//更新认款状态
finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
}
});
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
//更新已选款项明细的审核状态1待审核/2已驳回/3已审核
finSelectedReceivablesDetailed.setAuditState(3);
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
//ToDo:查询是否符合待出库的条件
//该合同编号下的该车架号的所有认款金额
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
BigDecimal unDecimalVinAll = unList.stream().map(FinUncollectedReceivablesDetailed::getReveivableMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//查询该合同编号下的销售订单的单车成交价
BigDecimal leftAll = unDecimalVinAll;
BigDecimal rightAll = bigDecimalVinAll;
if (leftAll.compareTo(rightAll) <= 0) {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
dtoList.add(baseVehicleStateDto);
}
});
}
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
if (!dtoList.isEmpty()) {
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
//查询该申请所有的款项明细
finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
confirmation = fetchBySid(sid);
//与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款
confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) <= 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
//更新收款申请的余额以及审核状态
BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
confirmation.setBalance(balanceBigDecimal);
confirmation.setAuditState(3);
//查询当前登录人信息并更新审核人和审核时间
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (userVoResultBean.getData() != null) {
@ -1660,25 +1602,18 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success().setMsg("款项确认成功");
}
public ResultBean cashierConfirm(String sid, String userSid) {
/**
* 推送金蝶
*
* @param sid 款项申请sid
* @return
*/
public ResultBean cashierPushConfirm(String sid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
return rb.setMsg("该申请不存在");
}
if ("3".equals(confirmation.getAuditState())) {
return rb.setMsg("该申请已审核通过，不允许重复操作");
}
if ("2".equals(confirmation.getAuditState())) {
return rb.setMsg("该申请已驳回，不允许确认");
}
if ("4".equals(confirmation.getAuditState())) {
return rb.setMsg("该申请已撤回，不允许确认");
}
confirmation.setAuditState(3);
baseMapper.updateById(confirmation);
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
//推送收款单
ARReceivebill arReceivebill = new ARReceivebill();
//业务日期
@ -1717,22 +1652,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//推送全款车款
//根据合同编号分组-车款-待审核-全款-收款单明细
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, 1, "车款", "1");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "车款", "1");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
//全款推送车款(应收未收中为首付款的)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, 1, "首付款及费用", "1");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "首付款及费用", "1");
finSelectedReceivablesDetailedVos1_1_1.removeAll(Collections.singleton(null));
//推送全款订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, 1, "订金", "1");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1_1(sid, "订金", "1");
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
//贷款推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "车款", "2");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "车款", "2");
finSelectedReceivablesDetailedVos1_1.removeAll(Collections.singleton(null));
//贷款推送订金
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "订金", "2");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos2_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "订金", "2");
finSelectedReceivablesDetailedVos2_1.removeAll(Collections.singleton(null));
//贷款推送车款(应收未收中为首付款的)
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, 1, "首付款及费用", "2");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1_1_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "首付款及费用", "2");
finSelectedReceivablesDetailedVos1_1_2.removeAll(Collections.singleton(null));
int carSize = 0;
//全款推送车款
@ -1857,197 +1792,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean resultBean2 = arReceivebillService.draftArReceivebill(arReceivebill);
log.info("收款单推送：" + resultBean2.getMsg());
}
//===========================================
List<BaseVehicleStateDto> dtoList = new ArrayList<>();
//查询该申请下的所有待审核的款项明细
BigDecimal subscriptionMoneyAll = new BigDecimal("0");
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 1);
if (finSelectedReceivablesDetailedVos.size() > 0) {
if (confirmation.getPushMessgae() == 1) {//简易订单定金
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
//更新已选款项明细的审核状态1待审核/2已驳回/3已审核
finSelectedReceivablesDetailed.setAuditState(3);
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
});
} else {
finSelectedReceivablesDetailedVos.stream().forEach(v -> {
//已选款项明细sid
String selectSid = v.getSid();
//应收未收款项明细sid
String receivablesSid = v.getReceivablesSid();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
if (v.getSubscribedOf() == 0) {
//更新认款状态
finUncollectedReceivablesDetailed.setSubscriptionState(finUncollectedReceivablesDetailed.getCurrentReceivableMoney().compareTo(BigDecimal.ZERO) == 0 ? 3 : 2);
finUncollectedReceivablesDetailedService.updateById(finUncollectedReceivablesDetailed);
}
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(selectSid);
//更新已选款项明细的审核状态1待审核/2已驳回/3已审核
finSelectedReceivablesDetailed.setAuditState(3);
//更新审核时间
finSelectedReceivablesDetailed.setAuditDate(DateUtil.today());
finSelectedReceivablesDetailedService.updateById(finSelectedReceivablesDetailed);
//ToDo:查询是否符合待出库的条件
//该合同编号下的该车架号的所有认款金额
List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin(v.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
//查询该合同编号下的销售订单的单车成交价
ResultBean<CommonContract> commonContractResultBean = commonContractFeign.selectByNo(v.getContractNo());
if (commonContractResultBean.getSuccess()) {
CommonContract commonContract = commonContractResultBean.getData();
if (commonContract != null) {
ResultBean<AppOrderDetailsVo> orderDetails = busSalesOrderFeign.getSaleOrderDetails(commonContract.getBusSid());
AppOrderDetailsVo vo = orderDetails.getData();
if (vo != null) {
AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo();
AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
if (depositInfo != null) {
if ("02".equals(depositInfo.getDepositTypeKey())) {//订金结转
BigDecimal decimalDeposit = BigDecimal.ZERO;
if (StringUtils.isNotBlank(depositInfo.getDepositTotal())) {
decimalDeposit = new BigDecimal(depositInfo.getDepositTotal());
}
if (StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())) {
decimalDeposit = decimalDeposit.subtract(new BigDecimal(depositInfo.getMakeUpDeposit()));
}
decimalDeposit = decimalDeposit.divide(new BigDecimal(priceInfoVo.getNumber()), BigDecimal.ROUND_CEILING);
bigDecimalVinAll = bigDecimalVinAll.add(decimalDeposit);
}
}
//单台整体成交价
BigDecimal singleFinalPrice = new BigDecimal(priceInfoVo.getSingleFinalPrice());
BigDecimal leftAll = BigDecimal.ZERO;
BigDecimal rightAll = BigDecimal.ZERO;
if ("2".equals(vo.getFinancePlan()) || "2".equals(vo.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(commonContract.getBusSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
/*if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
}
rightAll = rightAll.add(bigDecimalVinAll);
} else {
//自营非担保： 实收订金 = 首付款及费用+订金
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}
} else {//担保贷款： 实收订金 = 首付款及费用+订金
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}*/
if ("2".equals(vo.getPayTypeKey())) {//贷款
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
} else {
if(StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())){
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar()));
}else{
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}else{
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
}
rightAll = rightAll.add(bigDecimalVinAll);
} else {
//自营非担保： 实收订金 = 首付款及费用+订金
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}
}
}
} else {
// 成交价 = 车款+订金
leftAll = leftAll.add(singleFinalPrice);
rightAll = rightAll.add(bigDecimalVinAll);
}
} else {
// 成交价 = 车款+订金
leftAll = leftAll.add(singleFinalPrice);
rightAll = rightAll.add(bigDecimalVinAll);
}
if (leftAll.compareTo(rightAll) <= 0) {
BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
dtoList.add(baseVehicleStateDto);
}
}
}
}
});
}
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
}
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
if (!dtoList.isEmpty()) {
ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
}
});
} catch (Exception e) {
e.printStackTrace();
}
//查询该申请所有的款项明细
finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, 3);
confirmation = fetchBySid(sid);
//与收款金额作比较：更新认款状态 1未认款/2部分认款/3已认款
confirmation.setPaymentState(confirmation.getCollectionMoney().compareTo(subscriptionMoneyAll) <= 0 ? 3 : subscriptionMoneyAll.compareTo(BigDecimal.ZERO) == 0 ? 1 : 2);
//更新收款申请的余额以及审核状态
BigDecimal balanceBigDecimal = confirmation.getCollectionMoney().subtract(subscriptionMoneyAll);
confirmation.setBalance(balanceBigDecimal);
//查询当前登录人信息并更新审核人和审核时间
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(userSid);
if (userVoResultBean.getData() != null) {
confirmation.setConfirmName(userVoResultBean.getData().getName());
}
confirmation.setConfirmDate(DateUtil.today());
confirmation.setConfirmNameSid(userSid);
baseMapper.updateById(confirmation);
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
return rb.success().setMsg("款项确认成功");
return rb.success();
}
//组装客户推送
@ -2113,8 +1858,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
customerQuery.setOrgCode(orgCode);
}
}
// ResultBean<String> customerResultBean = crmCustomerTempFeign.checkCustomerOrUpdate(customerQuery);
// log.info("推送客户{}", customerResultBean);
//根据客户编码查询金蝶中是否存在该客户
Boolean aBoolean = finKingDeeService.customerExistState(customerQuery.getCustomerNo()).getData();
if (!aBoolean) {//不存在则创建
@ -2142,7 +1885,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//推送全款车款
//查询该收款单的所有已选明细：车款-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "车款");
finSelectedReceivablesDetailedService.selectDetailsList(sid, "车款");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos1.size(); i++) {
@ -2155,7 +1898,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
String uncollSid = "";
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, 1, "车款", contractNo);
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, "车款", contractNo);
vinListVo.removeAll(Collections.singleton(null));
if (!vinListVo.isEmpty()) {
for (FinSelectedReceivablesDetailedVo vv : vinListVo) {
@ -2179,7 +1922,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
//查询该合同编号的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, 1, "车款", contractNo);
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, "车款", contractNo);
if (vvVo != null) {
uncollSid = vvVo.getReceivablesSid();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
@ -2227,7 +1970,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String sid = confirmation.getSid();
//查询该收款单的所有已选明细：首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "首付款及费用");
finSelectedReceivablesDetailedService.selectDetailsList(sid, "首付款及费用");
finSelectedReceivablesDetailedVos1_1_1.removeAll(Collections.singleton(null));
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos1_1_1.size(); i++) {
@ -2240,7 +1983,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
String uncollSid = "";
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, 1, "首付款及费用", contractNo);
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, "首付款及费用", contractNo);
vinListVo.removeAll(Collections.singleton(null));
if (!vinListVo.isEmpty()) {
for (FinSelectedReceivablesDetailedVo vv : vinListVo) {
@ -2264,7 +2007,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
//查询该合同编号的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, 1, "首付款及费用", contractNo);
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, "首付款及费用", contractNo);
if (vvVo != null) {
uncollSid = vvVo.getReceivablesSid();
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
@ -2312,7 +2055,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String orgCode) {
String sid = confirmation.getSid();
List<FinSelectedReceivablesDetailedVo> voListv =
finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金");
finSelectedReceivablesDetailedService.selectDetailsList(sid, "订金");
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
for (int i = 0; i < finSelectedReceivablesDetailedVos2.size(); i++) {
@ -2324,7 +2067,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, 1, "订金", contractNo);
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, "订金", contractNo);
vinListVo.removeAll(Collections.singleton(null));
if (!vinListVo.isEmpty()) {
for (FinSelectedReceivablesDetailedVo vv : vinListVo) {
@ -2347,7 +2090,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
//查询该合同编号的车架号为空的情况
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, 1, "订金", contractNo);
FinSelectedReceivablesDetailedVo vvVo = finSelectedReceivablesDetailedService.fetchByAuditStateV_1(sid, "订金", contractNo);
if (vvVo != null) {
freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//结算方式
@ -2568,37 +2311,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return customerNoPrefix.length() > 30 ? customerNoPrefix.substring(0, 30) : customerNoPrefix;
}
public ResultBean saveFinConfirmOld(FinConfirmDto dto) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, confirmation, "sid");
baseMapper.insert(confirmation);
List<FinSelectDto> finSelectList = dto.getFinSelectList();
finSelectList.removeAll(Collections.singleton(null));
for (FinSelectDto d : finSelectList) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(d, finSelectedReceivablesDetailed, "sid");
finSelectedReceivablesDetailed.setCollSid(confirmation.getSid());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
}
if (StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())) {
//添加进附件表
List<String> stringList = Arrays.asList(confirmation.getPaymentVoucherUrl().split(","));
//附件保存:打款凭证附件
stringList.stream().forEach(v -> {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
commonAppendixDto.setFilePath(v);
commonAppendixDto.setFileName(CommonAttachTypeEnum.PAYMENT_VOUCHER.getMark());
commonAppendixDto.setLinkSid(confirmation.getSid());
commonAppendixDto.setCreateBySid(confirmation.getCreateBySid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
});
}
return rb.success();
}
public ResultBean saveFinConfirm(FinConfirmDto dto) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = new FinCollectionConfirmation();
@ -2773,15 +2485,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success();
}
/**
* 重推收款单
*
* @param sid
* @return
*/
public ResultBean ctskd(String sid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);
if (confirmation == null) {
return rb.setMsg("该申请不存在");
}
finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
ResultBean resultBean = cashierConfirm(sid, confirmation.getConfirmNameSid());
return resultBean;
cashierPushConfirm(sid);
return rb.success();
}
public ResultBean<String> selectCollectionMoney(String contractNo) {
@ -2790,6 +2507,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.success().setData(moneyAll);
}
/**
* 收款单申请人撤回
*
* @param sid
* @param userSid
* @return
*/
public ResultBean recallConfirm(String sid, String userSid) {
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmation confirmation = fetchBySid(sid);

46
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
View File

@ -234,11 +234,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
IPage<FinFundsCarriedForwardApply> page = PagerUtil.queryToPage(pq);
IPage<FinFundsCarriedForwardApplyVo> pagging = baseMapper.selectPageVo(page, qw, query.getJzSmallMoney(), query.getJzBigMoney());
for (FinFundsCarriedForwardApplyVo record : pagging.getRecords()) {
record.setShowUpdateBtn(false);
if ("待提交".equals(record.getNodeState())) {
record.setShowUpdateBtn(true);
}
if ("已办结".equals(record.getNodeState())) {
record.setShowDownloadBtn(true);
} else {
record.setShowDownloadBtn(false);
}
}
PagerVo<FinFundsCarriedForwardApplyVo> p = PagerUtil.pageToVo(pagging, null);
@ -542,6 +542,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finSelectedReceivablesDetailedService.deleteByCollSid(dtoSid);
for (AppFinFundsCarriedForwardYXYSKXDto yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
finSelectedReceivablesDetailed.setCreateBySid(dto.getCreateBySid());
finSelectedReceivablesDetailed.setCreateByName(dto.getCreateByName());
finSelectedReceivablesDetailed.setContractSid(yxysFinFundsCarriedForwardYXYSKXVo.getContractSid());
finSelectedReceivablesDetailed.setContractNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
finSelectedReceivablesDetailed.setCustomerName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
@ -556,8 +558,22 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
finSelectedReceivablesDetailed.setPayType(yxysFinFundsCarriedForwardYXYSKXVo.getPayType());
finSelectedReceivablesDetailed.setPayTypeKey(yxysFinFundsCarriedForwardYXYSKXVo.getPayTypeKey());
finSelectedReceivablesDetailed.setUseOrgSid(yxysFinFundsCarriedForwardYXYSKXVo.getUseOrgSid());
finSelectedReceivablesDetailed.setUseOrgName(dto.getUseOrgName());
finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
finSelectedReceivablesDetailed.setCollSid(dtoSid);
finSelectedReceivablesDetailed.setKxState("01");
finSelectedReceivablesDetailed.setOrgSidPath(dto.getOrgSidPath());
finSelectedReceivablesDetailed.setStaffName(dto.getStaffName());
String staffSid = dto.getStaffSid();
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(staffSid).getData();
finSelectedReceivablesDetailed.setStaffUserSid(sysUserVo.getSid());
finSelectedReceivablesDetailed.setStaffDeptSid(dto.getSaleDeptSid());
finSelectedReceivablesDetailed.setStaffDeptName(dto.getSaleDeptName());
String receivablesSid = yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
finSelectedReceivablesDetailed.setPurchaseSystemSid(finUncollectedReceivablesDetailed.getPurchaseSystemSid());
finSelectedReceivablesDetailed.setPurchaseSystemName(finUncollectedReceivablesDetailed.getPurchaseSystemName());
finSelectedReceivablesDetailed.setAuditDate(DateUtil.formatDate(new Date()));
if (finSelectedReceivablesDetailed.getSubscribedOf() == 1) {
finSelectedReceivablesDetailed.setSelectSid(yxysFinFundsCarriedForwardYXYSKXVo.getSid());
}
@ -777,9 +793,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
zc.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
zc.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
zc.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
String thisUseMoney = finFundsCarriedForwardVehDetailsVo.getThisUseMoney();
int index = thisUseMoney.indexOf(".");
zc.setDcje(Integer.parseInt(thisUseMoney.substring(0, index)));
zc.setDcje(Double.parseDouble(finFundsCarriedForwardVehDetailsVo.getThisUseMoney()));
zcList.add(zc);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
@ -790,9 +804,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
zr.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
zr.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
zr.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
int index = confirmMoney.indexOf(".");
zr.setDrje(Integer.parseInt(confirmMoney.substring(0, index)));
zr.setDrje(Double.parseDouble(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
zrList.add(zr);
}
//2.设置listi和listo中财务系统客户编码值
@ -1440,9 +1452,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzDto.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
tzDto.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
tzDto.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
String thisUseMoney = finFundsCarriedForwardVehDetailsVo.getThisUseMoney();
int index = thisUseMoney.indexOf(".");
tzDto.setDcje(Integer.parseInt(thisUseMoney.substring(0, index)));
tzDto.setDcje(Double.parseDouble(finFundsCarriedForwardVehDetailsVo.getThisUseMoney()));
tzList.add(tzDto);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
@ -1451,9 +1461,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
int index = confirmMoney.indexOf(".");
tzDto.setDrje(Integer.parseInt(confirmMoney.substring(0, index)));
tzDto.setDrje(Double.parseDouble(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
tzList.add(tzDto);
}
dataMap.put("saleDate", DateUtil.formatDate(new Date()));
@ -1620,9 +1628,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzDto.setConNo(finFundsCarriedForwardVehDetailsVo.getBusBillNo());
tzDto.setName(finFundsCarriedForwardVehDetailsVo.getCustomerName());
tzDto.setVinNo(finFundsCarriedForwardVehDetailsVo.getVinNo());
String thisUseMoney = finFundsCarriedForwardVehDetailsVo.getThisUseMoney();
int index = thisUseMoney.indexOf(".");
tzDto.setDcje(Integer.parseInt(thisUseMoney.substring(0, index)));
tzDto.setDcje(Double.parseDouble(finFundsCarriedForwardVehDetailsVo.getThisUseMoney()));
tzList.add(tzDto);
}
for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
@ -1631,9 +1637,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
tzDto.setConNo(yxysFinFundsCarriedForwardYXYSKXVo.getContractId());
tzDto.setName(yxysFinFundsCarriedForwardYXYSKXVo.getName());
tzDto.setVinNo(yxysFinFundsCarriedForwardYXYSKXVo.getVin());
String confirmMoney = yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney();
int index = confirmMoney.indexOf(".");
tzDto.setDrje(Integer.parseInt(confirmMoney.substring(0, index)));
tzDto.setDrje(Double.parseDouble(yxysFinFundsCarriedForwardYXYSKXVo.getConfirmMoney()));
tzList.add(tzDto);
}
dataMap.put("saleDate", DateUtil.formatDate(new Date()));

32
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
View File

@ -81,56 +81,44 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
*/
IPage<AppFinUncollectedReceivablesDetailedVo> getPaymentDetailsList(IPage<AppFinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
// List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
@Select("select * from fin_selected_receivables_detailed where collSid = #{sid} and auditState = #{auditState}")
List<FinSelectedReceivablesDetailedVo> fetchByAuditState(@Param("sid") String sid, @Param("auditState") Integer auditState);
@Update("update fin_selected_receivables_detailed set auditState = 3 where sid = #{sid}")
void cashierConfirm(String sid);
List<FinSelectedReceivablesDetailedVo> selectGroupConAndRecAndPay();
List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay();
@Update("update fin_selected_receivables_detailed set auditDate = NOW() ,auditState = #{auditState} where sid = #{sid1}")
void updateAuditDateBySid(@Param("sid1") String sid1, @Param("auditState") String auditState);
List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo);
List<String> selectListByAuditState(@Param("i") int i, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
List<FinSelectedReceivablesDetailedVo> selectListByVin(@Param("contractNo") String contractNo, @Param("busVinSid") String busVinSid, @Param("state") int state);
List<FinSelectedReceivablesDetailed> getList(@Param("list") List<String> sidsList);
List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
/**
* 根据合同编号分组查询客户
*
* @param sid 收款单sid
* @param i 审核状态
* @param type 应收项目名称
* @param payTypeKey 销售类型
* @return
*/
List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1_1(@Param("sid") String sid, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(@Param("sid") String sid, @Param("type") String type, @Param("payTypeKey") String payTypeKey);
List<SelectCustomerVo> selectCustomerList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
// List<SelectCustomerVo> selectCustomerList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
List<FinSelectedReceivablesDetailedVo> selectDetailsList(@Param("sid") String sid, @Param("state") int i, @Param("type") String type);
List<FinSelectedReceivablesDetailedVo> selectDetailsList(@Param("sid") String sid, @Param("type") String type);
List<FinSelectedReceivablesDetailedVo> selectVinListVo(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
List<FinSelectedReceivablesDetailedVo> selectVinListVo_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("contractNo") String contractNo);
List<FinSelectedReceivablesDetailedVo> selectVinListVo_1(@Param("sid") String sid, @Param("type") String type, @Param("contractNo") String contractNo);
FinSelectedReceivablesDetailedVo fetchByAuditStateV(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("customerName") String customerName, @Param("customerPhone") String customerPhone);
FinSelectedReceivablesDetailedVo fetchByAuditStateV_1(@Param("sid") String sid, @Param("state") int i, @Param("type") String type, @Param("contractNo") String contractNo);
FinSelectedReceivablesDetailedVo fetchByAuditStateV_1(@Param("sid") String sid, @Param("type") String type, @Param("contractNo") String contractNo);
@Select("select * from fin_selected_receivables_detailed where contractNo = #{contractNo}")
List<FinSelectedReceivablesDetailed> fetchByContractNo(String contractNo);
@ -150,12 +138,12 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
List<FinSelectReceivablesDetailedVo> selectPageList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> noOutVehRecPageList(IPage<FinSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER)QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> noOutVehRecPageList(IPage<FinSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER) QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw);
@Update("update fin_selected_receivables_detailed set balance = #{balance} where sid = #{busSid}")
void updateYeBySid(@Param("balance") String balance,@Param("busSid") String busSid);
void updateYeBySid(@Param("balance") String balance, @Param("busSid") String busSid);
List<String> fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo,@Param("sid") String sid);
List<String> fetchJzMoneyByContractNoAndMainSid(@Param("ysCustNo") String ysCustNo, @Param("sid") String sid);
String selectBalanceByReceivedSid(String receivablesSid);

57
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
View File

@ -77,13 +77,14 @@
</if>
and length(furd.busVinSid)
>0
and furd.kxState != '02'
</where>
group by furd.sid,furd.contractNo
having receivable>0
order by furd.contractNo desc
</select>
<select id="getPaymentList"
<!-- <select id="getPaymentList"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo">
SELECT sid,
contractNo AS contractId,
@ -114,7 +115,7 @@
>0
</where>
order by furd.contractNo desc
</select>
</select>-->
<select id="selectGroupConAndRecAndPay"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
@ -167,14 +168,6 @@
WHERE fcc.paymentState = 1
</select>
<select id="selectListByAuditState" resultType="java.lang.String">
select receivablesSid
from fin_selected_receivables_detailed
where auditState = #{i}
and createBySid = #{userSid}
and useOrgSid = #{useOrgSid}
</select>
<select id="selectListByVin"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select ifnull(sum(dbalance), 0) as subscriptionMoney
@ -204,23 +197,11 @@
</foreach>
</select>
<select id="fetchByAuditState1"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *, sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and payTypeKey = #{payTypeKey}
group by concat(customerName, customerPhone)
</select>
<select id="fetchByAuditState1_1_1"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *, sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and payTypeKey = #{payTypeKey}
group by contractNo
@ -231,39 +212,25 @@
select *
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and payTypeKey = #{payTypeKey}
</select>
<select id="selectCustomerList" resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo">
<!-- <select id="selectCustomerList" resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo">
select customerName, customerPhone, customerSid
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
group by concat(customerName, customerPhone)
</select>
</select>-->
<select id="selectDetailsList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
</select>
<select id="selectVinListVo"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and customerName = #{customerName}
and customerPhone = #{customerPhone}
and length(VIN) > 0
</select>
<select id="selectVinListVo_1"
@ -271,7 +238,6 @@
select *
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and contractNo = #{contractNo}
and length(VIN) > 0
@ -282,24 +248,11 @@
select *, sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and contractNo = #{contractNo}
and length(VIN) = 0
</select>
<select id="fetchByAuditStateV"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
select *, sum(subscriptionMoney) as sumAll
from fin_selected_receivables_detailed
where collSid = #{sid}
and auditState = #{state}
and receivablesName = #{type}
and customerName = #{customerName}
and customerPhone = #{customerPhone}
and length(VIN) = 0
</select>
<select id="selectByVinSid" resultType="java.lang.String">
select ifnull(sum(dbalance), 0) as subscriptionMoney
from (SELECT cast((

98
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
View File

@ -204,18 +204,14 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return baseMapper.getPaymentDetailsList(page, qw, name);
}
public List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, String name) {
/* public List<AppFinUncollectedReceivablesDetailedVo> getPaymentList(QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, String name) {
return baseMapper.getPaymentList(qw, name);
}
}*/
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState(String sid, Integer auditState) {
return baseMapper.fetchByAuditState(sid, auditState);
}
public void cashierConfirm(String sid) {
baseMapper.cashierConfirm(sid);
}
public List<FinSelectedReceivablesDetailedVo> selectGroupConAndRecAndPay() {
return baseMapper.selectGroupConAndRecAndPay();
}
@ -224,10 +220,6 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return baseMapper.selectDetailedGroupConAndRecAndPay();
}
public void updateAuditDateBySid(String sid1, String auditState) {
baseMapper.updateAuditDateBySid(sid1, auditState);
}
public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
return baseMapper.selectByCollSid(collectionBillSid);
}
@ -237,10 +229,6 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return list;
}
public List<String> selectListByAuditState(int i, String userSid, String useOrgSid) {
return baseMapper.selectListByAuditState(i, userSid, useOrgSid);
}
public List<FinSelectedReceivablesDetailedVo> selectListByVin(String contractNo, String busVinSid, int state) {
return baseMapper.selectListByVin(contractNo, busVinSid, state);
}
@ -249,10 +237,6 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return baseMapper.getList(sidsList);
}
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1(String sid, int i, String type, String payTypeKey) {
return baseMapper.fetchByAuditState1(sid, i, type, payTypeKey);
}
/**
* 根据合同编号分组查询客户
*
@ -262,24 +246,20 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
* @param payTypeKey 销售类型
* @return
*/
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1_1(String sid, int i, String type, String payTypeKey) {
return baseMapper.fetchByAuditState1_1_1(sid, i, type, payTypeKey);
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1_1(String sid, String type, String payTypeKey) {
return baseMapper.fetchByAuditState1_1_1(sid, type, payTypeKey);
}
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(String sid, int i, String type, String payTypeKey) {
return baseMapper.fetchByAuditState1_1(sid, i, type, payTypeKey);
public List<FinSelectedReceivablesDetailedVo> fetchByAuditState1_1(String sid, String type, String payTypeKey) {
return baseMapper.fetchByAuditState1_1(sid, type, payTypeKey);
}
public List<SelectCustomerVo> selectCustomerList(String sid, int i, String type) {
/* public List<SelectCustomerVo> selectCustomerList(String sid, int i, String type) {
return baseMapper.selectCustomerList(sid, i, type);
}
}*/
public List<FinSelectedReceivablesDetailedVo> selectDetailsList(String sid, int i, String type) {
return baseMapper.selectDetailsList(sid, i, type);
}
public List<FinSelectedReceivablesDetailedVo> selectVinListVo(String sid, int i, String type, String customerName, String customerPhone) {
return baseMapper.selectVinListVo(sid, i, type, customerName, customerPhone);
public List<FinSelectedReceivablesDetailedVo> selectDetailsList(String sid, String type) {
return baseMapper.selectDetailsList(sid, type);
}
/**
@ -291,16 +271,12 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
* @param contractNo 合同编号
* @return
*/
public List<FinSelectedReceivablesDetailedVo> selectVinListVo_1(String sid, int i, String type, String contractNo) {
return baseMapper.selectVinListVo_1(sid, i, type, contractNo);
}
public FinSelectedReceivablesDetailedVo fetchByAuditStateV_1(String sid, int i, String type, String contractNo) {
return baseMapper.fetchByAuditStateV_1(sid, i, type, contractNo);
public List<FinSelectedReceivablesDetailedVo> selectVinListVo_1(String sid, String type, String contractNo) {
return baseMapper.selectVinListVo_1(sid, type, contractNo);
}
public FinSelectedReceivablesDetailedVo fetchByAuditStateV(String sid, int i, String type, String customerName, String customerPhone) {
return baseMapper.fetchByAuditStateV(sid, i, type, customerName, customerPhone);
public FinSelectedReceivablesDetailedVo fetchByAuditStateV_1(String sid, String type, String contractNo) {
return baseMapper.fetchByAuditStateV_1(sid, type, contractNo);
}
public ResultBean<List<FinSelectedReceivablesDetailed>> fetchByContractNo(String contractNo) {
@ -366,17 +342,17 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
}
}
if(StringUtils.isNotBlank(params.getContractNo())){
qw.like("fd.contractNo",params.getContractNo());
if (StringUtils.isNotBlank(params.getContractNo())) {
qw.like("fd.contractNo", params.getContractNo());
}
if(StringUtils.isNotBlank(params.getCustomerName())){
qw.like("fd.customerName",params.getCustomerName());
if (StringUtils.isNotBlank(params.getCustomerName())) {
qw.like("fd.customerName", params.getCustomerName());
}
if(StringUtils.isNotBlank(params.getMobile())){
qw.like("fd.customerPhone",params.getMobile());
if (StringUtils.isNotBlank(params.getMobile())) {
qw.like("fd.customerPhone", params.getMobile());
}
//应收未收中的当前应收小于等于0
qw.le("furd.currentReceivableMoney",0);
qw.le("furd.currentReceivableMoney", 0);
List<FinSelectReceivablesDetailedVo> collList = baseMapper.selectPageList(qw, params.getName());
if (collList.isEmpty()) {
collList = baseMapper.selectPageList(qw, "");
@ -468,8 +444,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
//分页
IPage<FinSelectReceivablesDetailedVo> page1 = new Page<>();
page1.setTotal(collList.size());
page1.setPages(collList.size()/pagerQuery.getSize()+(collList.size()%pagerQuery.getSize()==0?0:1));
collList = collList.stream().skip((pagerQuery.getCurrent() - 1) *pagerQuery.getSize()).limit(pagerQuery.getSize()).collect(Collectors.toList()); //开始分页
page1.setPages(collList.size() / pagerQuery.getSize() + (collList.size() % pagerQuery.getSize() == 0 ? 0 : 1));
collList = collList.stream().skip((pagerQuery.getCurrent() - 1) * pagerQuery.getSize()).limit(pagerQuery.getSize()).collect(Collectors.toList()); //开始分页
page1.setRecords(collList);
page1.setCurrent(pagerQuery.getCurrent());
page1.setSize(pagerQuery.getSize());
@ -515,17 +491,17 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
}
}
if(StringUtils.isNotBlank(params.getContractNo())){
qw.like("fd.contractNo",params.getContractNo());
if (StringUtils.isNotBlank(params.getContractNo())) {
qw.like("fd.contractNo", params.getContractNo());
}
if(StringUtils.isNotBlank(params.getCustomerName())){
qw.like("fd.customerName",params.getCustomerName());
if (StringUtils.isNotBlank(params.getCustomerName())) {
qw.like("fd.customerName", params.getCustomerName());
}
if(StringUtils.isNotBlank(params.getMobile())){
qw.like("fd.customerPhone",params.getMobile());
if (StringUtils.isNotBlank(params.getMobile())) {
qw.like("fd.customerPhone", params.getMobile());
}
if(StringUtils.isNotBlank(params.getVinNo())){
qw.like("bv.linkNo",params.getVinNo());
if (StringUtils.isNotBlank(params.getVinNo())) {
qw.like("bv.linkNo", params.getVinNo());
}
IPage<FinSelectReceivablesDetailedVo> pagging = baseMapper.selectPageLists(page, qw, params.getName());
return pagging;
@ -578,7 +554,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
}
qw.eq("ferd.auditState", 3);
qw.eq("ferd.kxState","01");
qw.eq("ferd.kxState", "01");
if (StringUtils.isNotBlank(query.getStaffDeptName())) {
qw.like("ferd.staffDeptName", query.getStaffDeptName());
}
@ -598,11 +574,11 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
qw.like("ferd.VIN", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("ferd.staffDeptName",query.getName()).or().like("ferd.staffName",query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("ferd.staffDeptName", query.getName()).or().like("ferd.staffName", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName()));
}
qw.groupBy("ferd.sid");
if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney())){
qw.having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney());
if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney())) {
qw.having("reveivableMoney >= {0}", query.getBalanceSmallMoney()).having("reveivableMoney <= {0}", query.getBalanceBigMoney());
}
qw.having("reveivableMoney > 0");
IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
@ -612,7 +588,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
public void updateYeBySid(String balance, String busSid) {
baseMapper.updateYeBySid(balance,busSid);
baseMapper.updateYeBySid(balance, busSid);
}
public String selectBalanceByReceivedSid(String receivablesSid) {
@ -620,7 +596,7 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
}
public List<String> fetchJzMoneyByContractNoAndMainSid(String ysCustNo, String sid) {
return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo,sid);
return baseMapper.fetchJzMoneyByContractNoAndMainSid(ysCustNo, sid);
}
public FinSelectedReceivablesDetailed fetchYeBySid(String busSid) {

11
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
View File

@ -104,4 +104,15 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
List<String> selectSidBybusVinSidAndConNo(@Param("busVinSid") String busVinSid, @Param("contractNo") String contractNo);
String selectByBusVinSid(String busVinSid);
List<FinUncollectedReceivablesDetailed> selectListByBusVinSid(String busVinSid);
/**
* 根据销售订单车辆sid更新应收未收的款项状态
*
* @param busVinSid 销售订单车辆sid
* @param kxState 款项状态：01正常，02作废
* @return
*/
int updateKxState(@Param("list") List<String> busVinSid, @Param("kxState") String kxState);
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
View File

@ -92,6 +92,7 @@
<where>
${ew.sqlSegment}
and length(furd.busVinSid) > 0
and furd.kxState != '02'
</where>
group by furd.sid, currentReceivableMoney>0, furd.contractNo
having currentReceivableMoney>0
@ -319,4 +320,17 @@
from fin_uncollected_receivables_detailed
where busVinSid = #{busVinSid}
</select>
<select id="selectListByBusVinSid"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid}
</select>
<update id="updateKxState">
update fin_uncollected_receivables_detailed set kxState = #{kxState}
where busVinSid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
View File

@ -161,6 +161,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
return rb.success().setData(stringList);
}
@Override
public ResultBean updateKxState(StateQuery stateQuery) {
return finUncollectedReceivablesDetailedService.updateKxState(stateQuery);
}
@Override
public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
View File

@ -976,4 +976,19 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
public String selectByBusVinSid(String busVinSid) {
return baseMapper.selectByBusVinSid(busVinSid);
}
public List<FinUncollectedReceivablesDetailed> selectListByBusVinSid(String busVinSid) {
return baseMapper.selectListByBusVinSid(busVinSid);
}
public ResultBean updateKxState(StateQuery stateQuery) {
ResultBean rb = ResultBean.fireFail();
List<String> busVinSid = stateQuery.getBusVinSid();
String kxState = stateQuery.getKxState();
busVinSid.removeAll(Collections.singleton(null));
if(!busVinSid.isEmpty()){
baseMapper.updateKxState(busVinSid,kxState);
}
return rb.success();
}
}

2
anrui-fin/anrui-fin-biz/src/main/resources/application-pro.yml
View File

@ -32,6 +32,6 @@ kingdee: #金蝶的系统的链接账号 url等信息
userName: 信息部 #登录金蝶的账户信息 2022010测试的
password: ywzx0750 #登录金蝶的账户信息
userName_administrator: Administrator #登录金蝶的账户信息 2022010测试
password_administrator: hebei@anrui202108. #登录金蝶的账户信息 2022010测试
password_administrator: hebei@anrui202308. #登录金蝶的账户信息 2022010测试
lcid: 2052 #登录金蝶的账户信息
url: http://121.36.43.55 #金蝶财务系统ip地址

66
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomevisitAppealDto.java
View File

@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: anrui-riskcenter(家访考察申诉) <br/>
* File: LoanHomevisitAppealDto.java <br/>
* Class: com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealDto <br/>
* Description: 家访考察申诉 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2023-08-17 14:29:22 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "家访考察申诉 数据传输对象", description = "家访考察申诉 数据传输对象")
public class AppLoanHomevisitAppealDto implements Dto {
private String sid;
@ApiModelProperty("家访考察意见")
private String homeVisOpinion;
@ApiModelProperty("申诉原因")
private String appealReason;
@ApiModelProperty("家访考察sid")
private String homeVisitSid;
@ApiModelProperty("申请编号")
private String billNo;
@ApiModelProperty("申诉附件")
private List<String> ssImages = new ArrayList<>();
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java
View File

@ -1,12 +1,17 @@
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@ -128,4 +133,36 @@ public interface LoanHomeVisitInvestigateFeign {
@PostMapping("/getHomeAppealList")
@ResponseBody
ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(@RequestBody PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery);
/****************************************流程审批******************************************/
@ApiOperation("提交流程")
@PostMapping("/submitCreditInfo")
@ResponseBody
ResultBean submitCreditInfo(@RequestBody SubmitHomeAppealApplyDto dto);
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody CompleteHomeAppealDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody HomeAppealTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody HomeAppealTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody HomeAppealTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap HomeAppealQuery query);
}

34
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/CompleteHomeAppealDto.java
View File

@ -0,0 +1,34 @@
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class CompleteHomeAppealDto implements Dto {
private static final long serialVersionUID = 7978653524636034916L;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误：taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误：procInsId")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误：userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
private String orgPath;
}

17
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/HomeAppealQuery.java
View File

@ -0,0 +1,17 @@
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class HomeAppealQuery implements Query {
private static final long serialVersionUID = -3563282658560745370L;
@ApiModelProperty(value = "节点key")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
private Integer next;
}

42
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/HomeAppealTaskQuery.java
View File

@ -0,0 +1,42 @@
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class HomeAppealTaskQuery implements Query {
private static final long serialVersionUID = -6952737531036706114L;
/**
* 终止、驳回、撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误：taskId")
private String taskId;
/**
* 终止、驳回、撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
/**
* 终止、驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止、撤回、驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
@JsonProperty("procInsId")
private String instanceId;
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/flowable/SubmitHomeAppealApplyDto.java
View File

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.terminal.api.risk.creditreview.CreditReviewSsDto;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomevisitAppealDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SubmitHomeAppealApplyDto extends AppLoanHomevisitAppealDto {
private static final long serialVersionUID = 6134092944641545633L;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

34
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java
View File

@ -26,6 +26,10 @@
package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -142,4 +146,34 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeAppealList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
return loanHomeVisitInvestigateService.getHomeAppealList(pagerQuery);
}
@Override
public ResultBean submitCreditInfo(SubmitHomeAppealApplyDto dto) {
return loanHomeVisitInvestigateService.submitCreditInfo(dto);
}
@Override
public ResultBean agreeCreditInfo(CompleteHomeAppealDto dto) {
return loanHomeVisitInvestigateService.agreeCreditInfo(dto);
}
@Override
public ResultBean rejectCreditInfo(HomeAppealTaskQuery query) {
return loanHomeVisitInvestigateService.rejectCreditInfo(query);
}
@Override
public ResultBean recallCreditInfo(HomeAppealTaskQuery query) {
return loanHomeVisitInvestigateService.recallCreditInfo(query);
}
@Override
public ResultBean stopCreditInfo(HomeAppealTaskQuery query) {
return loanHomeVisitInvestigateService.stopCreditInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(HomeAppealQuery query) {
return loanHomeVisitInvestigateService.getFlowOperateTitle(query);
}
}

98
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java
View File

@ -27,9 +27,18 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyCompleteDto;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeQuery;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyNodeVo;
import com.yxt.anrui.riskcenter.api.loancreditappealapply.flowable.LoanCreditApplyTaskQuery;
import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealFeign;
import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealQuery;
import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.LoanHomevisitAppealVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitappeal.flowable.*;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateInitCustomerVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomeVisitInvestigateSaveCustomerDto;
@ -42,7 +51,12 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVis
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo;
import com.yxt.anrui.terminal.api.risk.creditreview.ShareholderDetailsVo;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery;
import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -51,6 +65,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Service
@ -60,6 +75,8 @@ public class LoanHomeVisitInvestigateService {
private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
@Autowired
private LoanHomevisitAppealFeign loanHomevisitAppealFeign;
@Autowired
private SysUserFeign sysUserFeign;
public ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> getHomeVisitList(PagerQuery<LoanHomeVisitInvestigatePageQuery> pagerQuery) {
ResultBean<PagerVo<LoanHomeVisitInvestigatePageVo>> rb = ResultBean.fireFail();
@ -295,4 +312,85 @@ public class LoanHomeVisitInvestigateService {
v.setRecords(loanHomeVisitInvestigatePageVos);
return rb.success().setData(v);
}
public ResultBean submitCreditInfo(SubmitHomeAppealApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
SubmitHomeAppealDto submitHomeAppealDto = new SubmitHomeAppealDto();
BeanUtil.copyProperties(dto,submitHomeAppealDto);
ResultBean resultBean = loanHomevisitAppealFeign.submitHomeAppeal(submitHomeAppealDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
public ResultBean agreeCreditInfo(CompleteHomeAppealDto dto) {
ResultBean rb = ResultBean.fireFail();
LoanHomeAppealCompleteDto loanHomeAppealCompleteDto = new LoanHomeAppealCompleteDto();
BeanUtil.copyProperties(dto, loanHomeAppealCompleteDto);
loanHomevisitAppealFeign.complete(loanHomeAppealCompleteDto);
return rb.success();
}
public ResultBean rejectCreditInfo(HomeAppealTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
LoanHomeAppealTaskQuery taskQuery = new LoanHomeAppealTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = loanHomevisitAppealFeign.reject(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallCreditInfo(HomeAppealTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
LoanHomeAppealTaskQuery taskQuery = new LoanHomeAppealTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = loanHomevisitAppealFeign.revokeProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopCreditInfo(HomeAppealTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
LoanHomeAppealTaskQuery taskQuery = new LoanHomeAppealTaskQuery();
BeanUtil.copyProperties(query, taskQuery);
ResultBean resultBean = loanHomevisitAppealFeign.breakProcess(taskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(HomeAppealQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
LoanHomeAppealNodeQuery getNodeQuery = new LoanHomeAppealNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<LoanHomeAppealNodeVo>> previousNodesForReject = loanHomevisitAppealFeign.getPreviousNodesForReject(getNodeQuery);
if (previousNodesForReject.getSuccess()) {
previousNodesForReject.getData().removeAll(Collections.singleton(null));
data = previousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(previousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<LoanHomeAppealNodeVo>> nextNodesForSubmit = loanHomevisitAppealFeign.getNextNodesForSubmit(getNodeQuery);
if (nextNodesForSubmit.getSuccess()) {
nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = nextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(nextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
}
return rb.success().setData(data);
}
}
Write Preview
Loading…
Cancel
Save