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

PC款项申请和确认部分修改

master
dimengzhe 2 years ago
parent
01f2600525
commit
2e927bc535
12 changed files with 152 additions and 46 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. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
  3. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
  4. 21
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  5. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
  6. 9
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  7. 130
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  8. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  9. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  10. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  11. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  12. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java
View File

@ -228,5 +228,8 @@ public interface BusSalesOrderFeign {
@ResponseBody
public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(@RequestBody PagerQuery<AppRovalContractPageQuery> pagerQuery);
@ApiOperation("查询该合同下的该辆车架号的车辆sid")
@GetMapping("/getVinSidByConSid")
@ResponseBody
ResultBean<String> getVinSidByConSid(@RequestParam("contractNo")String contractNo,@RequestParam("vinNo")String vinNo);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java
View File

@ -203,4 +203,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
public ResultBean<PagerVo<AppRovalContractPageVo>> getApprovalContractList(PagerQuery<AppRovalContractPageQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<String> getVinSidByConSid(String contractNo, String vinNo) {
return null;
}
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java
View File

@ -181,4 +181,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
BusSalesOrderDetailsVo getByContractNo(String contractNo);
String getVinsidByConSid(@Param("contractNo") String contractNo, @Param("vinNo") String vinNo);
}

21
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
View File

@ -244,13 +244,14 @@
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bo.contractNo
, '')
, ifnull(bo.customerName
, '')) LIKE concat('%'
, #{name}
, '%')
, '')
, ifnull(bo.customerName
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
and length(bo.contractNo) > 1
and length(bo.contractNo)
> 1
</where>
</select>
<select id="selectByContractNo"
@ -268,4 +269,12 @@
FROM bus_sales_order bo
WHERE bo.contractNo = #{contractNo}
</select>
<select id="getVinsidByConSid" resultType="java.lang.String">
select linkSid
from bus_sales_order_vehicle bv
left join bus_sales_order bo on bo.sid = bv.salesOrderSid
where bo.contractNo = #{contractNo}
and bv.linkNo = #{vinNo}
</select>
</mapper>

5
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
View File

@ -280,4 +280,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
PagerVo<AppRovalContractPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppRovalContractPageVo>>().success().setData(pagerVo);
}
@Override
public ResultBean<String> getVinSidByConSid(String contractNo, String vinNo) {
return busSalesOrderService.getVinSidByConSid(contractNo,vinNo);
}
}

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

@ -2895,4 +2895,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
BusSalesOrderDetailsVo vo = baseMapper.getByContractNo(contractNo);
return vo;
}
public ResultBean<String> getVinSidByConSid(String contractNo, String vinNo) {
ResultBean<String> rb = ResultBean.fireFail();
String vinSid = baseMapper.getVinsidByConSid(contractNo, vinNo);
if (StringUtils.isBlank(vinSid)) {
return rb.setData("");
}
return rb.success().setData(vinSid);
}
}

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

