合并提交还款管理

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/RepaymentController.java

@@ -55,11 +55,11 @@ public class RepaymentController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<RepaymentDto> save(@RequestBody RepaymentDto model) {
-        model = repaymentService.add(model);
-        return ResponseHelper.buildResponse(model);
+    @PostMapping(value = "/addOrUpdate")
+    @ApiOperation(httpMethod = "POST", value = "新增或编辑", notes = "新增或编辑")
+    public ResponseModel<RepaymentDto> addOrUpdate(@RequestBody RepaymentDto model) {
+        repaymentService.addOrUpdate(model);
+        return ResponseHelper.buildResponse(null);
     }
 
     /**

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java

@@ -241,26 +241,28 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
 
     }
 
+
     @Transactional(rollbackFor = Exception.class)
-    public RepaymentDto add(RepaymentDto model) {
-        model.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
-        model.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
-        model.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
+    public void updateBySequenceNbr(Repayment model) {
         PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(model.getRegionalCompaniesCode());
         if (Objects.nonNull(privilegeCompany)) {
             model.setCompanyId(privilegeCompany.getSequenceNbr());
             model.setCompanyName(privilegeCompany.getCompanyName());
         }
-        return this.createWithModel(model);
+        this.updateById(model);
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void updateBySequenceNbr(Repayment model) {
+    public void addOrUpdate(RepaymentDto model) {
+        model.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
+        model.setMessageState(RepaymentMessageStateEnum.UN_CONFIRM.getCode());
+        model.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
         PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(model.getRegionalCompaniesCode());
         if (Objects.nonNull(privilegeCompany)) {
             model.setCompanyId(privilegeCompany.getSequenceNbr());
             model.setCompanyName(privilegeCompany.getCompanyName());
         }
-        this.updateById(model);
+        Repayment repayment = BeanUtil.copyProperties(model, Repayment.class);
+        this.saveOrUpdate(repayment);
     }
 }