Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
1b52fb9abc
28 changed files with 396 additions and 103 deletions
  1. +13
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +20
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  3. +24
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java
  4. +20
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  5. +20
    -13
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  6. +20
    -12
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  7. +25
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java
  8. +21
    -12
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  9. +20
    -14
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java
  10. +3
    -1
      mallinkAdmin/src/main/resources/db/migration/V202405003.sql
  11. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  12. +7
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java
  13. +3
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java
  14. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java
  15. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  16. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java
  17. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  18. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java
  19. +40
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  20. +4
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java
  21. +35
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumRentContractDepositType.java
  22. +5
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java
  23. +5
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
  24. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  25. +48
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  26. +20
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  27. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  28. +27
    -3
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml

+ 13
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -64,6 +64,19 @@ public class WxRentContractController extends WxContractBaseController {
@Autowired
WxMallFloorService floorService;
/**
* 押金类型
* @return
*/
@GetMapping("depositType")
public ResultData billTypes() {
Map<Integer,String> tmap = new HashMap<Integer,String>();
for (EnumRentContractDepositType t : EnumRentContractDepositType.values()) {
tmap.put(t.getCode(), t.getMessage());
}
return new ResultData(tmap);
}
@GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),


+ 20
- 13
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java View File

@@ -85,12 +85,31 @@ public class WxBillDailyController extends BillBaseController {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
final PageInfo<WxBillDaily> page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize);
return new ResultData(page);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "日常费用账单-导出")
public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) {
wxBillDaily.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDaily.setFloorForRule(dataRule.getFloorIds());
wxBillDaily.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillDaily.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDaily.getOnlyOweOrNear().intValue()) {
wxBillDaily.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDaily.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillDailyService.exportBill(request, response, wxBillDaily);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillDaily wxBillDaily) {
if (StringUtils.isBlank(wxBillDaily.getMonth())) {
@@ -278,16 +297,4 @@ public class WxBillDailyController extends BillBaseController {
return new ResultData(Result.SUCCESS, "查询成功", entries);
}

@GetMapping("exportBill")
@SystemControllerLog(description = "日常费用账单-导出")
public void exportBill(@ModelAttribute WxBillDaily wxBillDaily, HttpServletRequest request, HttpServletResponse response) {
wxBillDaily.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDaily.setFloorForRule(dataRule.getFloorIds());
wxBillDaily.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillDailyService.exportBill(request, response, wxBillDaily);
}

}

+ 24
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java View File

@@ -17,6 +17,10 @@ import com.iformall.service.helper.WxBillAllHelper;

import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +69,26 @@ public class WxBillDepositController extends BillBaseController {
return new ResultData(page);
}
@GetMapping("exportBill")
public void exportBill(@ModelAttribute WxBillDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) {
wxBillDeposit.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDeposit.setFloorForRule(dataRule.getFloorIds());
wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) {
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillDeposit.getOnlyOweOrNear().intValue()) {
wxBillDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillDepositService.exportBill(request, response, wxBillDeposit);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillDeposit wxBillDeposit) {
if (StringUtils.isBlank(wxBillDeposit.getMonth())) {


+ 20
- 13
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java View File

@@ -60,13 +60,32 @@ public class WxBillOtherController extends BillBaseController {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillOther.updateTenantInfo(getTenantInfo());
final PageInfo<WxBillOther> page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize);
return new ResultData(page);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "其它账单-导出")
public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) {
wxBillOther.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillOther.setFloorForRule(dataRule.getFloorIds());
wxBillOther.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillOther.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOther.getOnlyOweOrNear().intValue()) {
wxBillOther.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOther.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillOtherService.exportBill(request, response, wxBillOther);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillOther wxBillOther) {
if (StringUtils.isBlank(wxBillOther.getMonth())) {
@@ -131,16 +150,4 @@ public class WxBillOtherController extends BillBaseController {
return wxBillOtherService.updatePaid(id);
}

@GetMapping("exportBill")
@SystemControllerLog(description = "其它账单-导出")
public void exportBill(@ModelAttribute WxBillOther wxBillOther, HttpServletRequest request, HttpServletResponse response) {
wxBillOther.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillOther.setFloorForRule(dataRule.getFloorIds());
wxBillOther.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillOtherService.exportBill(request, response, wxBillOther);
}

}

+ 20
- 13
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java View File

@@ -61,13 +61,32 @@ public class WxBillOtherDepositController extends BillBaseController {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillOtherDeposit.updateTenantInfo(getTenantInfo());
final PageInfo<WxBillOtherDeposit> page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize);
return new ResultData(page);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "其它押金账单-导出")
public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillOtherDeposit, HttpServletRequest request, HttpServletResponse response) {
wxBillOtherDeposit.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds());
wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillOtherDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillOtherDeposit.getOnlyOweOrNear().intValue()) {
wxBillOtherDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillOtherDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillOtherDepositService.exportBill(request, response, wxBillOtherDeposit);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillOtherDeposit wxBillOtherDeposit) {
if (StringUtils.isBlank(wxBillOtherDeposit.getMonth())) {
@@ -142,16 +161,4 @@ public class WxBillOtherDepositController extends BillBaseController {
return wxBillOtherDepositService.adjustDeposit(wxBillDeposit);
}

@GetMapping("exportBill")
@SystemControllerLog(description = "其它押金账单-导出")
public void exportBill(@ModelAttribute WxBillOtherDeposit wxBillDeposit, HttpServletRequest request, HttpServletResponse response) {
wxBillDeposit.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillDeposit.setFloorForRule(dataRule.getFloorIds());
wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillOtherDepositService.exportBill(request, response, wxBillDeposit);
}

}

+ 20
- 12
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java View File

@@ -63,13 +63,32 @@ public class WxBillPropertyController extends BillBaseController {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillProperty.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC);
PageInfo<WxBillProperty> result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize);
return new ResultData(result);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "物业账单-导出")
public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) {
wxBillProperty.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillProperty.setFloorForRule(dataRule.getFloorIds());
wxBillProperty.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillProperty.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillProperty.getOnlyOweOrNear().intValue()) {
wxBillProperty.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillProperty.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillPropertyService.exportBill(request, response, wxBillProperty);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillProperty wxBillProperty) {
if (StringUtils.isBlank(wxBillProperty.getMonth())) {
@@ -155,15 +174,4 @@ public class WxBillPropertyController extends BillBaseController {
return wxBillPropertyService.updateLatePayStatus(wxBillProperty);
}

@GetMapping("exportBill")
@SystemControllerLog(description = "物业账单-导出")
public void exportBill(@ModelAttribute WxBillProperty wxBillProperty, HttpServletRequest request, HttpServletResponse response) {
wxBillProperty.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillProperty.setFloorForRule(dataRule.getFloorIds());
wxBillProperty.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillPropertyService.exportBill(request, response, wxBillProperty);
}
}

+ 25
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java View File

@@ -7,6 +7,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.controller.base.BillBaseController;
import com.iformall.domain.po.WxBillDeposit;
import com.iformall.domain.po.WxBillPropertyDeposit;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxUserDataRule;
@@ -17,6 +18,10 @@ import com.iformall.service.helper.WxBillAllHelper;

import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +70,26 @@ public class WxBillPropertyDepositController extends BillBaseController {
return new ResultData(result);
}
@GetMapping("exportBill")
public void exportBill(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit, HttpServletRequest request, HttpServletResponse response) {
wxBillPropertyDeposit.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillPropertyDeposit.setFloorForRule(dataRule.getFloorIds());
wxBillPropertyDeposit.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillPropertyDeposit.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) {
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillPropertyDeposit.getOnlyOweOrNear().intValue()) {
wxBillPropertyDeposit.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillPropertyDeposit.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillPropertyDepositService.exportBill(request, response, wxBillPropertyDeposit);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit) {
if (StringUtils.isBlank(wxBillPropertyDeposit.getMonth())) {


+ 21
- 12
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java View File

@@ -70,6 +70,27 @@ public class WxBillRentController extends BillBaseController {
return new ResultData(page);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "租赁押金账单-导出")
public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) {
wxBillRent.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillRent.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) {
wxBillRent.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRent.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillRentService.exportBill(request, response, wxBillRent);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillRent wxBillRent) {
if (StringUtils.isBlank(wxBillRent.getMonth())) {
@@ -166,16 +187,4 @@ public class WxBillRentController extends BillBaseController {
return wxBillRentService.updateLatePayStatus(wxBillRent);
}

@GetMapping("exportBill")
@SystemControllerLog(description = "租赁押金账单-导出")
public void exportBill(@ModelAttribute WxBillRent wxBillRent, HttpServletRequest request, HttpServletResponse response) {
wxBillRent.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillRentService.exportBill(request, response, wxBillRent);
}

}

+ 20
- 14
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java View File

@@ -64,13 +64,32 @@ public class WxBillRentManageController extends BillBaseController {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillRentManage.setSortColumns(BaseEntity.SortField.Createtime_DESC,BaseEntity.SortField.Id_DESC);
final PageInfo<WxBillRentManage> page = wxBillRentManageService.listAsPage(wxBillRentManage, pageNum, pageSize);
return new ResultData(page);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "租赁押金账单-导出")
public void exportBill(@ModelAttribute WxBillRentManage wxBillRentManage, HttpServletRequest request, HttpServletResponse response) {
wxBillRentManage.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRentManage.setFloorForRule(dataRule.getFloorIds());
wxBillRentManage.setBusinessForRule(dataRule.getBussinessIds());
}
if (null != wxBillRentManage.getOnlyOweOrNear()) {
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRentManage.getOnlyOweOrNear().intValue()) {
wxBillRentManage.setOweBillLastTime(wxBillAllHelper.getDateAfter(getOweBillBeforeDays()));
wxBillRentManage.setNearBillLastTime(wxBillAllHelper.getDateAfter(getNearBillBeforeDays()));
}
}
wxBillRentManageService.exportBill(request, response, wxBillRentManage);
}
@GetMapping("monthBillSum")
public ResultData monthBillSum(@ModelAttribute WxBillRentManage wxBillRentManage) {
if (StringUtils.isBlank(wxBillRentManage.getMonth())) {
@@ -165,17 +184,4 @@ public class WxBillRentManageController extends BillBaseController {
return wxBillRentManageService.updateLatePayStatus(wxBillRent);
}
@GetMapping("exportBill")
@SystemControllerLog(description = "租赁押金账单-导出")
public void exportBill(@ModelAttribute WxBillRentManage wxBillRent, HttpServletRequest request, HttpServletResponse response) {
wxBillRent.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxBillRent.setFloorForRule(dataRule.getFloorIds());
wxBillRent.setBusinessForRule(dataRule.getBussinessIds());
}
wxBillRentManageService.exportBill(request, response, wxBillRent);
}
}

+ 3
- 1
mallinkAdmin/src/main/resources/db/migration/V202405003.sql View File

@@ -5,4 +5,6 @@ ALTER TABLE wx_bill_property DROP COLUMN owe;
ALTER TABLE wx_bill_property_deposit DROP COLUMN owe;
ALTER TABLE wx_bill_daily DROP COLUMN owe;
ALTER TABLE wx_bill_other DROP COLUMN owe;
ALTER TABLE wx_bill_other_deposit DROP COLUMN owe;
ALTER TABLE wx_bill_other_deposit DROP COLUMN owe;

ALTER TABLE wx_bill_rent_deposit ADD COLUMN contract_depoist_detail VARCHAR(1000) COMMENT '合同押金详细';

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java View File

@@ -34,7 +34,7 @@ public class WxBillDaily extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="账单类型EnumBillDailyType",name="type")
private Integer type;

@Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd")
//@Excel(name = "缴款截止日期*", orderNum = "5", width = 20, format = "yyyy-MM-dd")
@NotNull
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
private Date receiveDate;


+ 7
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.base.WxBillBaseEntity;

import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -22,14 +23,17 @@ public class WxBillDeposit extends WxBillBaseEntity {
@TableField(exist = false)
private String shopNumber;

@Excel(name = "租金合同ID", width = 20, orderNum = "1")
@io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId")
private Long rentContractId;
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;
@Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
private Date payDate;
@Excel(name = "创建日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
@@ -63,6 +67,9 @@ public class WxBillDeposit extends WxBillBaseEntity {

@io.swagger.annotations.ApiModelProperty(value = "手续费", name = "serviceChargePay")
private String serviceChargePay;
@io.swagger.annotations.ApiModelProperty(value = "合同押金详细", name = "contractDepoistDetail")
private String contractDepoistDetail;

@TableField(exist = false)
private String serviceChargePayBefore;


+ 3
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java View File

@@ -37,7 +37,7 @@ public class WxBillOther extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="账单备注",name="comments")
private String comments;

@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd")
//@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd")
@io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate")
private Date receiveDate;

@@ -45,10 +45,11 @@ public class WxBillOther extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
private Date payDate;

@Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;

@Excel(name = "逾期(天)", orderNum = "10", width = 20)
//@Excel(name = "逾期(天)", orderNum = "10", width = 20)
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;



+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java View File

@@ -39,6 +39,7 @@ public class WxBillOtherDeposit extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "到账日期", name = "payDate")
private Date payDate;

@Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createtime")
private Date createtime;



+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java View File

@@ -35,7 +35,7 @@ public class WxBillProperty extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10")
//@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;

@@ -45,7 +45,7 @@ public class WxBillProperty extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;

@Excel(name = "逾期(天) ", width = 20, orderNum = "13")
//@Excel(name = "逾期(天) ", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;
@io.swagger.annotations.ApiModelProperty(value = "账单审核状态EnumBillRentApplyStatus", name = "applyStatus")
@@ -104,7 +104,7 @@ public class WxBillProperty extends WxBillBaseEntity {
@TableField(exist = false)
private String shopNumber;

@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3")
//@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3")
@TableField(exist = false)
private Integer depositStatus;



+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.base.WxBillBaseEntity;

import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -22,14 +23,17 @@ public class WxBillPropertyDeposit extends WxBillBaseEntity {
@TableField(exist = false)
private String shopNumber;

@Excel(name = "物业合同ID", width = 20, orderNum = "1")
@io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId")
private Long propertyContractId;
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;
@Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate")
private Date payDate;
@Excel(name = "创建日期", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java View File

@@ -33,7 +33,7 @@ public class WxBillRent extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13")
//@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="收款截止日期,过了有手续费",name="receiveDate")
private Date receiveDate;
@@ -44,7 +44,7 @@ public class WxBillRent extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;

@Excel(name = "逾期(天) ", width = 20, orderNum = "14")
//@Excel(name = "逾期(天) ", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;

@@ -148,7 +148,7 @@ public class WxBillRent extends WxBillBaseEntity {
@TableField(exist = false)
private String shopNumber;

@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3")
//@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3")
@TableField(exist = false)
private Integer depositStatus;



+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java View File

@@ -34,7 +34,7 @@ public class WxBillRentManage extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="应收金额(最初应收)",name="needPay")
private String needPay;
@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13")
//@Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13")
@io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate")
private Date receiveDate;

@@ -45,7 +45,7 @@ public class WxBillRentManage extends WxBillBaseEntity {
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;

@Excel(name = "逾期(天) ", width = 20, orderNum = "14")
//@Excel(name = "逾期(天) ", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay")
private Long expiredDay;



+ 40
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java View File

@@ -8,6 +8,7 @@ import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumPriceUnit;
import com.iformall.enums.EnumRentContractAdjustPeriod;
import com.iformall.enums.EnumRentContractDepositType;
import com.iformall.enums.EnumRentContractType;

import lombok.Data;
@@ -245,7 +246,7 @@ public class WxRentContract extends TenantEntity {

// @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "depositInfo")
// private String depositInfo;
@io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeContentLsit")
@io.swagger.annotations.ApiModelProperty(value = "押金详细EnumRentContractDepositType", name = "cashtypeContentLsit")
private String cashtypeContentLsit;
@io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeLsit")
private String cashtypeLsit;
@@ -480,6 +481,44 @@ public class WxRentContract extends TenantEntity {
return shopList;
}
public String getRentInfoShopNumber() {
StringBuffer sb = new StringBuffer("");
String rentInfo = this.getRentInfo();
if (!StringUtils.isBlank(rentInfo)) {
JSONArray rentInfoArray = JSONArray.parseArray(rentInfo);
int size = rentInfoArray.size();
for (int i = 0; i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
String shopNumber = rentInfoObject.getString("shopNumber");
if (StringUtils.isNotBlank(shopNumber)) {
sb.append(shopNumber).append(",");
}
}
}
return sb.toString();
}
public String getDepositDetail() {
StringBuffer sb = new StringBuffer("");
String dsdstr = this.getCashtypeContentLsit();
if (!StringUtils.isBlank(dsdstr)) {
JSONArray rentInfoArray = JSONArray.parseArray(dsdstr);
int size = rentInfoArray.size();
for (int i = 0; i < size; i++) {
JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
String depositType = rentInfoObject.getString("value");
String deposit = rentInfoObject.getString("deposit");
Integer dt = Integer.parseInt(depositType);
EnumRentContractDepositType de = EnumRentContractDepositType.getEnum(dt);
if (null != dt && StringUtils.isNotBlank(deposit)) {
sb.append(de.getMessage()).append(":").append(deposit).append(",");
}
}
}
return sb.toString();
}
@TableField(exist = false)
private List<Long> merchantIds;
}


+ 4
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java View File

@@ -25,14 +25,16 @@ public class WxBillDailyExportVo {
private String payStr;
@Excel(name = "欠缴金额(元)", orderNum = "6", width = 20)
private String oweStr;
@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd")
//@Excel(name = "缴款截止日期", orderNum = "7", width = 20, format = "yyyy-MM-dd")
private Date receiveDate;
@Excel(name = "收款日期", orderNum = "8", width = 20, format = "yyyy-MM-dd")
private Date payDate;
@Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "9")
private Integer status;
@Excel(name = "逾期(天)", orderNum = "10", width = 20)
//@Excel(name = "逾期(天)", orderNum = "10", width = 20)
private Long expiredDay;
@Excel(name = "创建日期", orderNum = "12", width = 20, format = "yyyy-MM-dd HH:mm:ss")
private Date createtime;

private String receivePay;
private String pay;


+ 35
- 0
mallinkService/src/main/java/com/iformall/enums/EnumRentContractDepositType.java View File

@@ -0,0 +1,35 @@
package com.iformall.enums;


public enum EnumRentContractDepositType {

COMMON(0,"一般押金"),
CONTRACT_DEPOSIT(1,"合同保证金"),
QUALITY_DEPOSIT(2,"质量保证金")
;

public static EnumRentContractDepositType getEnum(Integer code) {
for (EnumRentContractDepositType value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumRentContractDepositType(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java View File

@@ -2,6 +2,9 @@ package com.iformall.service;

import java.util.List;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
@@ -62,5 +65,7 @@ public interface WxBillDepositService {
List<Long> getMerchantIds(WxBillDeposit wxBillDeposit);
WxBillHotNotify getBillHotNotify(WxBillDeposit wxBillDeposit);
void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDeposit wxBillDeposit);

}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java View File

@@ -2,6 +2,9 @@ package com.iformall.service;

import java.util.List;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo;
@@ -65,4 +68,6 @@ public interface WxBillPropertyDepositService {
List<Long> getMerchantIds(WxBillPropertyDeposit deposit);
WxBillHotNotify getBillHotNotify(WxBillPropertyDeposit deposit);
public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillPropertyDeposit deposit) ;
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java View File

@@ -458,6 +458,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService {
wxBillDailyExportVo.setExpiredDay(b.getExpiredDay());
wxBillDailyExportVo.setStatus(b.getStatus());
wxBillDailyExportVo.setType(b.getType());
wxBillDailyExportVo.setCreatetime(b.getCreatetime());
datalist.add(wxBillDailyExportVo);
}
}


+ 48
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java View File

@@ -1,5 +1,6 @@
package com.iformall.service.impl;

import com.alibaba.fastjson.JSONObject;
import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -14,6 +15,7 @@ import com.iformall.domain.po.WxBillOtherDeposit;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.po.WxShop;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillSum;
@@ -21,8 +23,11 @@ import com.iformall.enums.EnumBillAction;
import com.iformall.enums.EnumBillPayWay;
import com.iformall.enums.EnumBillStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.enums.EnumRentShopType;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillDepositMapper;
import com.iformall.mapper.WxRentContractMapper;
import com.iformall.service.ExcelService;
import com.iformall.service.WxBillActionService;
import com.iformall.service.WxBillDepositService;
import com.iformall.service.WxMerchantService;
@@ -40,10 +45,16 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
* @author gongbiao
@@ -68,6 +79,12 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
@Lazy
@Autowired
WxShopService wxShopService;
@Autowired
ExcelService excelService;
@Autowired
WxRentContractMapper wxRentContractMapper;

@Override
public PageInfo<WxBillDeposit> listAsPage(WxBillDeposit record, Integer pageIndex, Integer pageSize) {
@@ -109,6 +126,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
private PageInfo<WxBillDeposit> getBillDepositPropertyList(WxPayAccountBill wxPayAccountBill,WxBillDeposit record, Integer pageIndex, Integer pageSize) {
setQueryParam(record);
PageInfo<WxBillDeposit> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillDepositMapper.queryBillDepositList(record));
if (null == page) {
return null;
@@ -118,9 +136,21 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
wq.updateTenantInfo(record);
Map<Long,WxMerchant> merchantMap = wxMerchantService.findMerchantMap(wq);
WxShop sq = new WxShop();
sq.updateTenantInfo(record);
Map<Long,WxShop> shopMap = wxShopService.findShopMap(sq);
List<Long> rentContractIdList = wxBillDepositMapper.findRentContractIds(record);
Map<Long,WxRentContract> rentContractMap = new HashMap<Long,WxRentContract>();
Map<Long,WxBillDeposit> billDepositMap = new HashMap<Long,WxBillDeposit>();
if ( null != rentContractIdList && rentContractIdList.size() > 0 ) {
WxRentContract rcq = new WxRentContract();
rcq.updateTenantInfo(record);
rcq.setIds(rentContractIdList);
List<WxRentContract> rlist = wxRentContractMapper.findList(rcq);
if (null != rlist && rlist.size() > 0 ) {
for (int i = 0 ; i < rlist.size(); i++) {
WxRentContract rc = rlist.get(i);
rentContractMap.put(rc.getId(), rc);
}
}
}
if (null != page.getList()) {
for (int i = 0 ; i < page.getList().size() ; i ++) {
@@ -135,11 +165,9 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
}
}
if (null != e.getShopId()) {
WxShop shop = shopMap.get(e.getShopId());
if (null != shop) {
e.setShopNumber(shop.getShopNumber());
}
WxRentContract rent = rentContractMap.get(e.getRentContractId());
if (null != rent) {
e.setShopNumber(rent.getRentInfoShopNumber());
}
}
@@ -383,5 +411,17 @@ public class WxBillDepositServiceImpl implements WxBillDepositService {
return wxBillDepositMapper.getBillHotNotify(wxBillDeposit);
}

@Override
public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDeposit wxBillDeposit) {
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(wxBillDeposit);
String billName = wxBillDeposit.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租赁押金账单" : "多经点位租赁押金账单";
PageInfo<WxBillDeposit> billRentList = getBillDepositPropertyList(wxPayAccountBill,wxBillDeposit,1,10000);
if (null == billRentList || null == billRentList.getList()) {
return ;
}
excelService.exportExcel(billRentList.getList(),null, billName, WxBillDeposit.class, billName + ".xlsx", response, false);
}


}

+ 20
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java View File

@@ -21,8 +21,10 @@ import com.iformall.enums.EnumBillAction;
import com.iformall.enums.EnumBillPayWay;
import com.iformall.enums.EnumBillStatus;
import com.iformall.enums.EnumDelStatus;
import com.iformall.enums.EnumRentShopType;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxBillPropertyDepositMapper;
import com.iformall.service.ExcelService;
import com.iformall.service.WxBillActionService;
import com.iformall.service.WxBillPropertyDepositService;
import com.iformall.service.WxMerchantService;
@@ -45,6 +47,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
* @author gongbiao
*/
@@ -66,6 +71,9 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
@Lazy
@Autowired
WxShopService wxShopService;
@Autowired
ExcelService excelService;

@Override
public PageInfo<WxBillPropertyDeposit> listAsPage(WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) {
@@ -380,4 +388,16 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe
updateQueryParam(deposit);
return wxBillPropertyDepositMapper.getBillHotNotify(deposit);
}
@Override
public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillPropertyDeposit deposit) {
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(deposit);
String billName = deposit.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺物业押金账单" : "多经点位物业押金账单";
PageInfo<WxBillPropertyDeposit> billRentList = getBillDepositPropertyList(wxPayAccountBill,deposit,1,10000);
if (null == billRentList || null == billRentList.getList()) {
return ;
}
excelService.exportExcel(billRentList.getList(),null, billName, WxBillPropertyDeposit.class, billName + ".xlsx", response, false);
}
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -902,6 +902,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
WxBillDeposit wxBillDeposit = new WxBillDeposit();
wxBillDeposit.setId(idWorker.nextId());
wxBillDeposit.setRentContractId(wxRentContract.getId());
wxBillDeposit.setContractDepoistDetail(wxRentContract.getDepositDetail());
wxBillDeposit.setPay("0");
String needpay = wxRentContract.getDeposit();
wxBillDeposit.setReceivePay(needpay);


+ 27
- 3
mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml View File

@@ -32,12 +32,13 @@
<result column="shop_number" property="shopNumber"/>
<result column="bill_type_name" property="billTypeName"/>
<result column="bill_remark" property="billRemark"/>
<result column="contract_depoist_detail" property="contractDepoistDetail"/>
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`receive_pay`,`pay`,`receive_date`,`pay_date`,`createtime`,
`expired_day`,`status`,`is_del`,`need_pay`,`merchant_id`,`user_id`,`shop_id`,`updatetime`,`apply_status`,`apply_pay_img`,`apply_update_time`,
`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark
`rent_shop_type`,`return_price`,`pay_way`,service_charge_pay,'租赁押金' bill_type_name,'' bill_remark,contract_depoist_detail
</sql>

<sql id="dynamicWhereConditions">
@@ -66,7 +67,27 @@
<if test=" null != updatetime ">and `updatetime` = #{updatetime}</if>
<if test=" null != rentShopType ">and `rent_shop_type` = #{rentShopType}</if>
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>

<if test=" null != contractDepoistDetail and '' != contractDepoistDetail">
and `contract_depoist_detail` like concat('%', #{contractDepoistDetail},'%')
</if>
<if test=" null != starttime">and `starttime` &lt;= #{starttime}</if>
<if test=" null != endtime">and `endtime` &gt;= #{endtime}</if>
<if test=" null != month and '' != month">
and date_format(starttime,'%Y-%m') &lt;= #{month} and date_format(endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (`starttime` &lt;= #{oweBillLastTime} and `receive_pay` - `pay` &gt; 0 and status not in (3,6))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (`starttime` &gt; #{oweBillLastTime} and `starttime` &lt;= #{nearBillLastTime} and status not in (3,6))
</if>
<if test=" null != merchantIds ">
and `merchant_id` in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
#{midItem}
</foreach>
</if>
<if test=" null != rentContractIdList ">
and rent_contract_id in
<foreach collection="rentContractIdList" index="index" item="rdItem" open="(" separator="," close=")">
@@ -94,7 +115,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`contract_depoist_detail`,
br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay,'租赁押金' bill_type_name,'' bill_remark
from wx_bill_rent_deposit br
<include refid="queryBillRentListCondition"/>
@@ -118,6 +139,9 @@
<if test=" null != rentShopType ">and br.`rent_shop_type` = #{rentShopType}</if>
<if test=" null != rentContractId ">and br.`rent_contract_id` = #{rentContractId}</if>
<if test=" null != payWay ">and br.`pay_way` = #{payWay}</if>
<if test=" null != contractDepoistDetail and '' != contractDepoistDetail">
and br.`contract_depoist_detail` like concat('%', #{contractDepoistDetail},'%')
</if>
<if test=" null != starttime">and br.`starttime` &lt;= #{starttime}</if>
<if test=" null != endtime">and br.`endtime` &gt;= #{endtime}</if>
<if test=" null != month and '' != month">


Loading…
Cancel
Save