winter 11 месяцев назад
Родитель
Сommit
30fb5d70d8
6 измененных файлов: 81 добавлений и 65 удалений
  1. +58
    -61
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java
  4. +10
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  6. +9
    -2
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 58
- 61
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Просмотреть файл

@@ -41,27 +41,8 @@ import java.util.Map;
public class WxRentContract extends TenantEntity {

protected Long id;
@io.swagger.annotations.ApiModelProperty(value = "客户编号", name = "customersId")
private Long customersId;
@TableField(exist = false)
private Integer customerType;
@TableField(exist = false)
private String customerTypeName;
public String getCustomerTypeName() {
if (null != customerType) {
return EnumShopUsersPrincipalType.getEnum(customerType).getMessage();
}
return null;
}
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String customerLinkPerson;
@TableField(exist = false)
private String customerPhone;
@TableField(exist = false)
private String customerLegalPerson;
@io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber")
private String contractNumber;
@io.swagger.annotations.ApiModelProperty(value = "合同签约时间", name = "signDate")
@@ -74,27 +55,42 @@ public class WxRentContract extends TenantEntity {
private String designFile;
@io.swagger.annotations.ApiModelProperty(value = "租期总月数(月)", name = "lease")
private Integer lease;
@io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId")
private Long fromId;
//联系地址
private String linkAddress;
@io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson")
private String linkPerson;
@io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone")
private String linkPhone;
@io.swagger.annotations.ApiModelProperty(value = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute")
private Integer dayPriceCalcute;
@io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays")
private Integer monthAverageDays;
@io.swagger.annotations.ApiModelProperty(value = "金额小数点位数", name = "decimalSize")
private Integer decimalSize = Constant.default_short_decimal_size ;
@io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type")
private Integer type;
@TableField(exist = false)
private String priceTwoDecimal;//2位小数

private String typeName;
public String getTypeName() {
if (null != type) {
return EnumAgileContractType.getEnum(type).getMessage();
}
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea")
private String rentArea;
@io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr")
private String shopIdStr;
@io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回EnumRentContractAppStatus", name = "applyStatus")
private Integer applyStatus;
@io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime")
private Date endContractTime;
@io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath")
private String filepath;
@io.swagger.annotations.ApiModelProperty(value = "上传文件名", name = "fileNames")
private String fileNames;
@io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit")
private String cashtypeContentLsit;
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo")
private String rentInfo;
@io.swagger.annotations.ApiModelProperty(value = "EnumRentContractStatus", name = "status")
private Integer status;
@TableField(exist = false)
private List<Integer> statuss;
@TableField(exist = false)
private String statusName;
public String getStatusName() {
@@ -103,11 +99,14 @@ public class WxRentContract extends TenantEntity {
}
return null;
}

@io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit")
private String cashtypeContentLsit;
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value = "来源ID,针对续签,从哪个合同续签", name = "fromId")
private Long fromId;
//联系地址
private String linkAddress;
@io.swagger.annotations.ApiModelProperty(value = "联系人", name = "linkPerson")
private String linkPerson;
@io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "linkPhone")
private String linkPhone;
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime")
private Date updatetime;
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy")
@@ -120,32 +119,8 @@ public class WxRentContract extends TenantEntity {
private Long createBy;
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createBy")
private String createByName;
@io.swagger.annotations.ApiModelProperty(value = "计租面积", name = "rentArea")
private String rentArea;
@io.swagger.annotations.ApiModelProperty(value = "店铺编号串", name = "shopIdStr")
private String shopIdStr;
@io.swagger.annotations.ApiModelProperty(value = "类型EnumAgileContractType", name = "type")
private Integer type;
@TableField(exist = false)
private String typeName;
public String getTypeName() {
if (null != type) {
return EnumAgileContractType.getEnum(type).getMessage();
}
return null;
}
@io.swagger.annotations.ApiModelProperty(value = "审核状态, 0未审核 1审核中 2审核通过 3驳回EnumRentContractAppStatus", name = "applyStatus")
private Integer applyStatus;
@io.swagger.annotations.ApiModelProperty(value = "终止时间", name = "endContractTime")
private Date endContractTime;
@io.swagger.annotations.ApiModelProperty(value = "审批说明", name = "remark")
private String remark;
@io.swagger.annotations.ApiModelProperty(value = "租金信息", name = "rentInfo")
private String rentInfo;
@io.swagger.annotations.ApiModelProperty(value = "每天价格计算规则EnumRentDayPriceCalcute", name = "dayPriceCalcute")
private Integer dayPriceCalcute;
@io.swagger.annotations.ApiModelProperty(value = "每月平均天数", name = "monthAverageDays")
private Integer monthAverageDays;
@io.swagger.annotations.ApiModelProperty(value = "来源ID,用于履约中合同修改影子数据", name = "orginId")
private Long orginId;
@@ -254,6 +229,28 @@ public class WxRentContract extends TenantEntity {
@TableField(exist = false)
private WxRentContract child;
@TableField(exist = false)
private String priceTwoDecimal;//2位小数
@TableField(exist = false)
private Integer customerType;
@TableField(exist = false)
private String customerTypeName;
public String getCustomerTypeName() {
if (null != customerType) {
return EnumShopUsersPrincipalType.getEnum(customerType).getMessage();
}
return null;
}
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String customerLinkPerson;
@TableField(exist = false)
private String customerPhone;
@TableField(exist = false)
private String customerLegalPerson;
@TableField(exist = false)
private List<Integer> statuss;
//是否有工作流 1:有 0:无"
@TableField(exist = false)
private Integer flowHas;


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Просмотреть файл

@@ -41,7 +41,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Long>
List<WxRentContract> findToEndContractList(WxRentContract rentContract);
void copyValidDeleteContract(@Param("tenantId") String tenantId,@Param("id") Long id);
void copyValidDeleteContract(WxRentContract rentContract);
void deleteContract(@Param("tenantId") String tenantId,@Param("id") Long id);
void updateContractId(@Param("tenantId") String tenantId,@Param("oldId") Long oldId,@Param("newId") Long newId);
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java Просмотреть файл

@@ -33,6 +33,7 @@ public interface WxAgileContractService {
ResultData saveOrUpdate(WxRentContract record,MallUserInfo user);
WxRentContract findYingZiContract(Long orginId,TenantEntity tenantEntity);
WxRentContract findMainContract(Long id,TenantEntity tenantEntity);

void saveDeposit(WxRentContract wxRentContract,MallUserInfo user);


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java Просмотреть файл

@@ -303,6 +303,16 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {

}
@Override
public WxRentContract findMainContract(Long id,TenantEntity tenantEntity) {
WxRentContract rentContract = wxRentContractMapper.selectById(id);
if (null != rentContract && rentContract.isYingZiContract()) {
return wxRentContractMapper.selectById(rentContract.getOrginId());
}
return null;

}
@Override
public void setCustomers(WxRentContract record,EnumContractCustomersStatus status) {
WxContractCustomers cq = new WxContractCustomers();


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -520,7 +520,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
Long orginId = record.getOrginId();
if (record.isYingZiContract()){
isYingzi = true;
wxRentContractMapper.copyValidDeleteContract(record.getTenantId(), orginId);
WxRentContract mr = wxAgileContractService.findMainContract(id, record);
wxRentContractMapper.copyValidDeleteContract(mr);
wxRentContractMapper.deleteContract(record.getTenantId(),orginId);
wxRentContractMapper.updateContractId(record.getTenantId(), id, orginId);
record.setId(orginId);


+ 9
- 2
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -243,8 +243,15 @@
where `tenant_id` = #{tenantId} and status = 3 and end_contract_time &lt;= now();
</select>
<update id="copyValidDeleteContract" parameterType="java.util.Map">
insert into wx_rent_contract_valid_delete(<include refid="allColumns"/>) select <include refid="allColumns"/> from wx_rent_contract where id = #{id} and `tenant_id` = #{tenantId}
<update id="copyValidDeleteContract" parameterType="com.iformall.domain.po.WxRentContract">
insert into wx_rent_contract_valid_delete(<include refid="allColumns"/>) values(
#{item.id},#{item.customersId},#{item.tenantId},#{item.parentTenantId},#{item.decimalSize},#{item.rentalStartDate},
#{item.rentalEndDate},#{item.signDate},#{item.filepath},#{item.status},#{item.contractNumber},#{item.createBy},
#{item.updateBy},#{item.dayPriceCalcute},#{item.monthAverageDays},#{item.cashtypeContentLsit},#{item.isDel},
#{item.updatetime},#{item.createtime},#{item.linkPerson},#{item.linkPhone},#{item.linkAddress},#{item.lease},
#{item.type},#{item.fromId},#{item.endContractTime},#{item.applyStatus},#{item.createByName},#{item.updateByName},
#{item.rentInfo},#{item.fileNames},#{item.shopIdStr},#{item.designFile},#{item.remark},#{item.orginId}
)
</update>
<delete id="deleteContract" parameterType="java.util.Map">


Загрузка…
Отмена
Сохранить