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

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
d148e9c9e5
4 измененных файлов: 7 добавлений и 6 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  3. +1
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
  4. +2
    -2
      mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml

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

@@ -358,8 +358,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
billAction.setUpdatetime(new Date());
wxBillActionMapper.insert(billAction);
}
if(record.getServiceChargePay() != null) {
record.setServiceChargePay(record.getServiceChargePay() * 100);
if(record.getServiceChargePayUpdate() != null) {
record.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100);

billAction = new WxBillAction();
billAction.setId(idWorker.nextId());


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

@@ -471,8 +471,8 @@ public class WxBillRentServiceImpl implements WxBillRentService {
billAction.setUpdatetime(new Date());
wxBillActionMapper.insert(billAction);
}
if(record.getServiceChargePay() != null) {
record.setServiceChargePay(record.getServiceChargePay() * 100);
if(record.getServiceChargePayUpdate() != null) {
record.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100);

billAction = new WxBillAction();
billAction.setId(idWorker.nextId());


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

@@ -487,6 +487,7 @@
and o.tenant_id=#{tenantId}
<if test=" null != id ">
and cm.`merchant_id` = #{id}
and mb.merchant_id = #{id}
</if>

<if test=" null != userName ">


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

@@ -210,7 +210,7 @@
<select id="getRentContractListByShop" parameterType="hashmap" resultType="com.iformall.domain.po.WxRentContract">
select rc.* from wx_rent_contract rc
where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId}
where rc.status not in(0,1,5,6,7,8) and rc.tenant_id=#{tenantId}
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}
) pc)
@@ -220,7 +220,7 @@
<select id="getRentContractListByPoint" 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
where rc.status not in(0,1,5,6,7) and rc.tenant_id=#{tenantId}
where rc.status not in(0,1,5,6,7,8) and rc.tenant_id=#{tenantId}
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}
) pc)


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