Przeglądaj źródła

feat: 供应商费率配置;

hanchaolong 3 tygodni temu
rodzic
commit
f0c702471b

+ 3 - 10
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/SysDeptRateController.java

@@ -3,14 +3,7 @@ package com.ruoyi.logistics.controller;
 import java.util.List;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -75,9 +68,9 @@ public class SysDeptRateController extends BaseController
     @RequiresPermissions("logistics:rate:add")
     @RequiresPermissions("logistics:rate:add")
     @Log(title = "供应商费率配置", businessType = BusinessType.INSERT)
     @Log(title = "供应商费率配置", businessType = BusinessType.INSERT)
     @PostMapping
     @PostMapping
-    public AjaxResult add(@RequestBody List<SysDeptRate> sysDeptRates)
+    public AjaxResult add(@RequestBody List<SysDeptRate> sysDeptRates, @RequestParam("deptId") Long deptId)
     {
     {
-        return toAjax(sysDeptRateService.insertSysDeptRate(sysDeptRates));
+        return toAjax(sysDeptRateService.insertSysDeptRate(sysDeptRates, deptId));
     }
     }
 
 
     /**
     /**

+ 2 - 1
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/ISysDeptRateService.java

@@ -31,9 +31,10 @@ public interface ISysDeptRateService
      * 新增供应商费率配置
      * 新增供应商费率配置
      * 
      * 
      * @param sysDeptRates 供应商费率配置
      * @param sysDeptRates 供应商费率配置
+     * @param deptId 部门ID
      * @return 结果
      * @return 结果
      */
      */
-    public int insertSysDeptRate(List<SysDeptRate> sysDeptRates);
+    public int insertSysDeptRate(List<SysDeptRate> sysDeptRates, Long deptId);
 
 
     /**
     /**
      * 修改供应商费率配置
      * 修改供应商费率配置

+ 6 - 5
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/SysDeptRateServiceImpl.java

@@ -66,11 +66,11 @@ public class SysDeptRateServiceImpl implements ISysDeptRateService
      * @return 结果
      * @return 结果
      */
      */
     @Override
     @Override
-    public int insertSysDeptRate(List<SysDeptRate> sysDeptRates)
+    public int insertSysDeptRate(List<SysDeptRate> sysDeptRates, Long deptId)
     {
     {
-        if (sysDeptRates == null || sysDeptRates.isEmpty()) {
-            throw new ServiceException("批量插入的费率配置列表不能为空");
-        }
+//        if (sysDeptRates == null || sysDeptRates.isEmpty()) {
+//            throw new ServiceException("批量插入的费率配置列表不能为空");
+//        }
 
 
         // 按 companyType + productType 分组校验区间重叠
         // 按 companyType + productType 分组校验区间重叠
         Map<String, List<SysDeptRate>> groupedRates = new HashMap<>();
         Map<String, List<SysDeptRate>> groupedRates = new HashMap<>();
@@ -88,11 +88,12 @@ public class SysDeptRateServiceImpl implements ISysDeptRateService
         }
         }
 
 
         // 设置创建时间并批量插入
         // 设置创建时间并批量插入
-        sysDeptRateMapper.deleteSysDeptRateByDeptId(sysDeptRates.get(0).getDeptId());
+        sysDeptRateMapper.deleteSysDeptRateByDeptId(deptId);
         for (SysDeptRate rate : sysDeptRates) {
         for (SysDeptRate rate : sysDeptRates) {
             rate.setCreateTime(DateUtils.getNowDate());
             rate.setCreateTime(DateUtils.getNowDate());
             rate.setCreateBy(SecurityUtils.getUsername());
             rate.setCreateBy(SecurityUtils.getUsername());
             rate.setUserId(SecurityUtils.getUserId());
             rate.setUserId(SecurityUtils.getUserId());
+            rate.setDeptId(deptId);
             sysDeptRateMapper.insertSysDeptRate(rate);
             sysDeptRateMapper.insertSysDeptRate(rate);
         }
         }