Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
d6cac57db9
3 changed files with 17 additions and 2 deletions
  1. +12
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

+ 12
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -2,6 +2,7 @@ package com.iformall.controller.contract;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.annotation.UserDataRuleAnnotation;
@@ -138,6 +139,16 @@ public class WxPropertyContractController extends WxContractBaseController {
if (null == wxPropertyContract.getAdjustPeriod()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "adjustPeriod不能为空");
}
List<Long> shopIds = wxPropertyContract.shopIdsByShop();
if (null == shopIds || shopIds.size() <= 0 ) {
return new ResultData(Result.ERROR,"请选择店铺");
}
String shopIdStr = "";
for (int i = 0; i < shopIds.size(); i++) {
Long shopId = shopIds.get(i);
shopIdStr = shopIdStr +","+ shopId;
}
wxPropertyContract.setShopIdStr(shopIdStr);
}else {
WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId());
if (null == rentContract) {
@@ -159,6 +170,7 @@ public class WxPropertyContractController extends WxContractBaseController {
wxPropertyContract.setSignDate(rentContract.getSignDate());
wxPropertyContract.setRentInfo(rentContract.getRentInfo());
wxPropertyContract.setCustomersId(rentContract.getCustomersId());
wxPropertyContract.setShopIdStr(rentContract.getShopIdStr());
}
wxPropertyContract.setRentStartType(EnumRentStartType.RENTTIME.getCode());
return wxPropertyContractService.save(wxPropertyContract, user, user.getName(),false);


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

@@ -254,6 +254,9 @@ public class WxPropertyContract extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "首期账单收款截止日期", name = "firstBillReceiveDate")
private Date firstBillReceiveDate;
@io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr")
private String shopIdStr;
//查询过期提醒
@TableField(exist = false)
private Integer outDateNofity;


+ 2
- 2
mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml View File

@@ -63,13 +63,13 @@
<result column="first_bill_date_start" jdbcType="TIMESTAMP" property="firstBillDateStart"/>
<result column="first_bill_date_end" jdbcType="TIMESTAMP" property="firstBillDateEnd"/>
<result column="first_bill_receive_date" jdbcType="TIMESTAMP" property="firstBillReceiveDate"/>
<result column="shop_id_str" jdbcType="VARCHAR" property="shopIdStr"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`customers_id`,`decimal_size`,`price`,`rental_start_date`,`rental_end_date`,`create_type`,
`sign_date`,`receive_period`,`filepath`,`status`,`contract_number`,`price_detail`,`create_by_name`,`update_by_name`,
`deposit`,`is_del`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`,
`deposit`,`is_del`,`receive_period_unit`,`create_by`,`update_by`,`first_bill_receive_date`,`shop_id_str`,
`updatetime`,`createtime`,`rent_area`,`fees_standards_info`,`first_bill_date_start`,`first_bill_date_end`,
`link_person`,`link_phone`,`pay_account`,`filename`,`lease`,`rent_contract_id`,`day_price_calcute`,`month_average_days`,
`start_date`,`end_date`,`apply_status`,`adjust_period`,`business_type`,adjust_ratio,`rent_info`,fixed_price,`pay_period_rate`,


Loading…
Cancel
Save