Просмотр исходного кода

Merge commit 'refs/tags/jenkins-back-end-722^{}' into release

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
5efd8572d8
3 измененных файлов: 20 добавлений и 16 удалений
  1. +10
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +8
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

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

@@ -104,7 +104,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) { public ResultData saveOrUpdate(WxPropertyContract record, Long userId,String userName) {


if (null == record.getShopId()) { if (null == record.getShopId()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "shopId不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "shopId不能为空");
} }


WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getRentContractId()); WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(record.getRentContractId());
@@ -117,7 +117,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
} }
} }
if (null == record.getMerchantId()) { if (null == record.getMerchantId()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "merchantId不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "merchantId不能为空");
} }
WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(record.getMerchantId()); WxMerchant merchant = wxMerchantMapper.selectByPrimaryKey(record.getMerchantId());
if (merchant == null) { if (merchant == null) {
@@ -152,7 +152,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (count > 0) { if (count > 0) {
return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND); return new ResultData(ErrorCode.RENT_CONTRACT_WITH_SHOP_IS_FOUND);
} }
int dayType = record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
//保存物业合同信息 //保存物业合同信息
String message = ""; String message = "";
if (record.getId() == null) { if (record.getId() == null) {
@@ -161,7 +161,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//计租开始时间 //计租开始时间
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate()); instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(dayType, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1); instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime()); record.setRentalEndDate(instance.getTime());
//起租结束时间 //起租结束时间
@@ -191,7 +191,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
} }
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate()); instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(dayType, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1); instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime()); record.setRentalEndDate(instance.getTime());
//起租结束时间 //起租结束时间
@@ -247,10 +247,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id);
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode())
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { && record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) {
WxBillProperty wxBillProperty = new WxBillProperty();
wxBillProperty.setMerchantId(record.getMerchantId());
List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty);
if (billPropertyList.size() == 0) {
//WxBillProperty wxBillProperty = new WxBillProperty();
//wxBillProperty.setMerchantId(record.getMerchantId());
//List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty);
//if (billPropertyList.size() == 0) {
WxMerchant wxMerchant = new WxMerchant(); WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setId(record.getMerchantId()); wxMerchant.setId(record.getMerchantId());
wxMerchant.setTenantId(record.getTenantId()); wxMerchant.setTenantId(record.getTenantId());
@@ -258,7 +258,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
buildProperty(wxMerchant); buildProperty(wxMerchant);
//物业押金账单 //物业押金账单
buildDeposit(wxMerchant); buildDeposit(wxMerchant);
}
//}
} }
return new ResultData(Result.SUCCESS, "操作成功"); return new ResultData(Result.SUCCESS, "操作成功");
} }


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

@@ -143,10 +143,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (record.getStartDate().after(record.getRentalStartDate())) { if (record.getStartDate().after(record.getRentalStartDate())) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "起租开始时间不能大于计租开始时间"); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR, "起租开始时间不能大于计租开始时间");
} }
int dayType = record.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;

//计租开始时间 //计租开始时间
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate()); instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(dayType, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1); instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime()); record.setRentalEndDate(instance.getTime());
//起租结束时间 //起租结束时间
@@ -248,9 +250,11 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (wxRentContract == null) { if (wxRentContract == null) {
return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND); return new ResultData(ErrorCode.RENT_CONTRACT_IS_NOT_FOUND);
} }
int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;

Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.setTime(record.getRentalStartDate()); instance.setTime(record.getRentalStartDate());
instance.add(Calendar.MONTH, record.getLease());
instance.add(dayType, record.getLease());
instance.add(Calendar.DAY_OF_MONTH, -1); instance.add(Calendar.DAY_OF_MONTH, -1);
record.setRentalEndDate(instance.getTime()); record.setRentalEndDate(instance.getTime());


@@ -316,7 +320,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillDeposit.setNeedPay(needpay); wxBillDeposit.setNeedPay(needpay);
wxBillDeposit.setOwe(needpay); wxBillDeposit.setOwe(needpay);
//找到计租方式 //找到计租方式
int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;
int dayType = wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH;


Date date = new Date(); Date date = new Date();
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
@@ -422,7 +426,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
} }
} }


public void buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, long userId, WxMerchant wxMerchant) {
public void buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant) {


int extralease = lease % receivePeriod; int extralease = lease % receivePeriod;
int extracount = extralease > 0 ? 1 : 0; int extracount = extralease > 0 ? 1 : 0;


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

@@ -175,9 +175,9 @@
<select id="getRentContractList" parameterType="hashmap" resultType="com.iformall.domain.po.WxRentContract"> <select id="getRentContractList" parameterType="hashmap" resultType="com.iformall.domain.po.WxRentContract">
select rc.*,s.shop_number from wx_rent_contract rc inner join wx_shop s on rc.shop_id=s.id select rc.*,s.shop_number from wx_rent_contract rc inner join wx_shop s on rc.shop_id=s.id
where rc.status not in(1,5,6,7) and rc.tenant_id=#{tenantId}
where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId}
and rc.id not in (select pc.rent_contract_id from ( and rc.id not in (select pc.rent_contract_id from (
select rent_contract_id from wx_property_contract where status not in(5,6,7) and tenant_id=#{tenantId}
select rent_contract_id from wx_property_contract where status not in(0,1,5,6,7) and tenant_id=#{tenantId}
) pc) ) pc)
<if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if> <if test=" null != rentShopType ">and rent_shop_type = #{rentShopType}</if>
</select> </select>


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