diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index fc3a8ad60..23a99c198 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -1,5 +1,6 @@ package com.iformall.controller.rent; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; @@ -51,6 +52,20 @@ public class WxBillRentController extends BaseController { final PageInfo page = wxBillRentService.listAsPage(wxBillRent, pageNum, pageSize); return new ResultData(page); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillRent wxBillRent) { + if (StringUtils.isBlank(wxBillRent.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillRent.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillRent.setFloorForRule(dataRule.getFloorIds()); + wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillRentService.getBillMonthSum(wxBillRent)); + } @PostMapping("add") @SystemControllerLog(description = "租赁押金账单-新增") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 2e87c2f7a..03fd65189 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -34,15 +34,18 @@ public class WxBillRent extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; - @io.swagger.annotations.ApiModelProperty(value="应收金额",name="receivePay") + @io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay") + private String needPay; + + @io.swagger.annotations.ApiModelProperty(value="实际应收金额(做了减免之后和need可能不一样)",name="receivePay") private String receivePay; // public String getReceivePayStr() { // return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); // } - @TableField(exist = false) - private String receivePayStr; +// @TableField(exist = false) +// private String receivePayStr; // public String getPayStr() { // return new BigDecimal(pay == null ? 0 : pay).divide(new BigDecimal(100)).toPlainString(); @@ -56,13 +59,25 @@ public class WxBillRent extends TenantEntity { private String pay; @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13") - @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") + @io.swagger.annotations.ApiModelProperty(value="收款截止日期,过了有手续费",name="receiveDate") private Date receiveDate; + + @Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4") + @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") + private Date starttime; + + @Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5") + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") + private Date endtime; + @TableField(exist = false) + private Date endtimeBegin; + @TableField(exist = false) + private Date endtimeEnd; @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12") @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") private Date payDate; - + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") private Date createtime; @@ -130,9 +145,6 @@ public class WxBillRent extends TenantEntity { return infoStr; } - @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") - private String needPay; - @io.swagger.annotations.ApiModelProperty(value="商业管理费应收金额",name="bussinessManageFeeNeedPay") private String bussinessManageFeeNeedPay; @@ -151,18 +163,6 @@ public class WxBillRent extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") private Date updatetime; - @Excel(name = "周期开始时间", format = "yyyy-MM-dd", width = 20, orderNum = "4") - @io.swagger.annotations.ApiModelProperty(value="开始时间",name="starttime") - private Date starttime; - - @Excel(name = "周期结束时间", format = "yyyy-MM-dd", width = 20, orderNum = "5") - @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") - private Date endtime; - @TableField(exist = false) - private Date endtimeBegin; - @TableField(exist = false) - private Date endtimeEnd; - @io.swagger.annotations.ApiModelProperty(value = "租赁商铺类型", name = "rentShopType") private Integer rentShopType; @@ -283,5 +283,8 @@ public class WxBillRent extends TenantEntity { @TableField(exist = false) private List merchantIdList; + + @TableField(exist = false) + private String month; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java new file mode 100644 index 000000000..44f9ed978 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -0,0 +1,17 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; + +@Data +public class WxBillSum implements Serializable { + + private static final long serialVersionUID = 1L; + + //应收总金额 + private String needPay; + //已收总金额 + private String paid; + //欠款 + private String owe; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 4df2ec8ca..714d74fe5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -4,6 +4,8 @@ import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxBillSum; + import org.apache.ibatis.annotations.Param; import java.util.List; @@ -58,5 +60,7 @@ public interface WxBillRentMapper extends CommonMapper { void updateServiceCharge(WxPayAccountBill record); void updateOwe(); + + WxBillSum getBillMonthSum(WxBillRent wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index 5f7c27173..82ac41758 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -19,6 +19,7 @@ import java.util.Map; /** * @author gongbiao */ +@Deprecated public interface WxBillAllService { List allDepositList(WxBillAll wxBillAll); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index a92e004d8..6c5f55c7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -69,4 +70,8 @@ public interface WxBillRentService { ResultData updateLatePayStatus(WxBillRent wxBillRent); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillRent wxBillRent); + + WxBillSum getBillMonthSum(WxBillRent wxBillRent); + + } 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 d32202a9a..9312a6038 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -45,6 +45,7 @@ import java.util.stream.Collectors; /** * @author gongbiao */ +@Deprecated @Service public class WxBillAllServiceImpl implements WxBillAllService { private Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 845627f34..e21d43bad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.RatioVo; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; @@ -463,7 +464,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { excelService.exportExcel(datalist, null, billName, WxBillRent.class, billName + ".xlsx", response, false); } - private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillRent wxBillRent,WxPayAccountBill wxPayAccountBill) { + private void updateQueryParam(WxBillRent wxBillRent) { if(null != wxBillRent.getDepositStatus()) { WxBillDeposit bdq1 = new WxBillDeposit(); bdq1.updateTenantInfo(wxBillRent); @@ -504,7 +505,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setId(-1L); } } - + } + + private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillRent wxBillRent,WxPayAccountBill wxPayAccountBill) { + updateQueryParam(wxBillRent); PageInfo billRentList = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.queryBillRentList(wxBillRent)); if (null == billRentList) { return null; @@ -592,4 +596,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRentMapper.updateById(rent); return new ResultData(); } + + @Override + public WxBillSum getBillMonthSum(WxBillRent wxBillRent) { + updateQueryParam(wxBillRent); + return wxBillRentMapper.getBillMonthSum(wxBillRent); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 361d9122c..7e80bddd0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -132,7 +132,10 @@ and br.`rent_contract_id` = #{rentContractId} and br.`pay_way` = #{payWay} and br.`late_pay_status` = #{latePayStatus} - and br.`receive_date` between #{starttime} and #{endtime} + and br.`starttime` <= #{starttime} + and br.`endtime` >= #{endtime} + + and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} and br.`rent_contract_id` in @@ -166,6 +169,19 @@ select distinct rent_contract_id from wx_bill_rent br + + + + + + + + + +