diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index e66a8dcc5..fbdfcfb01 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index efd9b7078..4b445c124 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -51,6 +51,6 @@ public interface WxBillAllMapper { Map getReceiveAndPayBillDetail(WxBillAll record); - List> allDepositList(WxBillAll wxBillAll); + List allDepositList(WxBillAll wxBillAll); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 64a6c6751..c1444014a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -4,6 +4,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillSettle; import com.iformall.domain.vo.WxBillAll; +import com.iformall.domain.vo.WxBillAllVo; import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.domain.vo.WxBillExcelTemplateOther; import com.iformall.enums.EnumBillAction; @@ -18,7 +19,7 @@ import java.util.Map; */ public interface WxBillAllService { - List> allDepositList(WxBillAll wxBillAll); + List allDepositList(WxBillAll wxBillAll); Map listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 9725055b4..f67e368e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -159,7 +159,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) { if (e.getReceivePay() != null) { - if (e.getLatePayPrice() == null) e.setLatePayPrice(0L); + if (e.getLatePayPrice() == null) { + e.setLatePayPrice(0L); + } BigDecimal servicePay; if (e.getServiceChargePay() != null) { servicePay = new BigDecimal(e.getServiceChargePay()); @@ -169,6 +171,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); e.setRealReceivePay(realReceivePay); e.setServiceChargePay(servicePay.intValue()); + e.setOwe(realReceivePay - e.getPay()); } } @@ -1848,7 +1851,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { } @Override - public List> allDepositList(WxBillAll wxBillAll) { - return wxBillAllMapper.allDepositList(wxBillAll); + public List allDepositList(WxBillAll wxBillAll) { + WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId()); + List wxBillAllVos = wxBillAllMapper.allDepositList(wxBillAll); + wxBillAllVos.stream().forEach(e -> { + cmputeTotalMoney(wxPayAccountBill, e); + }); + return wxBillAllVos; } } diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index ced1a42fe..6153441b8 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -858,8 +858,8 @@ limit #{limitStart},#{limitEnd} - - select bill.* from ( select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金'