From 964c8aac17ed2a790da04a586c874dd682fcec04 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 30 May 2022 14:43:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=8E=B7=E5=8F=96=E4=BC=98=E6=83=A0=E5=8C=85?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageFeign.java | 6 +- .../BaseDiscountpackageFeignFallback.java | 64 +++++++++---------- .../BaseDiscountpackageRest.java | 4 +- .../BaseDiscountpackageService.java | 7 +- 4 files changed, 39 insertions(+), 42 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java index c7b8b7850a..e873e71598 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java @@ -1,6 +1,5 @@ package com.yxt.anrui.base.api.basediscountpackage; -import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -8,7 +7,6 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -67,6 +65,6 @@ public interface BaseDiscountpackageFeign { ResultBean> selectSalesOrderList(@RequestBody PagerQuery query); @ApiOperation("移动端-销售订单获取销售政策优惠包") - @GetMapping("/getAppPackage") - ResultBean> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery query); + @GetMapping("/getAppPackage/{userSid}") + ResultBean> getAppPackage(@PathVariable(value = "userSid") String userSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java index 13aff61611..903cee4216 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java @@ -26,45 +26,45 @@ import java.util.List; public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeign { - @Override - public ResultBean> listPage(PagerQuery pq) { - return null; - } + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } - @Override - public ResultBean save(BaseDiscountpackageDto dto) { - return null; - } + @Override + public ResultBean save(BaseDiscountpackageDto dto) { + return null; + } - @Override - public ResultBean update(BaseDiscountpackageDto dto, String sid) { - return null; - } + @Override + public ResultBean update(BaseDiscountpackageDto dto, String sid) { + return null; + } - @Override - public ResultBean deleteBySids(String[] sids) { - return null; - } + @Override + public ResultBean deleteBySids(String[] sids) { + return null; + } - @Override - public ResultBean fetchSid(String sid) { - return null; - } + @Override + public ResultBean fetchSid(String sid) { + return null; + } - @Override - public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) { - return null; - } + @Override + public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) { + return null; + } - @Override - public ResultBean> selectSalesOrderList(PagerQuery query) { - return null; - } + @Override + public ResultBean> selectSalesOrderList(PagerQuery query) { + return null; + } - @Override - public ResultBean> getAppPackage(AppBaseDiscountpackageQuery query) { - return null; - } + @Override + public ResultBean> getAppPackage(String userSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java index 7f5902c694..9250dfe293 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java @@ -125,8 +125,8 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign { } @Override - public ResultBean> getAppPackage(AppBaseDiscountpackageQuery query) { - return baseDiscountpackageService.getAppPackage(query); + public ResultBean> getAppPackage(String userSid) { + return baseDiscountpackageService.getAppPackage(userSid); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index f2593cc896..eade9f122c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basediscountpackage.*; -import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; import com.yxt.anrui.base.biz.flow.FlowableService; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; @@ -313,13 +312,13 @@ public class BaseDiscountpackageService extends MybatisBaseService> getAppPackage(AppBaseDiscountpackageQuery query) { + public ResultBean> getAppPackage(String userSid) { ResultBean> rb = ResultBean.fireFail(); QueryWrapper qw = new QueryWrapper<>(); - if (query != null) { + if (StringUtils.isNotBlank(userSid)) { //根据申请人sid查询分公司sid String orgSid = ""; - ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()); + ResultBean stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); if (stringResultBean.getSuccess()) { orgSid = stringResultBean.getData(); }