Просмотр исходного кода

fix business

release_toaliyun_real
lin 3 лет назад
Родитель
Сommit
12fd10ab5d
3 измененных файлов: 8 добавлений и 8 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/resources/mapper/WxBusinessMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java Просмотреть файл

@@ -11,8 +11,8 @@ public interface WxBusinessMapper extends CommonMapper<WxBusiness, String> {
List<WxBusiness> findList(WxBusiness wxBusiness);

List<WxBusiness> findListAll(WxBusiness wxBusiness);
List<WxBusiness> findListForMerchant(@Param("wxBusiness")WxBusiness wxBusiness,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("wxBusiness")WxBusiness wxBusiness,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode);
List<WxBusiness> findListForMerchant(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode);


List<Map<String,Object>> businessDataList(WxBusiness wxBusiness);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java Просмотреть файл

@@ -60,9 +60,9 @@ public class WxBusinessServiceImpl implements WxBusinessService {
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) {
if (paltCode == null)
paltCode = EnumAppPlat.WX.getCode();
return wxBusinessMapper.findListForCoupon(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode);
return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode);
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) {
return wxBusinessMapper.findListForMerchant(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId());
return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId());
}else {
return wxBusinessMapper.findListAll(bq);
}


+ 4
- 4
mallinkService/src/main/resources/mapper/WxBusinessMapper.xml Просмотреть файл

@@ -102,8 +102,8 @@
select
<include refid="allColumns"/>
from wx_business b
where b.`final_tenant_id` = #{wxBusiness.finalTenantId}
<if test=" 1 == wxBusiness.isRoot">
where b.`final_tenant_id` = #{finalTenantId}
<if test=" 1 == isRoot">
and b.`parent_id` is null
</if>
and
@@ -124,8 +124,8 @@
select
<include refid="allColumns"/>
from wx_business b
where b.`final_tenant_id` = #{wxBusiness.finalTenantId}
<if test=" 1 == wxBusiness.isRoot">
where b.`final_tenant_id` = #{finalTenantId}
<if test=" 1 == isRoot">
and b.`parent_id` is null
</if>
and


Загрузка…
Отмена
Сохранить