diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 6eefa9caa..38b96b2be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/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); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 97f96754f..d3503e063 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/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); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml index e68abb250..85d39ce31 100644 --- a/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillActionMapper.xml @@ -4,7 +4,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 2925b32a7..268baaa14 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/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 diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 48fcaef68..0f68c1830 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/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