diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java index bb56f47f99..dde68fc9b4 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java @@ -96,4 +96,11 @@ public class FinPaymentapply extends BaseEntity { @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty("是否涉及车辆,1是,0否") + private String isVeh; + @ApiModelProperty("付款明细合计") + private BigDecimal paymentTotal; + @ApiModelProperty("车辆金额合计") + private BigDecimal carTotal; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java index 3e08b2f0c4..8bd8bfad50 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java @@ -109,7 +109,7 @@ public interface FinPaymentapplyFeign { @PostMapping(value = "/breakProcess") public ResultBean breakProcess(@Valid @RequestBody FinPayTaskQuery query); - @ApiOperation(value = "终止任务") + @ApiOperation(value = "移动端详情") @GetMapping(value = "/getPaymentApply/{sid}") ResultBean getPaymentApply(@PathVariable("sid") String sid); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java index 29a90ae04e..7d3afed62a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetails/FinPaymentapplyDetailDto.java @@ -28,4 +28,7 @@ public class FinPaymentapplyDetailDto implements Dto { private String receivingAccount; @ApiModelProperty("付款金额") private String payAccount; + + @ApiModelProperty("备注") + private String remarks; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 6241d85f1d..c1dc8409bd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -74,6 +74,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -160,13 +161,16 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); - finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); if ("1".equals(dto.getIsVeh())) { List vehicleDtoList = dto.getVehicleList(); - finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + finPaymentapply.setCarTotal(new BigDecimal(j)); } + finPaymentapply.setPaymentTotal(new BigDecimal(i)); + baseMapper.insert(finPaymentapply); dtoSid = finPaymentapply.getSid(); } else { FinPaymentapply finPaymentapply = fetchBySid(dtoSid); @@ -174,15 +178,18 @@ public class FinPaymentapplyService extends MybatisBaseService detailsList = dto.getDetailsList(); - finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); + String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid()); if ("1".equals(dto.getIsVeh())) { List vehicleDtoList = dto.getVehicleList(); - finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid()); + finPaymentapply.setCarTotal(new BigDecimal(j)); } else { finPaymentapplyVehicleService.deleteVehicle(dtoSid); } + finPaymentapply.setPaymentTotal(new BigDecimal(i)); + baseMapper.updateById(finPaymentapply); } return rb.success().setData(dtoSid); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java index 0b4f617272..f2aac89444 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsService.java @@ -22,16 +22,19 @@ public class FinPaymentapplyDetailsService extends MybatisBaseService detailsList, String sid) { + public String saveDetailsList(List detailsList, String sid) { //删除 baseMapper.deleteDetail(sid); + BigDecimal bigDecimal = new BigDecimal("0"); for (FinPaymentapplyDetailDto dto : detailsList) { FinPaymentapplyDetails finPaymentapplyDetails = new FinPaymentapplyDetails(); BeanUtil.copyProperties(dto, finPaymentapplyDetails, "sid"); finPaymentapplyDetails.setApplySid(sid); + bigDecimal = bigDecimal.add(new BigDecimal(dto.getPayAccount())); finPaymentapplyDetails.setPayAccount(new BigDecimal(dto.getPayAccount())); baseMapper.insert(finPaymentapplyDetails); } + return bigDecimal.toString(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java index 6d1d06f36f..fdc41e65ac 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyvehicle/FinPaymentapplyVehicleService.java @@ -6,7 +6,6 @@ import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicle; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto; import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo; import com.yxt.common.base.service.MybatisBaseService; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -23,14 +22,17 @@ public class FinPaymentapplyVehicleService extends MybatisBaseService vehicleDtoList, String sid) { + public String saveVehicleList(List vehicleDtoList, String sid) { baseMapper.deleteVehicle(sid); + BigDecimal bigDecimal = new BigDecimal("0"); for (FinPaymentapplyVehicleDto dto : vehicleDtoList) { FinPaymentapplyVehicle finPaymentapplyVehicle = new FinPaymentapplyVehicle(); BeanUtil.copyProperties(dto, finPaymentapplyVehicle, "sid"); finPaymentapplyVehicle.setMoney(new BigDecimal(dto.getMoney())); + bigDecimal = bigDecimal.add(new BigDecimal(dto.getMoney())); baseMapper.insert(finPaymentapplyVehicle); } + return bigDecimal.toString(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java index 4c30586f70..7514c2c8df 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyFeign.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; fallback = PaymentApplyFeignFallback.class) public interface PaymentApplyFeign { - @ApiOperation("办理") + @ApiOperation("详情") @GetMapping("/getPaymentApply/{sid}") @ResponseBody ResultBean getPaymentApply(@PathVariable("sid") String sid); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java index 5b4b5c0d3d..c67c15de15 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java @@ -21,10 +21,10 @@ public class PaymentApplyVo implements Vo { @JsonProperty("paymentName") private String costTitleValue; //创建时间 - @JsonProperty("申请时间") + @JsonProperty("applyDate") private String createTime; //申请人 - @JsonProperty("申请人") + @JsonProperty("applyName") private String name; //款项类别 @JsonProperty("paymentType") @@ -45,9 +45,9 @@ public class PaymentApplyVo implements Vo { @JsonProperty("paymentRemarks") private String remarks; //是否涉及车辆 - @JsonProperty("involveCar") - private String isVeh; @JsonProperty("involveCarKey") + private String isVeh; + @JsonProperty("involveCar") private String isVehValue; //付款明细List private List paymentList = new ArrayList<>();