Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
fa0e48a169
3 zmienionych plików z 18 dodań i 0 usunięć
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 10
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Wyświetl plik

@@ -26,6 +26,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; 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.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;


@@ -933,6 +935,14 @@ public class WxRentContractController extends WxContractBaseController {
if (null == rentContract) { if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同"); return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
} }
WxRentContractRevenueJump jq = new WxRentContractRevenueJump();
jq.updateTenantInfo(rentContract);
jq.setRentContractId(rentContract.getId());
List<WxRentContractRevenueJump> jumpList = wxRentContractService.findJumpList(jq);
if (null == jumpList || jumpList.size() <= 0 ) {
return new ResultData(Result.ERROR, "合同未设置跳点,不用做汇算");
}
return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract)); return new ResultData(wxRentContractService.calcuteYearsRevenueRentUp(rentContract));
} }




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Wyświetl plik

@@ -7,6 +7,7 @@ import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.po.WxRentContractFreePeriod; import com.iformall.domain.po.WxRentContractFreePeriod;
import com.iformall.domain.po.WxRentContractRevenueJump;
import com.iformall.domain.po.WxRentContractRevenueSales; import com.iformall.domain.po.WxRentContractRevenueSales;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.RentContractFreePeriodVo; import com.iformall.domain.vo.RentContractFreePeriodVo;
@@ -164,4 +165,6 @@ public interface WxRentContractService {
WxRentContractYearsSumVo calcuteYearsRevenueRentUp(WxRentContract rentcontract); WxRentContractYearsSumVo calcuteYearsRevenueRentUp(WxRentContract rentcontract);
List<WxRentContractRevenueJump> findJumpList(WxRentContractRevenueJump jump);
} }

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Wyświetl plik

@@ -2728,4 +2728,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return vo; return vo;
} }
@Override
public List<WxRentContractRevenueJump> findJumpList(WxRentContractRevenueJump jump) {
return wxRentContractRevenueJumpMapper.findList(jump);
}
} }

Ładowanie…
Anuluj
Zapisz