Procházet zdrojové kódy

Merge commit '15c974cc3a121ffb1df6ce0c644f054da125648f' into release

release_toaliyun_real
luozukai před 6 roky
rodič
revize
88c35c60a9
6 změnil soubory, kde provedl 22 přidání a 9 odebrání
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  4. +11
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  5. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  6. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Zobrazit soubor

@@ -191,6 +191,9 @@ public class WxPropertyContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList");
WxPropertyContract dbRent = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
dbRent.setPreviewBillRentList(wxPropertyContract.getPreviewBillRentList());
if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
dbRent.setRentalStartDate(dbRent.getStartDate());
}
List<WxBillProperty> result = wxPropertyContractService.buildProperty(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false);
return new ResultData(result);
}


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Zobrazit soubor

@@ -114,6 +114,10 @@ public class WxRentContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxRentContractController::buildBillPriceList");
WxRentContract dbRent = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId());
dbRent.setPreviewBillRentList(wxRentContract.getPreviewBillRentList());

if(dbRent.getRentStartType()!=null && dbRent.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
dbRent.setRentalStartDate(dbRent.getStartDate());
}
List<WxBillRent> result = wxRentContractService.buildRent(new WxMerchant(),getUserId(),dbRent, EnumIsPreview.YES.getCode(), false);
return new ResultData(result);
}


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Zobrazit soubor

@@ -210,7 +210,6 @@ public class WxBillRentServiceImpl implements WxBillRentService {
record.setRentContractId(id);
record.setTenantId(tenantId);
record.setSortColumns(BaseEntity.SortField.Id_ASC);
updateBillStatus(record);
PageHelper.startPage(pageIndex, pageSize);
List<WxBillRent> billRentList = wxBillRentMapper.queryBillRentList(record);
PageInfo<WxBillRent> pageInfo = new PageInfo<>(billRentList);


+ 11
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Zobrazit soubor

@@ -1138,12 +1138,19 @@ public class WxRentContractServiceImpl implements WxRentContractService {

SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd");
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM");
SimpleDateFormat sdD = new SimpleDateFormat("d");
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
// System.out.println(sd.format(startDate));
// System.out.println(sd.format(endDate));

if(i == billTimeVoListSize - 1){//最后
if(sdMR.format(startDate).equals(sdMR.format(wxRentContract.getRentalStartDate())) && sdMR.format(endDate).equals(sdMR.format(wxRentContract.getRentalEndDate())) ){
int months = getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01");
months++;
//判断是否满足整月
int startInt = Integer.parseInt(sdD.format(startDate));
int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(endDate,Calendar.DATE,1)));
if(startInt == endInt){
int months = getMonths(sdM.format(startDate)+"-01",sdM.format(DateUtils.getDaySet(endDate,Calendar.DATE,1))+"-01");
needpay = new Double(months * priceD).longValue();
}else {
}else{
needpay = new Double(getMonthNeedPay(priceD, startDate, endDate)).longValue();
}
}else if(i == 0){//第一期


+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Zobrazit soubor

@@ -139,9 +139,9 @@

<update id="updateNotPaidStatus" parameterType="hashmap">
update wx_bill_property b set b.status=#{notPaid},b.expired_day=
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_property_contract where id = b.`property_contract_id`) day))
DATEDIFF(now(), b.receive_date)
where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_property_contract where id = b.`property_contract_id`) day)) >0
DATEDIFF(now(), b.receive_date) >0
</update>

<update id="updateWaitPayStatus" parameterType="hashmap">


+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Zobrazit soubor

@@ -147,9 +147,9 @@

<update id="updateNotPaidStatus" parameterType="hashmap">
update wx_bill_rent b set b.status=#{notPaid},b.expired_day=
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`rent_contract_id`) day))
DATEDIFF(now(), b.receive_date)
where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and
DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`rent_contract_id`) day)) >0
DATEDIFF(now(), b.receive_date) >0
</update>

<update id="updateWaitPayStatus" parameterType="hashmap">


Načítá se…
Zrušit
Uložit