From 3514b9d65c7d5b6d8283ef2fb2a58d2f4178596c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 15 Dec 2018 14:09:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=8D=A1=E4=BF=A1=E6=81=AF=E3=80=81=E5=8D=A1?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=A1=A8=E6=B7=BB=E5=8A=A0tenant=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxCardInfo.java | 4 ++++ .../java/com/iformall/domain/po/WxCardSpend.java | 6 +++++- .../src/main/resources/mapper/WxCardInfoMapper.xml | 12 ++++++++---- .../src/main/resources/mapper/WxCardSpendMapper.xml | 8 ++++++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index 3a73b4c43..f103d666b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -21,6 +21,9 @@ public class WxCardInfo implements Serializable { @Transient protected String sortColumns; + /**租户ID*/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /**券ID*/ @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") private Long couponId; @@ -54,6 +57,7 @@ public class WxCardInfo implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") ,TransactionId_ASC("`transaction_id` ASC"),TransactionId_DESC("`transaction_id` DESC") ,Amount_ASC("`amount` ASC"),Amount_DESC("`amount` DESC") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index e27c7ebfe..1f29d5291 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -20,7 +20,10 @@ public class WxCardSpend implements Serializable { protected List ids; @Transient protected String sortColumns; - + + /**租户ID*/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /**储值卡ID*/ @io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId") private Long cardId; @@ -57,6 +60,7 @@ public class WxCardSpend implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,CardId_ASC("`card_id` ASC"),CardId_DESC("`card_id` DESC") ,OwnerId_ASC("`owner_id` ASC"),OwnerId_DESC("`owner_id` DESC") ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 3b3b6a7d4..a64f59270 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -3,7 +3,8 @@ - + + @@ -15,7 +16,7 @@ - `id`,`coupon_id`,`transaction_id`,`amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`,`create_date`,`update_date` + `id`,`tenant_id`,`coupon_id`,`transaction_id`,`amount`,`remaining_amount`,`service_fee_amount`,`share_fee_amount`,`remaining_share_fee_amount`,`create_date`,`update_date` @@ -23,11 +24,14 @@ and `id` = #{id} + + and `tenant_id` = #{tenantId} + - and `coupon_id` like concat('%', #{couponId},'%') + and `coupon_id` = #{couponId} - and `transaction_id` like concat('%', #{transactionId},'%') + and `transaction_id` = #{transactionId} and `amount` = #{amount} diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 6cf315bad..02002f502 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -3,6 +3,7 @@ + @@ -16,14 +17,17 @@ - `id`,`card_id`,`owner_id`,`merchant_id`,`order_id`,`payment`,`real_payment`,`remain_amount`,`before_amount`,`create_date`,`update_date` + `id`,`tenant_id`,`card_id`,`owner_id`,`merchant_id`,`order_id`,`payment`,`real_payment`,`remain_amount`,`before_amount`,`create_date`,`update_date` where 1 = 1 and `id` = #{id} - + + + and `tenant_id` = #{tenantId} + and `card_id` = #{cardId}