From 0635096705178a2b27010c500905968e8edd60f4 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 15 Feb 2023 11:19:08 +0800 Subject: [PATCH 1/2] fix car pay --- .../src/main/java/com/iformall/config/ShiroConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java index 3a45473a3..789c83120 100644 --- a/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkCallback/src/main/java/com/iformall/config/ShiroConfig.java @@ -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"); From f0b04655a726bb05821c530781f0eb960838cf33 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Wed, 15 Feb 2023 11:29:34 +0800 Subject: [PATCH 2/2] fix car pay --- .../com/iformall/controller/basic/WxMerchantController.java | 1 + .../src/main/java/com/iformall/domain/po/WxMerchant.java | 2 ++ mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 965b3a6bc..0b6569335 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/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 page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index d01e154c7..69b66c5ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/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; } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 618d4e268..8b9e05cef 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -108,6 +108,10 @@ and m.`car_vendor_type` is not null and m.`car_vendor_type` > 0 + + + and (m.`car_vendor_type` = 0 or m.`car_vendor_type` is null) + and m.`business_id` = #{businessId}