fix car pay

mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java

@@ -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);
     }

mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

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

mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

@@ -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}