bug修改

无关风月

2024-10-18 5d9ed7bdc6ab8f8d49818cdb9c5137ae28ae9233

bug修改

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.dto.TagListQueryDto;
import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.OtherClient;
@@ -102,6 +99,11 @@
            public R<List<TEnterpriseUserApplication>> getTnterPrise() {
                return R.fail("查询:"+throwable.getMessage());
            }

            @Override
            public R<Region> getRegionBuyCode(String code) {
                return R.fail("远程调用根据code查询名称失败:"+throwable.getMessage());
            }
        };
    }
}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java

@@ -72,4 +72,6 @@

    @PutMapping(value = "/t-enterprise-user-application/export")
    R<List<TEnterpriseUserApplication>> getTnterPrise();
    @GetMapping("/region/getRegionBuyCode/{code}")
    R<Region> getRegionBuyCode(@PathVariable("code") String code);
}

 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

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml

@@ -71,7 +71,7 @@
                </foreach>
            </if>
        </where>
        ORDER BY toi.billing_time DESC
        ORDER BY toi.create_time DESC
    </select>
    <select id="statusCount" resultType="java.util.Map">
        select

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java

@@ -1,6 +1,7 @@
package com.ruoyi.other.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.Region;
import com.ruoyi.other.service.IRegionService;
@@ -34,4 +35,15 @@
        List<Region> list = regionService.list(new LambdaQueryWrapper<Region>().eq(Region::getParentId, pid));
        return AjaxResult.success(list);
    }

    /**
     * 根据code获取对应名称
     * @return
     */
    @ResponseBody
    @GetMapping("/getRegionBuyCode/{code}")
    public R<Region> getRegionBuyCode(@PathVariable("code") String code){
        Region list = regionService.getOne(new LambdaQueryWrapper<Region>().eq(Region::getCode, code));
        return R.ok(list);
    }
}