款项确认修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java

@@ -60,9 +60,9 @@ public interface BusCollectionConfirmationFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq);
 
-    @ApiOperation("新增或修改保存")
+    @ApiOperation("新增保存")
-    @PostMapping("/saveOrUpdate")
+    @PostMapping("/save")
-    public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto);
+    public ResultBean save(@RequestBody BusCollectionConfirmationDto dto);
 
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedDto.java

@@ -69,6 +69,8 @@ public class BusSelectedReceivablesDetailedDto implements Dto {
     private String receivablesName; // 应收项目名称
 	@ApiModelProperty("当前应收金额")
     private String currentReceivableMoney; // 当前应收金额
+    @ApiModelProperty("上次认款金额")
+    private String lastSubscriptionMoney; // 上次认款金额
 	@ApiModelProperty("认款金额")
     private String subscriptionMoney; // 认款金额
 	@ApiModelProperty("认款申请日期")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java

@@ -71,10 +71,10 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
     }
 
     @Override
-    @ApiOperation("新增或修改保存")
+    @ApiOperation("新增保存")
-    @PostMapping("/saveOrUpdate")
+    @PostMapping("/save")
-    public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto) {
+    public ResultBean save(@RequestBody BusCollectionConfirmationDto dto) {
-        return busCollectionConfirmationService.saveOrUpdateAllDto(dto);
+        return busCollectionConfirmationService.saveAllDto(dto);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java

@@ -117,7 +117,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
         return p;
     }
 
-    public ResultBean saveOrUpdateAllDto(BusCollectionConfirmationDto dto) {
+    public ResultBean saveAllDto(BusCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BusCollectionConfirmation busCollectionConfirmation = new BusCollectionConfirmation();
         List<BusSelectedReceivablesDetailedDto> busSelectedReceivablesDetailedDtos = dto.getBusSelectedReceivablesDetailedDtos();
@@ -126,7 +126,6 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
         List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
         String sid1 = busCollectionConfirmation.getSid();
         String sid = dto.getSid();
-        if (StringUtils.isBlank(sid)) {//新增
         BeanUtil.copyProperties(dto, busCollectionConfirmation);
         busCollectionConfirmation.setSid(sid1);
         String payFilePath = "";
@@ -174,13 +173,13 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
             //已选应收款项-认款金额
             BigDecimal subscriptionMoney = busSelectedReceivablesDetailed.getSubscriptionMoney();
             BigDecimal subtract = currentReceivableMoney.subtract(subscriptionMoney);
-                if (subtract.compareTo(BigDecimal.ZERO) < 0){
+            if (subtract.compareTo(BigDecimal.ZERO) < 0) {
                 return rb.setMsg("认款金额超出应收金额，请重新输入");
             }
-                busUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f",subtract));
+            busUncollectedReceivablesDetailedVo.setCurrentReceivableMoney(String.format("%.0f", subtract));
             BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDto = new BusUncollectedReceivablesDetailedDto();
-                BeanUtil.copyProperties(busUncollectedReceivablesDetailedVo,busUncollectedReceivablesDetailedDto);
+            BeanUtil.copyProperties(busUncollectedReceivablesDetailedVo, busUncollectedReceivablesDetailedDto);
-                busUncollectedReceivablesDetailedService.updateBySid(busUncollectedReceivablesDetailedDto,busUncollectedReceivablesDetailedDto.getSid());
+            busUncollectedReceivablesDetailedService.updateBySid(busUncollectedReceivablesDetailedDto, busUncollectedReceivablesDetailedDto.getSid());
         }
         List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid1);
         BigDecimal totalSubscriptionMone = null;
@@ -190,23 +189,13 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
         }
         BigDecimal collectionMoney = busCollectionConfirmation.getCollectionMoney();
         BigDecimal subtract = collectionMoney.subtract(totalSubscriptionMone);
-            if (subtract.compareTo(BigDecimal.ZERO) < 0){
+        if (subtract.compareTo(BigDecimal.ZERO) < 0) {
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
         }
         busCollectionConfirmation.setBalance(totalSubscriptionMone);
         save(busCollectionConfirmation);
         return rb.success().setMsg("添加成功");
     }
-        updateBySid(dto, sid);
-        busSelectedReceivablesDetailedService.deleteByCollSid(sid);
-        for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
-            BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
-            BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed);
-            busSelectedReceivablesDetailed.setCollSid(sid);
-            busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
-        }
-        return rb.success().setMsg("修改成功");
-    }
 
     public ResultBean<BusCollectionConfirmationDetailsVo> fetchByAllSid(String sid) {
         ResultBean rb = ResultBean.fireFail();