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

客户账单明细，优化下载按钮显示逻辑

master
fanzongzhe 1 year ago
parent
9db4f6cc86
commit
44c81da498
5 changed files with 55 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
  2. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
  3. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
  4. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java
  5. 61
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java
View File

@ -53,4 +53,8 @@ public interface BaseVehicleStateFeign {
ResultBean updateManageState(@RequestParam("busVinSid") String busSid);
@PostMapping("selectOneByBusSidAndOrderSid")
@ResponseBody
ResultBean<BaseVehicleState> selectOneByBusSidAndOrderSid(@RequestParam("busSid") String busSid,@RequestParam("orderSid") String orderSid);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java
View File

@ -25,11 +25,14 @@ public interface BaseVehicleStateMapper extends BaseMapper<BaseVehicleState> {
BaseVehicleState selectOneQKKPByBusSid(String sid);
BaseVehicleState selectByBusSid(String busSid);
List<String> selectBusSidListByBusState(String busState);
List<String> selectBusSidListByBusState(String busState);
int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState);
int updateManageState(String busSid);
@Select(" SELECT * FROM base_vehicle_state WHERE busSid = #{busSid} AND saleOrderSid = #{orderSid}")
BaseVehicleState selectOneByBusSidAndOrderSid(@Param("busSid") String busSid, @Param("orderSid") String orderSid);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java
View File

@ -60,5 +60,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign {
return baseVehicleStateService.updateManageState(busSid);
}
@Override
public ResultBean<BaseVehicleState> selectOneByBusSidAndOrderSid(String busSid, String orderSid) {
return baseVehicleStateService.selectOneByBusSidAndOrderSid(busSid,orderSid);
}
}

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

@ -230,4 +230,10 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
int i = baseMapper.updateManageState(busSid);
return rb.success();
}
public ResultBean<BaseVehicleState> selectOneByBusSidAndOrderSid(String busSid, String orderSid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleState baseVehicleState = baseMapper.selectOneByBusSidAndOrderSid(busSid,orderSid);
return rb.success().setData(baseVehicleState);
}
}

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

@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
@ -124,7 +126,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
private FinCompanyInvoicingService finCompanyInvoicingService;
@Autowired
private FinVehicleInvoiceService finVehicleInvoiceService;
@Autowired
private BaseVehicleStateFeign baseVehicleStateFeign;
@Autowired
private FinFundsCarriedForwardApplyService finFundsCarriedForwardApplyService;
@ -506,33 +509,41 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts()))
|| (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium()))
|| (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle()))) {
List<String> sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo());
List<BigDecimal> noSubscriptionMoneyList = new ArrayList<>();
List<Integer> noSubscriptionMoneyCheckList = new ArrayList<>();
if (null != sidList) {
for (String s : sidList) {
FinUncollectedReceivablesDetailed detailed = fetchBySid(s);
List<FinSelectedReceivablesDetailed> detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData();
BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN);
for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) {
BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney();
sumCheck = sumCheck.add(subscriptionMoney);
BaseVehicleState vehicleState = baseVehicleStateFeign.selectOneByBusSidAndOrderSid(record.getBusVinSid(),salesOrderSid).getData();
if (null != vehicleState) {
if (StringUtils.isNotBlank(vehicleState.getFinState())) {
if (vehicleState.getFinState().equals("1")) {
record.setDownload(true);
}
BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney());
BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck);
noSubscriptionMoneyList.add(noSubscriptionMoneyCheck);
}
if (null != noSubscriptionMoneyList) {
for (BigDecimal money : noSubscriptionMoneyList) {
if (money.compareTo(BigDecimal.ZERO) > 0) {
noSubscriptionMoneyCheckList.add(1);
}
}
}
if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) {
record.setDownload(true);
}
}
// List<String> sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo());
// List<BigDecimal> noSubscriptionMoneyList = new ArrayList<>();
// List<Integer> noSubscriptionMoneyCheckList = new ArrayList<>();
// if (null != sidList) {
// for (String s : sidList) {
// FinUncollectedReceivablesDetailed detailed = fetchBySid(s);
// List<FinSelectedReceivablesDetailed> detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData();
// BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN);
// for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) {
// BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney();
// sumCheck = sumCheck.add(subscriptionMoney);
// }
// BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney());
// BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck);
// noSubscriptionMoneyList.add(noSubscriptionMoneyCheck);
// }
// if (null != noSubscriptionMoneyList) {
// for (BigDecimal money : noSubscriptionMoneyList) {
// if (money.compareTo(BigDecimal.ZERO) > 0) {
// noSubscriptionMoneyCheckList.add(1);
// }
// }
// }
// if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) {
// record.setDownload(true);
// }
// }
}
}
}

Write Preview
Loading…
Cancel
Save