Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 5a5b01fa9824a42e3eb033088a20e24c32b30dda

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

@@ -3,22 +3,26 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.TagListQueryDto;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.account.api.vo.CouponListVOVO;
import com.ruoyi.common.core.constant.ServiceNameConstants;
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.TUserTag;
import com.ruoyi.other.api.factory.GoodsFallbackFactory;
import com.ruoyi.other.api.factory.OtherFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

import java.util.List;
import java.util.Map;

/**
 * 商品服务
 * @author ruoyi
 */
@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = OtherFallbackFactory.class)
@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = OtherFallbackFactory.class)
public interface OtherClient {
    //单位分页
    @PostMapping(value = "/t-company/unit/page")
@@ -28,8 +32,10 @@
    R unitAddorUpadate(@RequestBody TCompany tCompany);
    //单位删除
    @PostMapping(value = "/t-company/unit/delete")
    R unitDelete(@RequestParam Integer id);
    R unitDelete(@RequestParam("id") Integer id);

    @PostMapping(value = "/t-company/unit/detail")
    R<TCompany> unitDetail(@RequestParam("id") Integer id);

    //标签分页
    @PostMapping(value = "/t-user-tag/page")
@@ -38,6 +44,34 @@
    //用户新增标签
    @PostMapping(value = "/t-user-tag/addorUpdateTag")
    R addorUpdateTag(@RequestBody TUserTag tUserTag);
    //删除用户标签
    @PostMapping(value = "/t-user-tag/delete")
    R deleteTag(@RequestParam Integer id);
    R deleteTag(@RequestParam("id") Integer id);

    //获取标签Map
    @PostMapping(value = "/t-user-tag/getTagMap")
    R<Map<Integer, String>> getTagMap(@RequestBody List<Integer> ids);
    //获取标签
    @PostMapping(value = "/t-user-tag/getById")
    R<TUserTag> getByIdTag(@RequestParam("id") Integer id);

    @PostMapping(value = "/vip/getVipMap")
    R<Map<Integer, String>> getVipMap(@RequestBody List<Integer> ids);

    /**
     * 小程序远程调用 获取优惠券信息
     */
    @PostMapping(value = "/t-coupon/getCouponInfoByCouponIds")
    R<List<CouponListVOVO>> getCouponInfoByCouponIds(@RequestBody List<CouponListVOVO> list);


    @PostMapping(value = "/t-coupon/getCouponById")
    R<TCoupon> getCouponById(@RequestParam Integer id);







}