增加佣金相关功能

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/SalaryBaseController.java

@@ -0,0 +1,51 @@
+package cn.xluobo.business.sc.salary.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.xluobo.business.sc.salary.repo.model.SalaryBase;
+import cn.xluobo.business.sc.salary.service.SalaryBaseService;
+import cn.xluobo.core.page.RespPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("salary")
+@AllArgsConstructor
+public class SalaryBaseController {
+
+    private final SalaryBaseService salaryBaseService;
+
+    @PostMapping("listAll")
+    public AjaxResult listAll(){
+        return AjaxResult.success(salaryBaseService.list());
+    }
+
+    @PostMapping("list")
+    public AjaxResult list(@RequestBody Map<String,Object> params){
+        RespPage<SalaryBase> page = new RespPage<>((Integer) params.get("pageNum"), (Integer) params.get("pageSize"));
+        LambdaQueryWrapper<SalaryBase> wrapper = Wrappers.<SalaryBase>lambdaQuery()
+                    .eq(StrUtil.isNotEmpty((CharSequence) params.get("name")),SalaryBase::getName, params.get("name")
+                );
+        RespPage<SalaryBase> page1 = salaryBaseService.page(page, wrapper);
+        return AjaxResult.success(page1);
+    }
+
+    @PostMapping("saveOrEdit")
+    public AjaxResult saveOrEdit(@RequestBody SalaryBase salaryBase){
+        salaryBaseService.saveOrUpdate(salaryBase);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("remove")
+    public AjaxResult remove(Integer id){
+        salaryBaseService.removeById(id);
+        return AjaxResult.success();
+    }
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/ScCommissionPlansController.java

@@ -0,0 +1,48 @@
+package cn.xluobo.business.sc.salary.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.xluobo.business.sc.salary.repo.model.ScCommissionPlans;
+import cn.xluobo.business.sc.salary.service.ScCommissionPlansService;
+import cn.xluobo.core.page.RespPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("commissionPlans")
+@AllArgsConstructor
+public class ScCommissionPlansController {
+
+    private final ScCommissionPlansService service;
+
+    @PostMapping("list")
+    public AjaxResult list(@RequestBody Map<String,Object> params){
+        RespPage<ScCommissionPlans> page = new RespPage<>((Integer) params.get("pageNum"), (Integer) params.get("pageSize"));
+        service.page(page, Wrappers.<ScCommissionPlans>lambdaQuery()
+                .eq(StrUtil.isNotEmpty((CharSequence) params.get("planName")),
+                        ScCommissionPlans::getPlanName,params.get("planName"))
+                .eq(ObjectUtil.isNotEmpty(params.get("isActive")),ScCommissionPlans::getIsActive,params.get("isActive"))
+        );
+        return AjaxResult.success();
+    }
+
+    @PostMapping("saveOrEdit")
+    public AjaxResult saveOrEdit(@RequestBody ScCommissionPlans salaryBase){
+        service.saveOrUpdate(salaryBase);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("remove")
+    public AjaxResult remove(Integer id){
+        service.removeById(id);
+        return AjaxResult.success();
+    }
+
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/controller/StaffSalaryBaseController.java

@@ -0,0 +1,45 @@
+package cn.xluobo.business.sc.salary.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.xluobo.business.sc.salary.repo.model.StaffSalaryBase;
+import cn.xluobo.business.sc.salary.service.StaffSalaryBaseService;
+import cn.xluobo.core.page.RespPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("staffSalaryBase")
+@AllArgsConstructor
+public class StaffSalaryBaseController {
+
+    private final StaffSalaryBaseService baseService;
+
+    @PostMapping("list")
+    public AjaxResult list(@RequestBody Map<String,Object> params){
+        RespPage<StaffSalaryBase> page = new RespPage<>((Integer) params.get("pageNum"), (Integer) params.get("pageSize"));
+        RespPage<StaffSalaryBase> result = baseService.page(page, Wrappers.<StaffSalaryBase>lambdaQuery()
+                .eq(StrUtil.isNotEmpty((CharSequence) params.get("salaryBaseName")), StaffSalaryBase::getSalaryBaseName, params.get("salaryBaseName"))
+                .eq(StrUtil.isNotEmpty((CharSequence) params.get("staffName")), StaffSalaryBase::getStaffName, params.get("staffName"))
+        );
+        return AjaxResult.success(result);
+    }
+
+    @PostMapping("saveOrEdit")
+    public AjaxResult saveOrEdit(@RequestBody StaffSalaryBase salaryBase){
+        baseService.saveOrUpdate(salaryBase);
+        return AjaxResult.success();
+    }
+
+    @PostMapping("remove")
+    public AjaxResult remove(Integer id){
+        baseService.removeById(id);
+        return AjaxResult.success();
+    }
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/mapper/SalaryBaseMapper.java

@@ -0,0 +1,9 @@
+package cn.xluobo.business.sc.salary.repo.mapper;
+
+import cn.xluobo.business.sc.salary.repo.model.SalaryBase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SalaryBaseMapper extends BaseMapper<SalaryBase> {
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/mapper/ScCommissionPlansMapper.java

@@ -0,0 +1,9 @@
+package cn.xluobo.business.sc.salary.repo.mapper;
+
+import cn.xluobo.business.sc.salary.repo.model.ScCommissionPlans;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ScCommissionPlansMapper extends BaseMapper<ScCommissionPlans> {
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/mapper/StaffSalaryBaseMapper.java

@@ -0,0 +1,9 @@
+package cn.xluobo.business.sc.salary.repo.mapper;
+
+import cn.xluobo.business.sc.salary.repo.model.StaffSalaryBase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface StaffSalaryBaseMapper extends BaseMapper<StaffSalaryBase> {
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/SalaryBase.java

@@ -0,0 +1,22 @@
+package cn.xluobo.business.sc.salary.repo.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@TableName("sc_salary_base")
+public class SalaryBase {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private String name;
+
+    private BigDecimal salary;
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/ScCommissionPlans.java

@@ -0,0 +1,45 @@
+package cn.xluobo.business.sc.salary.repo.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Getter
+@Setter
+@TableName("sc_commission_plans")
+public class ScCommissionPlans {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String planName;
+
+    private BigDecimal tier1Threshold;
+
+    private BigDecimal tier1Rate;
+
+    private BigDecimal tier2Threshold;
+
+    private BigDecimal tier2Rate;
+
+    private BigDecimal tier3Threshold;
+
+    private BigDecimal tier3Rate;
+
+    private BigDecimal tier4Rate;
+
+    private BigDecimal renewalRate;
+
+    private BigDecimal referralRate;
+
+    private Byte isActive;
+
+    private Date effectiveDate;
+
+    private Date createdAt;
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/repo/model/StaffSalaryBase.java

@@ -0,0 +1,28 @@
+package cn.xluobo.business.sc.salary.repo.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@TableName("sc_staff_salary_base")
+public class StaffSalaryBase {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private Long staffId;
+
+    private String staffName;
+
+    private Integer salaryBaseId;
+
+    private String salaryBaseName;
+
+    private BigDecimal salary;
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/service/SalaryBaseService.java

@@ -0,0 +1,10 @@
+package cn.xluobo.business.sc.salary.service;
+
+import cn.xluobo.business.sc.salary.repo.model.SalaryBase;
+import cn.xluobo.business.sc.salary.repo.mapper.SalaryBaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SalaryBaseService extends ServiceImpl<SalaryBaseMapper, SalaryBase> {
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/service/ScCommissionPlansService.java

@@ -0,0 +1,10 @@
+package cn.xluobo.business.sc.salary.service;
+
+import cn.xluobo.business.sc.salary.repo.mapper.ScCommissionPlansMapper;
+import cn.xluobo.business.sc.salary.repo.model.ScCommissionPlans;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ScCommissionPlansService extends ServiceImpl<ScCommissionPlansMapper, ScCommissionPlans> {
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sc/salary/service/StaffSalaryBaseService.java

@@ -0,0 +1,10 @@
+package cn.xluobo.business.sc.salary.service;
+
+import cn.xluobo.business.sc.salary.repo.model.StaffSalaryBase;
+import cn.xluobo.business.sc.salary.repo.mapper.StaffSalaryBaseMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StaffSalaryBaseService extends ServiceImpl<StaffSalaryBaseMapper, StaffSalaryBase> {
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sys/address/AddressController.java

@@ -0,0 +1,33 @@
+package cn.xluobo.business.sys.address;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.xluobo.core.page.RespPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyl.manager.ums.domain.entity.Address;
+import com.cyl.manager.ums.mapper.AddressMapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("api/address")
+@AllArgsConstructor
+public class AddressController {
+
+    private final AddressMapper addressMapper;
+
+    @PostMapping("list")
+    public AjaxResult list(@RequestBody Map<String,Object> params){
+        RespPage<Address> page = new RespPage<>((Integer) params.get("pageNum"), (Integer) params.get("pageSize"));
+        RespPage<Address> address = addressMapper.selectPage(page, Wrappers.<Address>lambdaQuery()
+                .eq(ObjectUtil.isNotEmpty(params.get("getLevel")),Address::getLevel, params.get("getLevel"))
+                .eq(ObjectUtil.isNotEmpty(params.get("parentCode")),Address::getParentCode, params.get("parentCode"))
+        );
+        return AjaxResult.success(address);
+    }
+}

ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/controller/ISysDictDataController.java

@@ -0,0 +1,123 @@
+package cn.xluobo.business.sys.admin.controller;
+
+import cn.xluobo.business.sys.admin.domain.req.ReqPageSelect;
+import cn.xluobo.business.sys.admin.domain.req.ReqSearchSysDictData;
+import cn.xluobo.business.sys.admin.service.BusinessSysDictDataService;
+import cn.xluobo.core.api.APIResponse;
+import cn.xluobo.core.api.ApiResEnums;
+import cn.xluobo.core.page.RespPage;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 字典数据表 前端控制器
+ * </p>
+ *
+ * @author zhangby
+ * @since 2020-01-15
+ */
+@RestController
+@RequestMapping("/api/system/dict/data")
+public class ISysDictDataController {
+
+    @Autowired
+    private BusinessSysDictDataService sysDictDataService;
+
+    /**
+     * 列表
+     * @param reqSearchDictData
+     * @return
+     */
+    @GetMapping("/list/searchList")
+    public APIResponse searchList(ReqSearchSysDictData reqSearchDictData){
+        RespPage<SysDictData> respPage = sysDictDataService.searchList(reqSearchDictData);
+        return APIResponse.toAPIResponse(respPage);
+    }
+
+    /**
+     * 详情
+     * @param dictTypeId
+     * @return
+     */
+    @GetMapping("/info/detailById/{dictTypeId}")
+    public  APIResponse detailById(@PathVariable("dictTypeId") String dictTypeId){
+        SysDictData detailInfo = sysDictDataService.detailById(dictTypeId);
+        return APIResponse.toAPIResponse(detailInfo);
+    }
+
+    /**
+     * 添加
+     * @param sysDictData
+     * @return
+     */
+    @PostMapping("/add/addDictData")
+    public APIResponse addDictData(@RequestBody SysDictData sysDictData){
+        boolean addDictData = sysDictDataService.addDictData(sysDictData);
+        if(addDictData){
+            return APIResponse.toOkResponse();
+        }
+        return APIResponse.toExceptionResponse(ApiResEnums.FAIL_WAIT_A_MINUTE);
+    }
+
+    /**
+     * 修改
+     * @param sysDictData
+     * @return
+     */
+    @PutMapping("/update/updateDictData")
+    public APIResponse updateDictData(@RequestBody SysDictData sysDictData){
+        return sysDictDataService.updateDictData(sysDictData);
+    }
+
+    /**
+     * 删除
+     * @param dictTypeIds
+     * @return
+     */
+    @DeleteMapping("/delete/deleteById/{dictTypeIds}")
+    public APIResponse deleteById(@PathVariable("dictTypeIds") String[] dictTypeIds){
+        return sysDictDataService.deleteById(dictTypeIds);
+    }
+
+    /**
+     * 某字典数据
+     * @param dictType
+     * @return
+     */
+    @GetMapping("/list/dictType/{dictType}")
+    public APIResponse dictTypeDataList(@PathVariable("dictType") String dictType){
+        List<SysDictData> dictDataList = sysDictDataService.dictTypeDataList(dictType);
+        return APIResponse.toAPIResponse(dictDataList);
+    }
+
+    /**
+     * 某字典数据
+     * 分页查询
+     * @param dictType
+     * @return
+     */
+    @GetMapping("/list/dictTypeByPage/{dictType}")
+    public APIResponse dictTypeDataPageList(@PathVariable("dictType") String dictType,
+                                        ReqPageSelect reqPageSelect){
+        RespPage<SysDictData> respPage = sysDictDataService.dictTypeDataList(dictType, reqPageSelect);
+        return APIResponse.toAPIResponse(respPage);
+    }
+
+    /**
+     * 某字典数据
+     * @param dictType
+     * @param parentValue
+     * @return
+     */
+    @GetMapping("/list/dictType/{dictType}/{parentValue}")
+    public APIResponse dictTypeDataListByParentValue(@PathVariable("dictType") String dictType,
+                                        @PathVariable("parentValue") String parentValue){
+        List<SysDictData> dictDataList = sysDictDataService.dictTypeDataListByParentValue(dictType, parentValue);
+        return APIResponse.toAPIResponse(dictDataList);
+    }
+
+}