diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 354694ced..4d18e2ee9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author gongbiao @@ -89,6 +86,13 @@ public class WxRentContractController extends BaseController { @SystemControllerLog(description = "租赁合同-生成账单列表金额") public ResultData buildBillPriceList(@ModelAttribute WxRentContract wxRentContract) { logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); + + //todo:test + wxRentContract.setId(312447858201595904l); + List previewBillRentList = new ArrayList<>(); + + wxRentContract.setPreviewBillRentList(previewBillRentList); + WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList()); List result = wxRentContractService.buildRent(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 101dd12fd..4355ca1fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1039,6 +1039,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { }else{ endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 logger.info("==========cross:"+sd.format(endDate)); + + + + } } } @@ -1138,6 +1142,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { return resultMap; } + public long getNeedPay(){ + + } + public void setExpiredDay(WxBillRent wxBillRent,int dayType, int receivePeriod){ //截止收租日在当前时间之前 Date date = new Date();