Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
d1601801a4
5 zmienionych plików z 11 dodań i 11 usunięć
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  3. +5
    -5
      mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
  5. +3
    -3
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java Wyświetl plik

@@ -464,7 +464,7 @@ public class BaseMyBatisConfiguration {
shardingList.add(wxEnergyFeesSetoffSharding);
ShardingSphere wxFinanceReceiveSharding = new ShardingSphere();
wxEnergyFeesSetoffSharding.setColumn("tenant_id");
wxFinanceReceiveSharding.setColumn("tenant_id");
wxFinanceReceiveSharding.setTableName("wx_finance_receive");
wxFinanceReceiveSharding.setCount(100);
wxFinanceReceiveSharding.setRule(EnumShardingRule.HASH.getCode());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml Wyświetl plik

@@ -162,7 +162,7 @@
<select id="queryBillDepositList" parameterType="com.iformall.domain.po.WxBillPropertyDeposit" resultMap="BaseResultMap">
select br.`id`,br.`tenant_id`,br.`parent_tenant_id`,br.`property_contract_id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`status`,
br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`,,br.`set_off`,
br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way,br.`starttime`,br.`endtime`,br.`last_owe_call_user`,br.`set_off`,
br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,br.`create_by`,br.`create_by_name`,br.`update_by`,br.`update_by_name`,br.`energy_fees_id`
from wx_bill_property_deposit br
<include refid="queryBillDepositListConditions"/>


+ 5
- 5
mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml Wyświetl plik

@@ -85,7 +85,7 @@
<if test=" null != payWay ">and `pay_way` = #{payWay}</if>
<if test=" null != latePayStatus ">and `late_pay_status` = #{latePayStatus}</if>
<if test=" null != manageFeeType ">and `manage_fee_type` = #{manageFeeType}</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and merchant_id in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">
@@ -145,17 +145,17 @@
and date_format(br.starttime,'%Y-%m') &lt;= #{month} and date_format(br.endtime,'%Y-%m') &gt;= #{month}
</if>
<if test=" null == nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{oweBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != nearBillLastTime and null != oweBillLastTime">
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &gt; #{oweBillLastTime} and br.`starttime` &lt;= #{nearBillLastTime} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != needPayStartDay">
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7))
and (br.`starttime` &lt;= #{needPayStartDay} and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7))
</if>
<if test=" null != manageFeeType ">and br.`manage_fee_type` = #{manageFeeType}</if>
<if test=" null != hasMerchant ">and br.`merchant_id` is not null</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` - br.`set_off` &gt; 0 and br.status not in (3,6,7) )</if>
<if test=" null != merchantIds ">
and br.merchant_id in
<foreach collection="merchantIds" index="index" item="midItem" open="(" separator="," close=")">


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Wyświetl plik

@@ -109,7 +109,7 @@
<if test=" null != endtimeEnd">
and endtime &lt; #{endtimeEnd}
</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off &gt; 0 and status not in (3,6,7) )</if>
<if test=" 1 == notifyed ">and (`last_owe_call_time` is not null and `receive_pay` - `pay` - `set_off` &gt; 0 and status not in (3,6,7) )</if>
<if test=" null != statusList ">
and status in
<foreach collection="statusList" index="index" item="stItem" open="(" separator="," close=")">


+ 3
- 3
mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml Wyświetl plik

@@ -39,13 +39,13 @@
</if>
<if test=" null != status ">and `status` = #{status}</if>
<if test=" null != type ">and `type` = #{type}</if>
<if test=" null != merchantId ">and `merchantId` = #{merchant_id}</if>
<if test=" null != merchantId ">and `merchant_id` = #{merchantId}</if>
<if test=" null != createTimeBegin ">and `create_time` &gt;= #{createTimeBegin}</if>
<if test=" null != createTimeEnd ">and `create_time` &lt;= #{createTimeEnd}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != isPrint ">and `is_print` = #{isPrint}</if>
<if test=" null != merchantIdList ">
and merchantId in
and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">
#{midItem}
</foreach>
@@ -86,7 +86,7 @@
select fees_id,sum(CAST(receive_money AS DECIMAL(20,4))) as receive_money,sum(CAST(use_money AS DECIMAL(20,4))) as use_money
from wx_finance_receive
<include refid="dynamicWhereConditions"/>
and money - use_money &gt; 0
and receive_money - use_money &gt; 0
group by fees_id
</select>


Ładowanie…
Anuluj
Zapisz