Sfoglia il codice sorgente

[首页统计][修改][优化展示]

release_toaliyun_real
luozukai 7 anni fa
parent
commit
4435f14ac7
2 ha cambiato i file con 4 aggiunte e 6 eliminazioni
  1. +2
    -3
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  2. +2
    -3
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 2
- 3
mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml Vedi File

@@ -30,7 +30,6 @@
<result column="pay_way" jdbcType="INTEGER" property="payWay"/> <result column="pay_way" jdbcType="INTEGER" property="payWay"/>
<result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/> <result column="late_pay_status" jdbcType="INTEGER" property="latePayStatus"/>
<result column="comments" jdbcType="VARCHAR" property="comments"/> <result column="comments" jdbcType="VARCHAR" property="comments"/>
<result column="receive_pay_update" property="receivePayUpdate"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
@@ -38,7 +37,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`,`comments`,receive_pay_update
`pay_way`,`late_pay_status`,`comments`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -92,7 +91,7 @@
else br.late_pay_price end latePayPrice, else br.late_pay_price end latePayPrice,
(select max(period) from wx_bill_property where property_contract_id=br.property_contract_id) (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, allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
br.`comments`,br.receive_pay_update
br.`comments`
from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id left join wx_shop s on br.shop_id=s.id
left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id


+ 2
- 3
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Vedi File

@@ -32,7 +32,6 @@
<result column="comments" jdbcType="VARCHAR" property="comments"/> <result column="comments" jdbcType="VARCHAR" property="comments"/>
<result column="starttime" property="starttime"/> <result column="starttime" property="starttime"/>
<result column="endtime" property="endtime"/> <result column="endtime" property="endtime"/>
<result column="receive_pay_update" property="receivePayUpdate"/>


</resultMap> </resultMap>


@@ -41,7 +40,7 @@
`createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`,
`merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`,
`revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`,
`pay_way`,`late_pay_status`,`comments`,receive_pay_update
`pay_way`,`late_pay_status`,`comments`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">
@@ -98,7 +97,7 @@
else br.late_pay_price end latePayPrice, 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` (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, depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus,
br.`comments`,br.receive_pay_update
br.`comments`
from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id
left join wx_shop s on br.shop_id=s.id left join wx_shop s on br.shop_id=s.id
left join wx_rent_contract r on br.rent_contract_id=r.id left join wx_rent_contract r on br.rent_contract_id=r.id


Caricamento…
Annulla
Salva