销售订单-移动端获取优惠包下拉框列表

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<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(@RequestBody PagerQuery<BaseSalesDicountQuery> query);
 
     @ApiOperation("移动端-销售订单获取销售政策优惠包")
-    @GetMapping("/getAppPackage")
-    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery query);
+    @GetMapping("/getAppPackage/{userSid}")
+    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
 }

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<PagerVo<BaseDiscountpackagePageListVo>> listPage(PagerQuery<BaseDiscountpackageQuery> pq) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<BaseDiscountpackagePageListVo>> listPage(PagerQuery<BaseDiscountpackageQuery> 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<BaseDiscountpackageVo> fetchSid(String sid) {
-		return null;
-	}
+    @Override
+    public ResultBean<BaseDiscountpackageVo> fetchSid(String sid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) {
-		return null;
-	}
+    @Override
+    public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(PagerQuery<BaseSalesDicountQuery> query) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(PagerQuery<BaseSalesDicountQuery> query) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
-		return null;
-	}
+    @Override
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
+        return null;
+    }
 
 
 }

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<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
-        return baseDiscountpackageService.getAppPackage(query);
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
+        return baseDiscountpackageService.getAppPackage(userSid);
     }
 
 }

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<BaseDiscountp
         return qw;
     }
 
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
         ResultBean<List<AppBaseDiscountpackageVo>> rb = ResultBean.fireFail();
         QueryWrapper<BaseDiscountpackage> qw = new QueryWrapper<>();
-        if (query != null) {
+        if (StringUtils.isNotBlank(userSid)) {
             //根据申请人sid查询分公司sid
             String orgSid = "";
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
             if (stringResultBean.getSuccess()) {
                 orgSid = stringResultBean.getData();
             }