Browse Source

优化

master
God 2 years ago
parent
commit
12af4bb0eb
  1. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java
  2. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
  3. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java
  4. 6
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvalcustfiling/BusValcustFilingDetailsVo.java

@ -81,6 +81,10 @@ public class BusValcustFilingDetailsVo implements Vo {
private String isGdk;
@ApiModelProperty("加装配置/销售让利金额")
private String money; // 加装配置/销售让利金额
@ApiModelProperty("合计加装配置/销售让利金额")
private String totalMoney; // 合计加装配置/销售让利金额
@ApiModelProperty("台数")
private String num;
@ApiModelProperty("应收手续费")
private String ysMoney; // 应收手续费
@ApiModelProperty("实收手续费")

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@ -317,6 +317,8 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
shortVinNo = shortVinNo + no.substring(no.length() - 8) + ",";
}
vo.setVinNo(shortVinNo.substring(0, shortVinNo.lastIndexOf(",")));
vo.setTotalMoney(new BigDecimal(entity.getMoney()).multiply(new BigDecimal(vinNos.length)).toString());
vo.setNum(String.valueOf(vinNos.length));
List<BusFileDto> busFileDtos = busFileService.getPathByLinkSid(sid);
List<String> fjImages = new ArrayList<>();
for (BusFileDto busFileDto : busFileDtos) {

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/valcustfiling/AppValcustFilingDetailsVo.java

@ -82,6 +82,12 @@ public class AppValcustFilingDetailsVo implements Vo {
private String money;
@ApiModelProperty("加装配置/销售让利名称")
private String moneyName;
@ApiModelProperty("合计加装配置/销售让利金额")
private String totalMoney;
@ApiModelProperty("合计加装配置/销售让利名称")
private String totalMoneyName;
@ApiModelProperty("台数")
private String num;
@ApiModelProperty("应收手续费")
private String ysMoney; // 应收手续费
@ApiModelProperty("实收手续费")

6
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/valcustfiling/AppValcustFilingService.java

@ -100,9 +100,11 @@ public class AppValcustFilingService {
BeanUtil.copyProperties(busValcustFilingDetailsVo, vo);
vo.setProcInsId(busValcustFilingDetailsVo.getProcInstId());
if ("0".equals(busValcustFilingDetailsVo.getIsGdk())){
vo.setMoneyName("加装配置金额(元):");
vo.setMoneyName("单台加装配置金额(元):");
vo.setTotalMoneyName("合计加装配置金额(元):");
}else {
vo.setMoneyName("销售让利金额(元):");
vo.setMoneyName("单台销售让利金额(元):");
vo.setTotalMoneyName("合计销售让利金额(元):");
}
return rb.success().setData(vo);
}

Loading…
Cancel
Save