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

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@@ -1,14 +1,21 @@
 package com.yxt.anrui.base.api.basediscountpackage;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+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;
 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.web.bind.annotation.*;
+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;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * Project: base_discountpackage(优惠包) <br/>
@@ -58,4 +65,8 @@ public interface BaseDiscountpackageFeign {
     @ApiOperation("销售订单查询销售政策分页列表")
     @PostMapping("selectSalesOrderList")
     ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(@RequestBody PagerQuery<BaseSalesDicountQuery> query);
+
+    @ApiOperation("移动端-销售订单获取销售政策优惠包")
+    @GetMapping("/getAppPackage")
+    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@@ -1,10 +1,14 @@
 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;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: base_discountpackage(优惠包) <br/>
  * File: BaseDiscountpackageFeignFallback.java <br/>
@@ -57,5 +61,10 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+		return null;
+	}
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basediscountpackage.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/30 13:51
+ * @Description
+ */
+@Data
+public class AppBaseDiscountpackageQuery implements Query {
+    private static final long serialVersionUID = 4058239365095597367L;
+
+    private String userSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/app/AppBaseDiscountpackageVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.base.api.basediscountpackage.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/30 13:46
+ * @Description
+ */
+@Data
+public class AppBaseDiscountpackageVo implements Vo {
+    private static final long serialVersionUID = 460454071163244825L;
+
+    @ApiModelProperty(value = "优惠名称")
+    private String discountValue;
+    @ApiModelProperty(value = "优惠包sid")
+    private String discountSid;
+    @ApiModelProperty(value = "价值")
+    private String pirce;
+
+    @ApiModelProperty(value = "说明")
+    private String explain;
+
+    @ApiModelProperty(value = "优惠说明")
+    private String discountExplain;
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java

@@ -5,9 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basediscountpackage.*;
+import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * Project: base_discountpackage(优惠包) <br/>
  * File: BaseDiscountpackageMapper.java <br/>
@@ -50,4 +53,12 @@ public interface BaseDiscountpackageMapper extends BaseMapper<BaseDiscountpackag
      * @return
      */
     IPage<BaseSalesDicountVo> selectSalesOrderList(IPage<BaseSalesDicountVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackage> qw);
+
+    /**
+     * 移动端-销售订单-优惠包
+     *
+     * @param qw
+     * @return
+     */
+    List<AppBaseDiscountpackageVo> getAppPackage(@Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackage> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@@ -20,17 +20,25 @@
 
     <select id="selectSalesOrderList" resultType="com.yxt.anrui.base.api.basediscountpackage.BaseSalesDicountVo">
         select sid,
-        salesPolicy,
-        discountType,
-        projectName,
-        projectCost,
-        discountMoney,
-        discountExplain,
-        effectiveDate,
-        case isEmploy
-        when '0' then '否'
-        when '1' then '是'
-        end as isEmploy
+               salesPolicy,
+               discountType,
+               projectName,
+               projectCost,
+               discountMoney,
+               discountExplain,
+               effectiveDate,
+               case isEmploy
+                   when '0' then '否'
+                   when '1' then '是'
+                   end as isEmploy
+        from base_discountpackage
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getAppPackage" resultType="com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo">
+        select projectName as discountValue, sid as discountSid, discountMoney as pirce, discountExplain
         from base_discountpackage
         <where>
             ${ew.sqlSegment}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@@ -2,6 +2,8 @@ package com.yxt.anrui.base.biz.basediscountpackage;
 
 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.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * Project: base_discountpackage(优惠包) <br/>
  * File: BaseDiscountpackageFeignFallback.java <br/>
@@ -120,4 +124,9 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+        return baseDiscountpackageService.getAppPackage(query);
+    }
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -4,6 +4,8 @@ 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;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
@@ -22,9 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Project: base_discountpackage(优惠包) <br/>
@@ -111,7 +111,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             orgSid = stringResultBean.getData();
         }
         dto.setSid(UUID.randomUUID().toString());
-        BeanUtil.copyProperties(dto,entity);
+        BeanUtil.copyProperties(dto, entity);
         entity.setUseOrg(orgSid);
         save(entity);
         return rb.success().setData(entity.getSid());
@@ -312,4 +312,29 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         }
         return qw;
     }
+
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+        ResultBean<List<AppBaseDiscountpackageVo>> rb = ResultBean.fireFail();
+        QueryWrapper<BaseDiscountpackage> qw = new QueryWrapper<>();
+        if (query != null) {
+            //根据申请人sid查询分公司sid
+            String orgSid = "";
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
+            if (stringResultBean.getSuccess()) {
+                orgSid = stringResultBean.getData();
+            }
+            qw.lambda().apply("FIND_IN_SET ('" + orgSid + "',useOrg)");
+            qw.eq("salesPolicyKey", "0002");
+        }
+        List<AppBaseDiscountpackageVo> voList = baseMapper.getAppPackage(qw);
+        if (voList.isEmpty()) {
+            return rb.setData(new ArrayList<>());
+        }
+        for (int i = 0; i < voList.size(); i++) {
+            if (StringUtils.isNotBlank(voList.get(i).getDiscountExplain())) {
+                voList.get(i).setExplain(voList.get(i).getDiscountExplain());
+            }
+        }
+        return rb.success().setData(voList);
+    }
 }