diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java
index 26c8f7f60..13676c0bc 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
/**
* @author Stormeye
@@ -17,16 +18,26 @@ public class TenantVEntity extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
+ @TableField(exist = false)
+ @io.swagger.annotations.ApiModelProperty(value="父租户ID",name="parentTenantId")
+ private String parentTenantId;
+
@TableField(exist = false)
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private TenantEntity tenantInfo;
public void updateTenantInfo(TenantEntity info) {
setTenantId(info.getTenantId());
+ if (StringUtils.isNotBlank(info.getParentTenantId())) {
+ setParentTenantId(info.getParentTenantId());
+ }
}
public void updateTenantInfo(TenantVEntity info) {
setTenantId(info.getTenantId());
+ if (StringUtils.isNotBlank(info.getParentTenantId())) {
+ setParentTenantId(info.getParentTenantId());
+ }
}
public TenantEntity getTenantInfo() {
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index 9cc65084b..8b86ee9be 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -1131,8 +1131,11 @@
and co.owner_id = #{ownerId}
-
- and co.tenant_id = #{tenantId}
+
+ and co.`tenant_id` = #{tenantId}
+
+
+ and co.`parent_tenant_id` = #{parentTenantId}
AND (co.coupon_order_status = #{couponOrderStatus} OR co.coupon_order_status = 100 )
@@ -1351,12 +1354,13 @@
inner join wx_card_info a on co.id=a.id
where 1=1
and co.coupon_type = 100
-
- and co.tenant_id = #{tenantId}
+
+ and co.`tenant_id` = #{tenantId}
-
- and co.parent_tenant_id = #{parentTenantId}
+
+ and co.`parent_tenant_id` = #{parentTenantId}
+
and co.c_user_id = #{cUserId}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index 956b02f15..23d11aeae 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -412,10 +412,10 @@
left join wx_business bu on bu.id = m.business_id
where 1=1 and m.is_del=0
-
+
and m.`tenant_id` = #{tenantId}
-
+
and m.`parent_tenant_id` = #{parentTenantId}
@@ -474,9 +474,11 @@
and mb.id = #{buildingId}
- and m.tenant_id = #{tenantId}
-
- and m.parent_tenant_id = #{parentTenantId}
+
+ and m.`tenant_id` = #{tenantId}
+
+
+ and m.`parent_tenant_id` = #{parentTenantId}
and s.is_del = 0
and ms.is_del = 0
@@ -509,12 +511,12 @@
left join wx_merchant_b_user mbu on m.id=mbu.merchant_id where mbu.status=0) m
on co.b_user_id=m.b_user_id
WHERE co.coupon_order_status = 1
-
- and co.tenant_id = #{tenantId}
-
-
- and co.parent_tenant_id = #{parentTenantId}
-
+
+ and co.`tenant_id` = #{tenantId}
+
+
+ and co.`parent_tenant_id` = #{parentTenantId}
+
and co.create_date >= #{starttime}