From 4ec39fb68873a8167e4f75bd85ee11fe6e913f5f Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 5 Sep 2019 13:43:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=BB=93=E7=AE=97=E5=8D=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillDailyMapper.xml | 1 + .../src/main/resources/mapper/WxBillOtherDepositMapper.xml | 4 ++-- .../src/main/resources/mapper/WxBillOtherMapper.xml | 1 + .../src/main/resources/mapper/WxBillPropertyMapper.xml | 1 + mallinkService/src/main/resources/mapper/WxBillRentMapper.xml | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 490c4b446..6978678fc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -81,6 +81,7 @@ from wx_bill_daily br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id + and br.`freeze` = #{freeze} and br.`id` = #{id} and br.`merchant_id` = #{merchantId} and m.`name` like concat('%',#{merchantName},'%') diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 772f6d851..75650ca77 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -84,9 +84,9 @@ left join wx_shop s on br.shop_id=s.id and br.`id` = #{id} + and br.`freeze` = #{freeze} and br.`merchant_id` = #{merchantId} - and m.`name` like concat('%',#{merchantName},'%') - + and m.`name` like concat('%',#{merchantName},'%') and br.`status` = #{status} and br.`is_del` = #{isDel} and br.`name` = #{name} diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index e5169fef8..3b5e2cc13 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -80,6 +80,7 @@ left join wx_shop s on br.shop_id=s.id and br.`id` = #{id} + and br.`freeze` = #{freeze} and br.`merchant_id` = #{merchantId} and m.`name` like concat('%',#{merchantName},'%') and br.`status` = #{status} diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index d1f1298cb..2822a3e8a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -104,6 +104,7 @@ left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id br.is_preview = 0 + and br.`freeze` = #{freeze} and br.`id` = #{id} and br.`merchant_id` = #{merchantId} and m.`name` like concat('%',#{merchantName},'%') diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 460957d01..bf495da28 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -112,6 +112,7 @@ left join wx_bill_rent_deposit d on br.rent_contract_id=d.rent_contract_id and br.merchant_id=d.merchant_id br.is_preview = 0 + and br.`freeze` = #{freeze} and br.`rent_shop_type` = #{rentShopType} and br.`status` = #{status} and d.`status` = #{depositStatus}