From 6cbdbaeaaaed0f1d75a11155eeb2e4b30ddae708 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sat, 26 Dec 2020 15:52:20 +0800 Subject: [PATCH] . --- .../java/com/cowr/ssjygl/customer/CustomerService.java | 8 ++++++++ .../prepay/refunddetail/RefundDetailSyncService.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java index 138c58b..02b369d 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/CustomerService.java @@ -7,7 +7,9 @@ import com.cowr.common.view.PageParam; import com.cowr.common.view.Result; import com.cowr.model.Customer; import com.cowr.model.CustomerReceiver; +import com.cowr.model.PrepayCustomer; import com.cowr.model.Sysuser; +import com.cowr.ssjygl.prepay.prepaycustomer.PrepayCustomerService; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Page; @@ -51,6 +53,12 @@ public class CustomerService extends BaseService { out.set("receiver_address", receiver.getAddress()); } + PrepayCustomer prepayCustomer = PrepayCustomerService.me.getPrepayCustomer(id); + + if (prepayCustomer != null) { + out.set("surplus", prepayCustomer.getSurplus()); + } + return Result.success(out); } diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java index 6e8c062..2529af1 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/prepay/refunddetail/RefundDetailSyncService.java @@ -223,7 +223,7 @@ public class RefundDetailSyncService extends BaseSyncService { return Result.failed("未找到客户预付费信息"); } - if (prepayCustomer.getSurplus() == null || amount.compareTo(prepayCustomer.getSurplus()) >= 0) { + if (prepayCustomer.getSurplus() == null || amount.subtract(prepayCustomer.getSurplus()).compareTo(new BigDecimal("0")) < 0) { return Result.failed("退费金额不能大于账户余额"); }