Browse Source

Merge remote-tracking branch 'origin/release_toaliyun_real' into release_toaliyun_real

release_toaliyun_real
xhxu 3 years ago
parent
commit
df8ce4da7e
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml

+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml View File

@@ -85,7 +85,7 @@
select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` ,
case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name, case when br.status=1 then br.owe else 0 end owe,br.`status`,m.`name` merchant_name,
br.`updatetime`,br.`merchant_id`,br.shop_id,br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail, br.`updatetime`,br.`merchant_id`,br.shop_id,br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,
br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`,
br.`starttime`,br.`endtime`,br.`build_way`,br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`
from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id
<where> <where>
<if test=" null != freeze ">and br.`freeze` = #{freeze}</if> <if test=" null != freeze ">and br.`freeze` = #{freeze}</if>


Loading…
Cancel
Save