更新供应商分配转移方法

src/main/java/com/uas/platform/b2b/controller/VendorDistributeController.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.controller;
 
 import com.uas.platform.b2b.model.User;
-import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.result.ResultCode;
 import com.uas.platform.b2b.result.ResultMap;
 import com.uas.platform.b2b.service.VendorService;
@@ -35,32 +34,32 @@ public class VendorDistributeController {
     /**
      * 为用户分配客户权限，保存绑定（管理员才能操作）
      *
-     * @param userUU 用户关系
+     * @param id 供应商关系id
      * @param json 前端数据
      * @return 绑定结果
      */
-    @RequestMapping(value = "/bindVendor/{uu}", method = RequestMethod.POST)
-    public ResultMap bindVendor(@PathVariable("uu") Long userUU, @RequestBody String json) {
-        List<Vendor> ids = FlexJsonUtils.fromJsonArray(json, Vendor.class);
-        boolean result = vendorService.bindVendorToUser(userUU, ids);
+    @RequestMapping(value = "/bindVendor/{id}", method = RequestMethod.POST)
+    public ResultMap bindVendor(@PathVariable("id") Long id, @RequestBody String json) {
+        List<User> users = FlexJsonUtils.fromJsonArray(json, User.class);
+        boolean result = vendorService.bindVendorToUser(id, users);
         String resultInfo = result ? "成功" : "失败";
-        LOGGER.log("供应商权限", "分配供应商", "userUU： " + userUU + "结果： 分配" + resultInfo);
+        LOGGER.log("供应商权限", "分配供应商", "结果： 分配" + resultInfo, "", id);
         return new ResultMap(result ? ResultCode.OK.code() : ResultCode.ERROR.code());
     }
 
     /**
      * 供应商权限转移
      *
-     * @param vendorUU 供应商UU
+     * @param id 供应商关系id
      * @param json 前端json数据
      * @return 绑定结果
      */
-    @RequestMapping(value = "/bindUserToVendor/{uu}", method = RequestMethod.POST)
-    public ResultMap bindUserToVendor(@PathVariable("uu") Long vendorUU, @RequestBody String json) {
+    @RequestMapping(value = "/bindUserToVendor/{id}", method = RequestMethod.POST)
+    public ResultMap bindUserToVendor(@PathVariable("uu") Long id, @RequestBody String json) {
         List<User> users = FlexJsonUtils.fromJsonArray(json, User.class);
-        boolean result = vendorService.transferVendorToUser(vendorUU, users);
+        boolean result = vendorService.transferVendorToUser(id, users);
         String resultInfo = result ? "成功" : "失败";
-        LOGGER.log("供应商权限", "转移权限", "供应商UU： " + vendorUU + "结果： 绑定" + resultInfo);
+        LOGGER.log("供应商权限", "转移权限", "结果： 绑定" + resultInfo, "", id);
         return new ResultMap(result ? ResultCode.OK.code() : ResultCode.ERROR.code());
     }
 

src/main/java/com/uas/platform/b2b/service/VendorService.java

@@ -169,20 +169,20 @@ public interface VendorService {
     /**
      * 为用户分配供应商
      *
-     * @param userUU 用户UU
-     * @param ids 供应商客户
+     * @param id 用户UU
+     * @param userList 供应商客户
      * @return 分配结果 成功或失败
      */
-    boolean bindVendorToUser(Long userUU, List<Vendor> ids);
+    boolean bindVendorToUser(Long id, List<User> userList);
 
     /**
      * 供应商权限转移
      *
-     * @param vendorUU 供应商UU
+     * @param id 供应商关系id
      * @param users 前端选择用户信息
      * @return 转移结果
      */
-    boolean transferVendorToUser(Long vendorUU, List<User> users);
+    boolean transferVendorToUser(Long id, List<User> users);
 
     /**
      * 设置联系人

src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -499,22 +499,23 @@ public class VendorsServiceImpl implements VendorService {
     /**
      * 为用户分配供应商
      *
-     * @param userUU 用户UU
-     * @param vendors    供应商客户
+     * @param id 供应商Id
+     * @param userList    用户
      * @return 分配结果 成功或失败
      */
     @Override
-    public boolean bindVendorToUser(Long userUU, List<Vendor> vendors) {
-        if (!CollectionUtils.isEmpty(vendors)) {
+    public boolean bindVendorToUser(Long id, List<User> userList) {
+        if (!CollectionUtils.isEmpty(userList)) {
             List<VendorDistribute> needSaveOrUpdateList = new ArrayList<>();
             List<VendorDistribute> needDeleteList = new ArrayList<>();
-            for (Vendor vendor : vendors) {
+            for (User user : userList) {
+                Long userUU = user.getUserUU();
                 VendorDistribute distribute = new VendorDistribute();
-                if (vendor.getDistribute()) {
-                    List<VendorDistribute> distributes = vendorDistributeDao.findByUserUUAndVendorId(userUU, vendor.getId());
+                if (user.getDistribute()) {
+                    List<VendorDistribute> distributes = vendorDistributeDao.findByUserUUAndVendorId(userUU, id);
                     if (CollectionUtils.isEmpty(distributes)) {
                         distribute.setUserUU(userUU);
-                        distribute.setVendorId(vendor.getId());
+                        distribute.setVendorId(id);
                         distribute.setDistribute(Constant.YES);
                         needSaveOrUpdateList.add(distribute);
                     } else {
@@ -523,7 +524,7 @@ public class VendorsServiceImpl implements VendorService {
                         needSaveOrUpdateList.add(distribute);
                     }
                 } else {
-                    List<VendorDistribute> distributes = vendorDistributeDao.findByUserUUAndVendorId(userUU, vendor.getId());
+                    List<VendorDistribute> distributes = vendorDistributeDao.findByUserUUAndVendorId(userUU, id);
                     if (!CollectionUtils.isEmpty(distributes)) {
                         /*
                          * 判断分配和权限转移关系
@@ -554,24 +555,24 @@ public class VendorsServiceImpl implements VendorService {
     /**
      * 供应商权限转移
      *
-     * @param vendorUU 供应商UU
+     * @param id 供应商关系id
      * @param users    前端选择用户信息
      * @return 转移结果
      */
     @Override
-    public boolean transferVendorToUser(Long vendorUU, List<User> users) {
-        List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(), vendorUU);
+    public boolean transferVendorToUser(Long id, List<User> users) {
+        Vendor vendor = vendorDao.findOne(id);
         if (!CollectionUtils.isEmpty(users)) {
             List<VendorDistribute> saveList = new ArrayList<>();
             for (User u : users) {
                 List<VendorDistribute> deleteList = new ArrayList<>();
                 if (null != u.getUserUU()) {
                     VendorDistribute distribute = new VendorDistribute();
-                    List<VendorDistribute> distributes = vendorDistributeDao.findByUserUUAndVendorId(u.getUserUU(), vendors.get(0).getId());
+                    List<VendorDistribute> distributes = vendorDistributeDao.findByUserUUAndVendorId(u.getUserUU(), vendor.getId());
                     if (u.getTransfer()) {
                         if (CollectionUtils.isEmpty(distributes)) {
                             distribute.setUserUU(u.getUserUU());
-                            distribute.setVendorId(vendors.get(0).getId());
+                            distribute.setVendorId(vendor.getId());
                             distribute.setLeaderUU(SystemSession.getUser().getUserUU());
                             distribute.setIsTransfer(Constant.YES);
                             saveList.add(distribute);
@@ -586,7 +587,7 @@ public class VendorsServiceImpl implements VendorService {
                         if (!CollectionUtils.isEmpty(distributes)) {
                             // 当前用户
                             deleteList.add(distributes.get(0));
-                            Long vendorId = vendors.get(0).getId();
+                            Long vendorId = vendor.getId();
                             Long userUU = u.getUserUU();
                             if (null != distributes.get(0).getIsTransfer() && 1 == distributes.get(0).getIsTransfer()) {
                                 deleteList = deleteChildrenDistributes(vendorId, userUU, deleteList);

src/main/webapp/resources/js/common/services.js

@@ -375,7 +375,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
                 isArray: true
             },
             addSaleUserToVendor: {
-                url: 'vendorDistribute/bindVendor/:uu',
+                url: 'vendorDistribute/bindVendor/:id',
                 method: 'POST'
             },
             addUserToVendor: {

src/main/webapp/resources/js/index/app.js

@@ -2487,7 +2487,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             params = {id : customer.id};
             urlSaveData = 'addSaleUserToVendor';
             urlData = 'findSaleUsers';
-            uuData = customer.vendorEnterprise.uu;
+            uuData = customer.id;
         } else {
             params = {uu : customer.myEnterprise.uu};
             urlSaveData = 'addUserToVendor';