From 79e1ab393800183e85beec3dc946d48452f49e44 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 3 Sep 2020 19:41:34 +0800 Subject: [PATCH] update --- .../java/com/iformall/b/CouponsendTest.java | 19 +++++++++++++++++++ .../java/com/iformall/domain/po/WxMall.java | 2 ++ 2 files changed, 21 insertions(+) diff --git a/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java b/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java index 9d82d06b0..fe3a47dc8 100644 --- a/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java +++ b/mallinkBApi/src/test/java/com/iformall/b/CouponsendTest.java @@ -3,7 +3,10 @@ package com.iformall.b; import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.databind.ObjectMapper; import com.iformall.domain.po.WxCouponSend; +import com.iformall.domain.po.WxLevelConfig; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCouponSendSendType; +import com.iformall.service.WxLevelConfigService; import lombok.extern.slf4j.Slf4j; import org.junit.FixMethodOrder; import org.junit.Test; @@ -23,6 +26,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; @Slf4j @@ -38,6 +42,21 @@ public class CouponsendTest { @Autowired private MockMvc mockMvc; + @Autowired + private WxLevelConfigService wxLevelConfigService; + + @Test + public void test1() throws Exception{ + List byTenantInfo = wxLevelConfigService.getByTenantInfo(new TenantEntity() {{ + setTenantId("789"); + }}); + List byTenantInfo1 = wxLevelConfigService.getByTenantInfo(new TenantEntity() {{ + setTenantId("789"); + }}); + log.info(byTenantInfo1.toString()); + + } + /** * 商户注券::卡券列表::全部 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index a7a112a63..739a126a5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; @@ -16,6 +17,7 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; +@JsonIgnoreProperties(value = {"handler"}) @TableName(value = "wx_mall") @Data @EqualsAndHashCode(callSuper = true)