Ver código fonte

[合同][修改][修改计算账单金额逻辑]

release_toaliyun_real
luozukai 6 anos atrás
pai
commit
40569750c8
2 arquivos alterados com 16 adições e 4 exclusões
  1. +8
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 8
- 4
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Ver arquivo

@@ -27,10 +27,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat; 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 * @author gongbiao
@@ -89,6 +86,13 @@ public class WxRentContractController extends BaseController {
@SystemControllerLog(description = "租赁合同-生成账单列表金额") @SystemControllerLog(description = "租赁合同-生成账单列表金额")
public ResultData buildBillPriceList(@ModelAttribute WxRentContract wxRentContract) { public ResultData buildBillPriceList(@ModelAttribute WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList"); logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList");

//todo:test
wxRentContract.setId(312447858201595904l);
List<WxBillRent> previewBillRentList = new ArrayList<>();

wxRentContract.setPreviewBillRentList(previewBillRentList);

WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId());
dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList()); dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList());
List<WxBillRent> result = wxRentContractService.buildRent(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false); List<WxBillRent> result = wxRentContractService.buildRent(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false);


+ 8
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver arquivo

@@ -1039,6 +1039,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}else{ }else{
endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始 endDate = yearList.get(index+1);//price index 0开始,year.end 从第二年开始
logger.info("==========cross:"+sd.format(endDate)); logger.info("==========cross:"+sd.format(endDate));




} }
} }
} }
@@ -1138,6 +1142,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return resultMap; return resultMap;
} }


public long getNeedPay(){

}

public void setExpiredDay(WxBillRent wxBillRent,int dayType, int receivePeriod){ public void setExpiredDay(WxBillRent wxBillRent,int dayType, int receivePeriod){
//截止收租日在当前时间之前 //截止收租日在当前时间之前
Date date = new Date(); Date date = new Date();


Carregando…
Cancelar
Salvar