@ -34,13 +34,11 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commonappendix.*;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
@ -111,15 +109,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
qw.eq("useOrgSid", query.getUseOrgSid());
if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
@ -138,6 +135,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (StringUtils.isNotBlank(query.getState())) {
if ("0".equals(query.getState())) {
qw.eq("pushMessgae", 0);
if (StringUtils.isNotBlank(query.getCreateBySid())) {
qw.eq("createBySid", query.getCreateBySid());
}
}
}
return qw;
@ -215,7 +215,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("请上传汇款确认书附件");
}
//款项申请主表sid
String sid1 = finCollectionConfirmation.getSid();
String sid = finCollectionConfirmation.getSid();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
// finCollectionConfirmation.setSid(sid1);
String payFilePath = "";
@ -250,7 +250,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String s = commonAppendixDto.getFilePath();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid1);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setFilePath(s);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
@ -265,23 +265,40 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String s = commonAppendixDto.getFilePath();
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s = s.replace(fileUploadComponent.getUrlPrefix(), "");
commonAppendixDto.setLinkSid(sid1);
commonAppendixDto.setLinkSid(sid);
commonAppendixDto.setFilePath(s);
commonAppendixDto.setCreateBySid(dto.getStaffSid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
}
remFilePath += s + ",";
}
finCollectionConfirmation.setRemittanceConfirmationUrl(remFilePath.substring(0, remFilePath.length() - 1));
for (FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto : finSelectedReceivablesDetailedDtos) {
//已选
FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
BeanUtil.copyProperties(finSelectedReceivablesDetailedDto, finSelectedReceivablesDetailed);
finSelectedReceivablesDetailed.setCollSid(sid1);
//主表sid
finSelectedReceivablesDetailed.setCollSid(sid);
//设置审核状态为待审核
finSelectedReceivablesDetailed.setAuditState(1);
finSelectedReceivablesDetailed.setUseOrgSid(useOrgSid);
finSelectedReceivablesDetailedService.save(finSelectedReceivablesDetailed);
//添加已选车架号为临时状态
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getCode());
baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.FIN_PAYMENT.getRemarks());
baseVehicleTempstateDto.setTempKey("1");
baseVehicleTempstateDto.setTempValue("待审核");
baseVehicleTempstateDto.setBusSid(sid);
//根据合同编号和车架号查询该合同的车辆sid
ResultBean<String> resultBean = busSalesOrderFeign.getVinSidByConSid(finSelectedReceivablesDetailedDto.getContractNo(), finSelectedReceivablesDetailedDto.getVIN());
if (resultBean.getSuccess()) {
baseVehicleTempstateDto.setVehSid(resultBean.getData());
}
ResultBean vehicleStateResult = baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
//已选应收款项-车架号
String vin = finSelectedReceivablesDetailed.getVIN();
/* String vin = finSelectedReceivablesDetailed.getVIN();
//已选应收款项-应收项目名称
String receivablesName = finSelectedReceivablesDetailed.getReceivablesName();
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
@ -299,9 +316,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());*/
}
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid1);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
BigDecimal totalSubscriptionMone = new BigDecimal(0);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
@ -309,11 +326,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
//收款金额
BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
if (subtract.compareTo(BigDecimal.ZERO) < 0) {
// BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
/* if (subtract.compareTo(BigDecimal.ZERO) < 0) {
return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
}
finCollectionConfirmation.setBalance(subtract);
}*/
finCollectionConfirmation.setBalance(collectionMoney);
finCollectionConfirmation.setAuditState(1);
finCollectionConfirmation.setPaymentState(1);
save(finCollectionConfirmation);
@ -324,13 +341,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean rb = ResultBean.fireFail();
FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = new FinCollectionConfirmationDetailsVo();
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
ArrayList<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
ArrayList<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl();
String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();
String[] split1 = remittanceConfirmationUrl.split(",");
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs = new ArrayList<>();
List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs = new ArrayList<>();
/* String paymentVoucherUrl = finCollectionConfirmation.getPaymentVoucherUrl();
String remittanceConfirmationUrl = finCollectionConfirmation.getRemittanceConfirmationUrl();*/
/* String[] split1 = remittanceConfirmationUrl.split(",");
String[] split = paymentVoucherUrl.split(",");
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDetailsVo);
for (String s : split) {
@ -342,9 +359,22 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BeanUtil.copyProperties(data, paymentVoucherAppendixVo);
paymentVoucherAppendixVo.setFilePath(filePath);
paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
}*/
CommonAppendixSelectQuery commonAppendixSelectQuery = new CommonAppendixSelectQuery();
commonAppendixSelectQuery.setLinkSid(sid);
//打款凭证附件
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
ResultBean<List<CommonAppendixVo>> listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
if (listResultBean.getSuccess()) {
for (CommonAppendixVo commonApp : listResultBean.getData()) {
FinCollectionConfirmationAppendixVo paymentVoucherAppendixVo = new FinCollectionConfirmationAppendixVo();
commonApp.setFilePath(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath());
BeanUtil.copyProperties(commonApp, paymentVoucherAppendixVo);
paymentVoucherAppendixs.add(paymentVoucherAppendixVo);
}
}
finCollectionConfirmationDetailsVo.setPaymentVoucherAppendixs(paymentVoucherAppendixs);
for (String s : split1) {
/* for (String s : split1) {
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(s);
CommonAppendixVo data = commonAppendixVoResultBean.getData();
String filePath = data.getFilePath();
@ -353,6 +383,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
BeanUtil.copyProperties(data, remittanceConfirmationAppendixVo);
remittanceConfirmationAppendixVo.setFilePath(filePath);
remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
}*/
commonAppendixSelectQuery = new CommonAppendixSelectQuery();
commonAppendixSelectQuery.setLinkSid(sid);
//打款凭证附件
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
if (listResultBean.getSuccess()) {
for (CommonAppendixVo commonApp : listResultBean.getData()) {
FinCollectionConfirmationAppendixVo remittanceConfirmationAppendixVo = new FinCollectionConfirmationAppendixVo();
commonApp.setFilePath(fileUploadComponent.getUrlPrefix() + commonApp.getFilePath());
BeanUtil.copyProperties(commonApp, remittanceConfirmationAppendixVo);
remittanceConfirmationAppendixs.add(remittanceConfirmationAppendixVo);
}
}
finCollectionConfirmationDetailsVo.setRemittanceConfirmationAppendixs(remittanceConfirmationAppendixs);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(sid);
@ -795,14 +838,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
int auditState = 1;
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
String vin = finSelectedReceivablesDetailedVo.getVIN();
//更新审核时间
finSelectedReceivablesDetailedService.updateAuditDateBySid(finSelectedReceivablesDetailedVo.getSid(), "2");
/* String vin = finSelectedReceivablesDetailedVo.getVIN();
String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
String sid1 = finUncollectedReceivablesDetailedVo.getSid();
BigDecimal currentReceivableMoney = new BigDecimal(finUncollectedReceivablesDetailedVo.getCurrentReceivableMoney());
String curRecMoney = String.valueOf(currentReceivableMoney.add(subscriptionMoney));
finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);
finUncollectedReceivablesDetailedService.updateCurRecMoneyBySid(curRecMoney, sid1);*/
}
FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
@ -810,6 +855,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
FinCollectionConfirmationDto finCollectionConfirmationDto = new FinCollectionConfirmationDto();
BeanUtil.copyProperties(finCollectionConfirmation, finCollectionConfirmationDto);
updateBySid(finCollectionConfirmationDto, finCollectionConfirmationDto.getSid());
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
return rb.success().setMsg("驳回成功");
}
@ -817,27 +864,38 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean rb = ResultBean.fireFail();
baseMapper.cashierConfirm(sid);
int auditState = 1;
//总共认款金额
BigDecimal totalSubscriptionMoney = new BigDecimal(0);
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByAuditState(sid, auditState);
for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
String sid1 = finSelectedReceivablesDetailedVo.getSid();
finSelectedReceivablesDetailedService.cashierConfirm(sid1);
finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1);
// finSelectedReceivablesDetailedService.cashierConfirm(sid1);
//更新审核时间
finSelectedReceivablesDetailedService.updateAuditDateBySid(sid1, "3");
//认款金额
BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
totalSubscriptionMoney = totalSubscriptionMoney.add(subscriptionMoney);
String vin = finSelectedReceivablesDetailedVo.getVIN();
String receivablesName = finSelectedReceivablesDetailedVo.getReceivablesName();
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
String sid2 = finUncollectedReceivablesDetailedVo.getSid();
String useOrgSid = finSelectedReceivablesDetailedVo.getUseOrgSid();
// FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecName(vin, receivablesName);
FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo = finUncollectedReceivablesDetailedService.fetchByVinAndRecNameOrgSid(vin, receivablesName, useOrgSid);
// String sid2 = finUncollectedReceivablesDetailedVo.getSid();
//应收未收款项-当前应收金额
BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getCurrentReceivableMoney());
//已选应收款项-认款金额
BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
if (subtract.compareTo(BigDecimal.ZERO) == 0) {
finUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
FinUncollectedReceivablesDetailedDto finUncollectedReceivablesDetailedDto = new FinUncollectedReceivablesDetailedDto();
BeanUtil.copyProperties(finUncollectedReceivablesDetailedVo, finUncollectedReceivablesDetailedDto);
finUncollectedReceivablesDetailedService.updateBySid(finUncollectedReceivablesDetailedDto, finUncollectedReceivablesDetailedDto.getSid());
/* if (subtract.compareTo(BigDecimal.ZERO) == 0) {
int subscriptionState = 3;
finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
} else {
int subscriptionState = 2;
finUncollectedReceivablesDetailedService.updateSubscriptionStateBySid(sid2, subscriptionState);
}
}*/
}
/* FinCollectionConfirmation finCollectionConfirmation = fetchBySid(sid);
BigDecimal collectionMoney = finCollectionConfirmation.getCollectionMoney();
@ -849,6 +907,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
int paymentState = 2;
baseMapper.updatePaymentStateBySid(sid, paymentState);
}*/
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
return rb.success().setMsg("款项确认成功");
}

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

