From b8e8df02e1ce1e4c10fedae30922f1add94ea4d6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 1 Mar 2023 15:57:16 +0800 Subject: [PATCH 1/6] //CouponMerchant --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index ee9d2df59..a59828fdf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -220,6 +220,8 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.wxFlowConfigMapper.wxFlowConfigInit".equals(ms.getId())) return true; + if ("com.iformall.mapper.WxCouponMerchantMapper.insertList".equals(ms.getId())) + return true; return false; } From b738f6f54350fd73c7b7c6d7285a233dededd583 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 1 Mar 2023 16:08:34 +0800 Subject: [PATCH 2/6] //CouponMerchant --- .../main/java/com/iformall/mapper/WxCouponMerchantMapper.java | 2 +- .../src/main/resources/mapper/WxCouponMerchantMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java index f4d75f5b6..b3de28496 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java @@ -28,5 +28,5 @@ public interface WxCouponMerchantMapper extends CommonMapper merchantIds,@Param("status")Integer status); - int insertList(List addList); + int insertList(@Param("addList")List addList); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 8dd35025d..da5b440ab 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -209,7 +209,7 @@ insert into wx_coupon_merchant (`id`,`tenant_id`,`parent_tenant_id`,`product_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status`) values - + (#{item.id,jdbcType=BIGINT}, #{item.tenantId,jdbcType=VARCHAR}, #{item.parentTenantId,jdbcType=VARCHAR}, From 8d2f382f98384fb5ebd78e3af4c8c74b042c35cb Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 1 Mar 2023 16:26:10 +0800 Subject: [PATCH 3/6] //CouponMerchant --- .../java/com/iformall/controller/market/WxCouponController.java | 1 + .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index ef3db5c16..962926ed0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -307,6 +307,7 @@ public class WxCouponController extends BaseController { * @param wxCoupon * @return */ + @TenantIgnore @ApiOperation("商场批量设置商户") @PostMapping("/setManyCouponMerchants") public ResultData setManyCouponMerchants(@RequestBody WxCoupon wxCoupon) { diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index a59828fdf..ee9d2df59 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -220,8 +220,6 @@ public class TenantInfoImpl implements TenantInfo { return true; if ("com.iformall.mapper.wxFlowConfigMapper.wxFlowConfigInit".equals(ms.getId())) return true; - if ("com.iformall.mapper.WxCouponMerchantMapper.insertList".equals(ms.getId())) - return true; return false; } From a6062db7f9dd612551dc5083fa395fbe16e282e5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 1 Mar 2023 16:40:03 +0800 Subject: [PATCH 4/6] //CouponMerchant --- .../java/com/iformall/controller/market/WxCouponController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 962926ed0..ab0c9c636 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -307,7 +307,7 @@ public class WxCouponController extends BaseController { * @param wxCoupon * @return */ - @TenantIgnore +// @TenantIgnore @ApiOperation("商场批量设置商户") @PostMapping("/setManyCouponMerchants") public ResultData setManyCouponMerchants(@RequestBody WxCoupon wxCoupon) { From 822db5d759c15b3a633629b6bed4b0c370d4bcf6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 1 Mar 2023 16:47:04 +0800 Subject: [PATCH 5/6] //CouponMerchant --- .../src/main/resources/mapper/WxCouponMerchantMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index da5b440ab..7a86dc052 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -211,8 +211,8 @@ values (#{item.id,jdbcType=BIGINT}, - #{item.tenantId,jdbcType=VARCHAR}, - #{item.parentTenantId,jdbcType=VARCHAR}, + /*#{item.tenantId,jdbcType=VARCHAR}, + #{item.parentTenantId,jdbcType=VARCHAR},*/ #{item.productId,jdbcType=BIGINT}, #{item.merchantId,jdbcType=BIGINT}, #{item.parameter,jdbcType=VARCHAR}, From e9b2f82317f9c39ce2f34f8167ba4a969dffc583 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 1 Mar 2023 17:01:16 +0800 Subject: [PATCH 6/6] //CouponMerchant --- .../main/java/com/iformall/mapper/WxCouponMerchantMapper.java | 1 + .../src/main/resources/mapper/WxCouponMerchantMapper.xml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java index b3de28496..7daa8c3d5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java @@ -28,5 +28,6 @@ public interface WxCouponMerchantMapper extends CommonMapper merchantIds,@Param("status")Integer status); + //自动加tenent int insertList(@Param("addList")List addList); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 7a86dc052..ffb33ac2c 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -207,12 +207,10 @@ insert into wx_coupon_merchant - (`id`,`tenant_id`,`parent_tenant_id`,`product_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status`) + (`id`,`product_id`,`merchant_id`,`parameter`,`create_date`,`update_date`,`status`) values (#{item.id,jdbcType=BIGINT}, - /*#{item.tenantId,jdbcType=VARCHAR}, - #{item.parentTenantId,jdbcType=VARCHAR},*/ #{item.productId,jdbcType=BIGINT}, #{item.merchantId,jdbcType=BIGINT}, #{item.parameter,jdbcType=VARCHAR},