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

[租赁账单与物业账单][修改][滞纳金结算及展示]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
c1fe164b76
5 измененных файлов: 11 добавлений и 8 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillActionMapper.xml
  4. +4
    -3
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  5. +4
    -2
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

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

@@ -231,7 +231,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
logger.error("修改营业额失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "滞纳金结单失败");
}
return new ResultData(Result.SUCCESS, "滞纳金结单成功");
return new ResultData(Result.SUCCESS, "滞纳金结单成功", record);
}

}

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

@@ -245,7 +245,7 @@ public class WxBillRentServiceImpl implements WxBillRentService {
logger.error("修改营业额失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "滞纳金结单失败");
}
return new ResultData(Result.SUCCESS, "滞纳金结单成功");
return new ResultData(Result.SUCCESS, "滞纳金结单成功", record);
}

}

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

@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.iformall.domain.po.WxBillAction">
<id column="id" jdbcType="BIGINT" property="id"/>
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
<result column="bill_id" jdbcType="BIGINT" property="bill_id"/>
<result column="bill_id" jdbcType="BIGINT" property="billId"/>
<result column="user_id" jdbcType="BIGINT" property="userId"/>
<result column="user_name" jdbcType="VARCHAR" property="userName"/>
<result column="phone" jdbcType="VARCHAR" property="phone"/>


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

@@ -85,9 +85,10 @@
br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`period`,
br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,
br.`property_contract_id` propertyContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0
else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice,
br.`property_contract_id` propertyContractId,d.receive_pay deposit,case when br.late_pay_status=2
then (case when br.late_pay_time is null then 0
else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end)
else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_property where property_contract_id=br.property_contract_id)
allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id


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

@@ -88,8 +88,10 @@
br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`,
br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,r.type rentType,r.pay_ratio payRatio,
br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,br.`period`,
br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else
FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice,
br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_status=2
then (case when br.late_pay_time is null then 0
else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end)
else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status`
depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id


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