diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index a9c6fc03..55189b42 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -196,7 +196,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl addAmountReceived(@RequestBody PayPaymentRecord payPaymentRecord) { - return payPaymentRecordService.addAmountReceived(payPaymentRecord); + public Result addAmountReceived(@RequestBody List list) { + try{ + payPaymentRecordService.addAmountReceived(list); + }catch (Exception e){ + log.error("添加来款异常",e); + return Result.error(e.getMessage()); + } + return Result.OK("操作成功"); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java index c3f97308..f5a6a7cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java @@ -29,9 +29,15 @@ public interface IPayPaymentRecordService extends IService { /** * 添加来款 + * @param list + */ + void addAmountReceived(List list); + + /** + * 添加一个来款 * @param payPaymentRecord */ - Result addAmountReceived(PayPaymentRecord payPaymentRecord); + void addOneAmountReceived(PayPaymentRecord payPaymentRecord); /** * 标协会员添加来款 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java index 6039bed9..45322dbb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java @@ -36,6 +36,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.transaction.Transactional; +import java.beans.Transient; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -79,13 +81,23 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl list){ + for(PayPaymentRecord payPaymentRecord : list){ + addOneAmountReceived(payPaymentRecord); + } + } /** - * 添加来款记录 + * 添加一个来款记录 * @param payPaymentRecord */ @Override - public Result addAmountReceived(PayPaymentRecord payPaymentRecord){ + public void addOneAmountReceived(PayPaymentRecord payPaymentRecord){ BigDecimal receivableAmount; Boolean isAdd; @@ -112,7 +124,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl