Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-18 06ea0fe23faf2238d9d1141826ecb404367aecec

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -112,6 +112,7 @@
    @Resource
    private IntegralRuleClient integralRuleClient;


    @Resource
    private VipClient vipClient;
    @Resource
@@ -363,6 +364,14 @@
        R<Map<Integer, String>> vipMap = otherClient.getVipMap(vipIds);
        //循环处理
        for (TAppUser appUser : page.getRecords()) {
            if (appUser.getProvinceCode()!=null){
                Region data = otherClient.getRegionBuyCode(appUser.getProvinceCode()).getData();
                appUser.setProvince(data.getName());
            }
            if(appUser.getCityCode()!=null){
                Region data = otherClient.getRegionBuyCode(appUser.getCityCode()).getData();
                appUser.setProvince(data.getName());
            }
            //拿到最新的tagId
            TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();
            //设置最新的tagName