Przeglądaj źródła

fix bug

release_toaliyun_real
zhengfangyuan 3 lat temu
rodzic
commit
868345a033
3 zmienionych plików z 31 dodań i 2 usunięć
  1. +12
    -0
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java
  2. +12
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +7
    -0
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 12
- 0
mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java Wyświetl plik

@@ -34,6 +34,10 @@ public class TenantEntity extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="租户编号列表,查询使用",name="tenantIdList") @io.swagger.annotations.ApiModelProperty(value="租户编号列表,查询使用",name="tenantIdList")
@TableField(exist = false) @TableField(exist = false)
protected List<String> tenantIdList; protected List<String> tenantIdList;
@io.swagger.annotations.ApiModelProperty(value="父租户编号列表,查询使用",name="parentTenantIdList")
@TableField(exist = false)
protected List<String> parentTenantIdList;


public void updateTenantInfo(TenantEntity info) { public void updateTenantInfo(TenantEntity info) {
tenantId = info.getTenantId(); tenantId = info.getTenantId();
@@ -98,4 +102,12 @@ public class TenantEntity extends BaseEntity {
this.tenantIdList = tenantIdList; this.tenantIdList = tenantIdList;
} }


public List<String> getParentTenantIdList() {
return parentTenantIdList;
}

public void setParentTenantIdList(List<String> parentTenantIdList) {
this.parentTenantIdList = parentTenantIdList;
}

} }

+ 12
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Wyświetl plik

@@ -395,7 +395,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); mallTenantIdList.add(couponOrderTenantEntity.getTenantId());
//查询子广场 //查询子广场
WxMall wxMallq = new WxMall(); WxMall wxMallq = new WxMall();
wxMallq.setParentTenantId(couponOrderTenantEntity.getTenantId());
List<String> partlist = new ArrayList<String>();
partlist.add(couponOrderTenantEntity.getTenantId());
if (null != couponOrderTenantEntity.getParentTenantId()) {
partlist.add(couponOrderTenantEntity.getParentTenantId());
}
wxMallq.setParentTenantIdList(partlist);
List<WxMall> mallList = wxMallMapper.findList(wxMallq); List<WxMall> mallList = wxMallMapper.findList(wxMallq);
if ( null != mallList && mallList.size() > 0 ) { if ( null != mallList && mallList.size() > 0 ) {
for (WxMall mall : mallList) { for (WxMall mall : mallList) {
@@ -923,7 +928,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); mallTenantIdList.add(couponOrderTenantEntity.getTenantId());
//查询子广场 //查询子广场
WxMall wxMallq = new WxMall(); WxMall wxMallq = new WxMall();
wxMallq.setParentTenantId(couponOrderTenantEntity.getTenantId());
List<String> partlist = new ArrayList<String>();
partlist.add(couponOrderTenantEntity.getTenantId());
if (null != couponOrderTenantEntity.getParentTenantId()) {
partlist.add(couponOrderTenantEntity.getParentTenantId());
}
wxMallq.setParentTenantIdList(partlist);
List<WxMall> mallList = wxMallMapper.findList(wxMallq); List<WxMall> mallList = wxMallMapper.findList(wxMallq);
if ( null != mallList && mallList.size() > 0 ) { if ( null != mallList && mallList.size() > 0 ) {
for (WxMall mall : mallList) { for (WxMall mall : mallList) {


+ 7
- 0
mallinkService/src/main/resources/mapper/WxMallMapper.xml Wyświetl plik

@@ -151,6 +151,13 @@
#{tIdItem} #{tIdItem}
</foreach> </foreach>
</if> </if>
<if test=" null != parentTenantIdList ">
and parent_tenant_id in
<foreach collection="parentTenantIdList" index="index" item="ptIdItem" open="(" separator="," close=")">
#{ptIdItem}
</foreach>
</if>


<if test=" null != ids "> <if test=" null != ids ">
and id in and id in


Ładowanie…
Anuluj
Zapisz