12.16

luodangjia

2024-12-16 a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java

@@ -3,6 +3,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.AppUserShop;
import com.ruoyi.account.api.model.UserChangeLog;
@@ -31,8 +33,10 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import org.apache.logging.log4j.core.util.UuidUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -89,13 +93,10 @@

   @Resource
   private UserPointService userPointService;
	
	
	
	
	
	
	
    @Autowired
    private AppUserMapper appUserMapper;


   /**
    * 小程序一键登录
    * @param appletLogin
@@ -610,4 +611,18 @@
         }
      }
   }

   @Override
   public IPage<AppUser> getAppuserPage(Integer pageNum, Integer pageSize, AppUser appUser) {
      if (StringUtils.isNotEmpty(appUser.getShopName())){
         R<Set<Integer>> shopR = shopClient.getShopIdByName(appUser.getShopName());
         if (R.isSuccess(shopR)){
            Set<Integer> shopIds = shopR.getData();
            if (!CollectionUtils.isEmpty(shopIds)){
               appUser.setShopIds(shopIds);
            }
         }
      }
      return appUserMapper.getAppuserPage(new Page<>(pageNum, pageSize), appUser);
   }
}