@ -93,8 +93,8 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
List<FinSelectedReceivablesDetailedVo> selectDetailedGroupConAndRecAndPay();
@Update("update fin_selected_receivables_detailed set auditDate = NOW() where sid = #{sid1}")
void updateAuditDateBySid(String sid1);
@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);

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

@ -200,8 +200,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
return baseMapper.selectDetailedGroupConAndRecAndPay();
}
public void updateAuditDateBySid(String sid1) {
baseMapper.updateAuditDateBySid(sid1);
public void updateAuditDateBySid(String sid1,String auditState) {
baseMapper.updateAuditDateBySid(sid1,auditState);
}
public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {

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

@ -66,6 +66,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
List<FinUncollectedReceivablesDetailedVo> selectListVo();
FinUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName);
FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(@Param("vin") String vin, @Param("receivablesName") String receivablesName,@Param("useOrgSid")String useOrgSid);
@Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}")
void updateCurRecMoneyBySid(@Param("curRecMoney") String curRecMoney, @Param("sid") String sid);

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

@ -27,6 +27,14 @@
AND receivablesName = #{receivablesName}
</select>
<select id="fetchByVinAndRecNameOrgSid"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
SELECT *
FROM fin_uncollected_receivables_detailed
WHERE VIN = #{vin}
AND receivablesName = #{receivablesName} and useOrgSid = #{useOrgSid}
</select>
<select id="selectGroupConAndRecAndPay"
resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
SELECT receivablesName,

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

@ -168,6 +168,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
return baseMapper.fetchByVinAndRecName(vin, receivablesName);
}
public FinUncollectedReceivablesDetailedVo fetchByVinAndRecNameOrgSid(String vin, String receivablesName,String useOrgSid) {
return baseMapper.fetchByVinAndRecNameOrgSid(vin, receivablesName,useOrgSid);
}
public void updateCurRecMoneyBySid(String curRecMoney, String sid) {
baseMapper.updateCurRecMoneyBySid(curRecMoney, sid);
}

Write Preview
Loading…
Cancel
Save