Browse Source

Merge branch 'release_toaliyun_real_202302' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202302

release_toaliyun_real
xhxu 3 years ago
parent
commit
11a8fef11e
4 changed files with 8 additions and 0 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +1
    -0
      mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  4. +4
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java View File

@@ -87,6 +87,7 @@ public class WxMerchantController extends BaseController {
wxMerchant.updateTenantInfo(getTenantInfo());
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC);
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode());
wxMerchant.setNoCarVendor(1);
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false);
return new ResultData(page);
}


+ 1
- 0
mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java View File

@@ -121,6 +121,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/jieshunCarCallback/**", "anon");
filterChainDefinitionMap.put("/cyfCarCallback/**", "anon");
filterChainDefinitionMap.put("/hkwsCarCallback/**", "anon");
filterChainDefinitionMap.put("/futeCarCallback/**", "anon");

// static files
filterChainDefinitionMap.put("/css/**", "anon");


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java View File

@@ -408,5 +408,7 @@ public class WxMerchant extends TenantEntity {
//查询停车商户根据此字段
@TableField(exist = false)
private Integer hasCarVendor;
@TableField(exist = false)
private Integer noCarVendor;

}

+ 4
- 0
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -108,6 +108,10 @@
<if test=" null != hasCarVendor ">
and m.`car_vendor_type` is not null and m.`car_vendor_type` > 0
</if>
<if test=" null != noCarVendor ">
and (m.`car_vendor_type` = 0 or m.`car_vendor_type` is null)
</if>

<if test=" null != businessId ">
and m.`business_id` = #{businessId}


Loading…
Cancel
Save