From 235fe7dddc67d1b7b7fd2c0461afea249b8005b2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 5 Aug 2022 14:22:52 +0800 Subject: [PATCH] // merchant --- .../java/com/iformall/domain/po/WxMerchantBUser.java | 2 ++ .../service/impl/WxMerchantBUserServiceImpl.java | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index b02bcb433..328dfd5c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -34,6 +34,8 @@ public class WxMerchantBUser extends TenantEntity { private String merchantName; @TableField(exist = false) private List merchantIds; + @TableField(exist = false) + private Long notMerchantId; @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 5086d55ee..53b884613 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -26,10 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -58,6 +55,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { merchantQ1.updateTenantInfo(record); merchantQ1.setName(record.getMerchantName()); merchantQ1.setStatus(EnumMerchantStatus.VALID.getCode()); + if(record.getNotMerchantId() != null){ + List notIds = new ArrayList<>(); + notIds.add(record.getNotMerchantId()); + merchantQ1.setNotInids(notIds); + } List merchantIdList = wxMerchantMapper.findIdList(merchantQ1); if(merchantIdList == null || merchantIdList.isEmpty()){ return new PageInfo();