修复bug

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/controller/PaymentController.java

@@ -69,12 +69,12 @@ public class PaymentController {
      */
     @PostMapping("maintenance/detail")
     @Validation(fields = {"mtCompanyId", "id"})
-    public RestResponse maintenanceDetail(@Val @RequestBody PaymentRequest request){
+    public RestResponse maintenanceDetail(@Val @RequestBody PaymentRequest request) {
         PaymentResponse response = paymentService.maintenanceDetail(request);
-       if (ObjectUtil.isEmpty(response)){
-           return RestResponse.success();
-       }
-       return RestResponse.success(response, MessageUtils.get("msg.query.detail.success"));
+        if (ObjectUtil.isEmpty(response)) {
+            return RestResponse.success();
+        }
+        return RestResponse.success(response, MessageUtils.get("msg.query.detail.success"));
     }
 
     /**
@@ -85,9 +85,9 @@ public class PaymentController {
      */
     @PostMapping("capital/detail")
     @Validation(fields = {"mtCompanyId", "id"})
-    public RestResponse capitalDetail(@Val @RequestBody PaymentRequest request){
+    public RestResponse capitalDetail(@Val @RequestBody PaymentRequest request) {
         PaymentResponse response = paymentService.capitalDetail(request);
-        if (ObjectUtil.isEmpty(response)){
+        if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
         }
         return RestResponse.success(response, MessageUtils.get("msg.query.detail.success"));

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/PaymentService.java

@@ -132,7 +132,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
     }
 
     private String formatPaymentContent(Payment payment) {
-        return String.format("应收：%.2f, 实收：%.2f, 开票：%.2f", payment.getPlanMoney(), payment.getWorkMoney(), payment.getAmountInvoice());
+        return String.format("应收：%.2f, 实收：%.2f, 开票：%.2f,票据：%s", payment.getPlanMoney(), payment.getWorkMoney(), payment.getAmountInvoice(),payment.getNoteImgUrl());
     }
 
     /**
@@ -143,16 +143,27 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
      * @date 2020/4/29 2:11 下午
      */
     public RestResponse modifyPayment(Collection<Payment> oldPaymentList, List<Payment> paymentList) {
+        /**
+         * 修改的list
+         */
         List<Payment> updateList = new ArrayList<>();
+        /**
+         * 删除的list
+         */
         List<Payment> deleteList = new ArrayList<>();
         /**
          * 付款操作记录
          */
         List<PaymentHistory> histories = new ArrayList<>();
-        //新增付款项
+
+        /**
+         * 新增的list
+         */
         List<Payment> insertList = paymentList.stream().filter(entry -> Objects.isNull(entry.getId())).collect(Collectors.toList());
 
+
         if (IterUtil.isNotEmpty(insertList)) {
+
             for (Payment payment : insertList) {
                 /**
                  * 付款操作记录
@@ -183,7 +194,14 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
                 history.setBeforeContent(before);
                 history.setOperatorId(10000L);
                 history.setOperateDate(LocalDateTime.now());
+
+                /**
+                 * stream():将集合转换成流
+                 * filter():过滤集合对象
+                 */
                 Optional<Payment> newPayment = paymentList.stream().filter(entry -> payment.getId().equals(entry.getId())).findFirst();
+
+
                 if (newPayment.isPresent()) {
                     history.setDescription("修改收费项");
                     Payment p = newPayment.get();
@@ -205,6 +223,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
             boolean deleteResult = removeByIds(deleteList.stream().map(Payment::getId).collect(Collectors.toList()));
             if (!deleteResult) return RestResponse.fail(MessageUtils.get("msg.delete.batch.fail"));
         }
+
         if (CollUtil.isNotEmpty(updateList)) {
             boolean updateResult = updateBatchById(updateList, updateList.size());
             if (!updateResult) {
@@ -212,6 +231,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
                 return RestResponse.fail(MessageUtils.get("msg.modify.batch.fail"));
             }
         }
+
         if (CollUtil.isNotEmpty(insertList)) {
             boolean save = saveBatch(insertList, insertList.size());
             if (!save) {
@@ -219,6 +239,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
                 return RestResponse.fail(MessageUtils.get("msg.add.batch.fail"));
             }
         }
+
         boolean history = paymentHistoryService.saveBatch(histories, histories.size());
         if (!history) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -252,8 +273,16 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
          */
         Collection<Payment> oldPaymentList = paymentList(paymentIdList);
 
+
+
+        /**
+         * 获得payment对应的id
+         */
         Long contractsId = paymentList.get(0).getContractsId();
 
+
+
+
         //设置合同付款的合同id
         paymentList.forEach(entry -> {
             entry.setContractsId(contractsId);
@@ -261,6 +290,7 @@ public class PaymentService extends ServiceImpl<PaymentMapper, Payment> {
             entry.setType(request.getContractType());
         });
 
+
         Contracts contracts = contractService.getOne(contractsId);
 
         if (Objects.nonNull(contracts)) {