Browse Source

// merchant

release_toaliyun_real
xhxu 3 years ago
parent
commit
235fe7dddc
2 changed files with 8 additions and 4 deletions
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
  2. +6
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java View File

@@ -34,6 +34,8 @@ public class WxMerchantBUser extends TenantEntity {
private String merchantName;
@TableField(exist = false)
private List<Long> merchantIds;
@TableField(exist = false)
private Long notMerchantId;
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate")


+ 6
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java View File

@@ -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<Long> notIds = new ArrayList<>();
notIds.add(record.getNotMerchantId());
merchantQ1.setNotInids(notIds);
}
List<Long> merchantIdList = wxMerchantMapper.findIdList(merchantQ1);
if(merchantIdList == null || merchantIdList.isEmpty()){
return new PageInfo<WxMerchantBUser>();


Loading…
Cancel
Save