ソースを参照

fix business

release_toaliyun_real
lin 3年前
コミット
8700c02969
4個のファイルの変更9行の追加9行の削除
  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. +1
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  4. +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(@Param("finalTenantId") String finalTenantId);
List<WxBusiness> findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode);
List<WxBusiness> findListForMerchant(@Param("finalTenantId") String finalTenantId,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId);
List<WxBusiness> findListForCoupon(@Param("finalTenantId") String finalTenantId,@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 ファイルの表示

@@ -57,9 +57,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(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode);
return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode);
}else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) {
return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId(), tenantEntity.getParentTenantId());
return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId());
}else {
return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId());
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java ファイルの表示

@@ -399,7 +399,7 @@ public class InvestBizServiceImpl implements InvestBizService {
private Map<String, WxBusiness> getBusinessMap(TenantEntity tenantEntity) {
WxBusiness bq = new WxBusiness();
bq.setFinalTenantId(tenantEntity.getFinalTenantId());
List<WxBusiness> businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList();
List<WxBusiness> businesses = businessService.listAsPage(bq, 1, Integer.MAX_VALUE).getList();
return getMap(businesses, WxBusiness::getTitle);
}



+ 4
- 4
mallinkService/src/main/resources/mapper/WxBusinessMapper.xml ファイルの表示

@@ -98,8 +98,8 @@
<select id="findListForMerchant" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_business b
where
from wx_business b
where b.`final_tenant_id` = #{finalTenantId} and
(select count(*) from wx_merchant m
where b.id = m.business_id
<if test=" null != tenantId and '' != tenantId">
@@ -116,8 +116,8 @@
<select id="findListForCoupon" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_business b
where
from wx_business b
where b.`final_tenant_id` = #{finalTenantId} and
(select count(*) from wx_coupon_channel cc
where b.id = cc.business
and cc.status = 0


読み込み中…
キャンセル
保存