xiaohanzi 5 лет назад
Родитель
Сommit
2c103a7f58
3 измененных файлов: 7 добавлений и 4 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumRentContractType.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml

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

@@ -9,7 +9,8 @@ public enum EnumRentContractType {

RENT_BY_AREA(1, "面积"),
RENT_BY_JOINT(2, "联营扣点"),
RENT_BY_AREA_AND_JOINT(3, "面积与联营扣点取高")
RENT_BY_AREA_AND_JOINT(3, "面积与联营扣点取高"),
RENT_BY_COUNT(4,"按铺位或点位数")
;

public static EnumRentContractType getEnum(Integer code) {


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

@@ -2466,19 +2466,21 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//如果存在审批中的合同,不允许提交审批
WxRentContract wrq = new WxRentContract();
wrq.updateTenantInfo(user);
wrq.setMerchantId(rentContract.getMerchantId());
wrq.setStatus(EnumRentContractStatus.PERFORMANCE.getCode());
List<WxRentContract> clist = wxRentContractMapper.findList(wrq);
if (null != clist && clist.size() > 0 ) {
return new ResultData(Result.ERROR, "当前存在其他审批中的租金合同。请先作完成。");
return new ResultData(Result.ERROR, "当前商户存在其他审批中的租金合同。请先作完成。");
}
//如果该合同是租金+物业合同,则还要判断物业合同
if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) {
WxPropertyContract wpc = new WxPropertyContract();
wpc.updateTenantInfo(user);
wpc.setMerchantId(rentContract.getMerchantId());
wpc.setStatus(EnumRentContractStatus.PERFORMANCE.getCode());
List<WxPropertyContract> plist = wxPropertyContractMapper.findList(wpc);
if (null != plist && plist.size() > 0 ) {
return new ResultData(Result.ERROR, "当前存在其他审批中的物业合同。请先作完成。");
return new ResultData(Result.ERROR, "当前商户存在其他审批中的物业合同。请先作完成。");
}
}
// Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId());


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

@@ -123,7 +123,7 @@

<update id="downloadByCouponId" parameterType="Long">
update wx_coupon_password
set status=1, update_date=now(), expire_date=date_add(now(),interval 30 DAY)
set status=1, update_date=now(), expire_date=date_add(now(),interval 365 DAY)
where status=0 and coupon_id=#{couponId}
</update>



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