Просмотр исходного кода

主账号能看全部的,子账号只看自己的。后台可以给子账号开通权限,和子账号一样查看所有订单

liangpeile 1 год назад
Родитель
Сommit
281cd5a7af

+ 14 - 1
crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -622,7 +622,7 @@ public class NewPlatformApi {
     }
 
     @ApiOperation(value = "平台端用户分页列表")
-    @RequestMapping(value = "/otganizatonDepartmentUserlist", method = RequestMethod.GET)
+    @RequestMapping(value = "/otganizatonDepartmentUserList", method = RequestMethod.GET)
     public CommonResult<CommonPage<OrganizationDepartmentUser>> otganizatonDepartmentlist(@RequestParam(name = "id", required = true) String id,
                                                                                           @Validated PageParamRequest pageParamRequest) {
         LambdaQueryWrapper<OrganizationDepartmentUser> queryWrapper = new LambdaQueryWrapper<>();
@@ -631,4 +631,17 @@ public class NewPlatformApi {
         List<OrganizationDepartmentUser> list = organizationDepartmentUserService.list(queryWrapper);
         return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(page, list)));
     }
+    @ApiOperation(value = "配置是否查看全部订单")
+    @RequestMapping(value = "/isAllOrders", method = RequestMethod.GET)
+    public CommonResult<?> isAllOrders(@RequestParam(name = "id", required = true) String id) {
+        User user = userService.getById(id);
+         if (null==user.getIsAllOrders()||2==user.getIsAllOrders()){
+            user.setIsAllOrders(1);
+        }
+        else if (1==user.getIsAllOrders()){
+            user.setIsAllOrders(2);
+        }
+        userService.updateById(user);
+        return CommonResult.success("操作成功");
+    }
 }

+ 3 - 0
crmeb-common/src/main/java/com/zbkj/common/model/user/User.java

@@ -162,4 +162,7 @@ public class User implements Serializable {
 
     @ApiModelProperty(value = "是否是企业用户 1和null是普通用户,2是企业主用户 3是企业子用户")
     private Integer isEnterpriseUser;
+
+    @ApiModelProperty(value = "是否查看主账号所有订单 1是 2否")
+    private Integer isAllOrders;
 }

+ 4 - 0
crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -34,6 +34,7 @@ import com.zbkj.common.utils.RedisUtil;
 import com.zbkj.common.vo.*;
 import com.zbkj.front.service.FrontOrderService;
 import com.zbkj.front.service.SeckillService;
+import com.zbkj.service.dao.UserDao;
 import com.zbkj.service.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -952,6 +953,9 @@ public class FrontOrderServiceImpl implements FrontOrderService {
     public PageInfo<OrderFrontDataResponse> list(Integer status, PageParamRequest pageRequest) {
         Integer userId = userService.getUserIdException();
 
+
+
+
         PageInfo<Order> pageInfo = orderService.getUserOrderList( userId, status, pageRequest );
         List<Order> orderList = pageInfo.getList();
         if (CollUtil.isEmpty( orderList )) {

+ 2 - 0
crmeb-service/src/main/java/com/zbkj/service/dao/UserDao.java

@@ -18,4 +18,6 @@ public interface UserDao extends BaseMapper<User> {
     List<User> findMerchantList(Map<String, Object> map);
 
     List<UserSpreadPeopleItemResponse> getSpreadPeopleList(Map<String, Object> map);
+
+    List<Integer> getParentId(Integer userId);
 }

+ 7 - 0
crmeb-service/src/main/java/com/zbkj/service/service/UserService.java

@@ -324,4 +324,11 @@ public interface UserService extends IService<User> {
      * @param systemAdmin
      */
     void savePhone(List<User> user, SystemAdmin systemAdmin);
+
+    /**
+     * 获取当前登录账号主账号下子账号uid
+     * @param userId
+     * @return
+     */
+    List<Integer> getParentId(Integer userId);
 }

+ 14 - 1
crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -37,6 +37,7 @@ import com.zbkj.common.vo.DateLimitUtilVo;
 import com.zbkj.common.vo.LogisticsResultVo;
 import com.zbkj.common.vo.MyRecord;
 import com.zbkj.service.dao.OrderDao;
+import com.zbkj.service.dao.UserDao;
 import com.zbkj.service.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -155,7 +156,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
     public PageInfo<Order> getUserOrderList(Integer userId, Integer status, PageParamRequest pageRequest) {
         Page<Order> page = PageHelper.startPage(pageRequest.getPage(), pageRequest.getLimit());
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
-        lqw.eq(Order::getUid, userId);
+        User userInfo = userService.getInfo();
+
+        if (null!=userInfo.getIsAllOrders()&&1==userInfo.getIsAllOrders()){
+            List<Integer> parents= userService.getParentId(userId);
+            if (null!=parents&&parents.size()>0){
+                lqw.in(Order::getUid, parents);
+            }else {
+                lqw.eq(Order::getUid, userId);
+            }
+        }else {
+            lqw.eq(Order::getUid, userId);
+        }
+
 //        lqw.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral);
         lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
         if (status >= 0) {

+ 5 - 0
crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java

@@ -1217,6 +1217,11 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         }
     }
 
+    @Override
+    public List<Integer> getParentId(Integer userId) {
+        return dao.getParentId(userId);
+    }
+
     /**
      * 批量清除用户推广人
      * @param spreadUid 推广人id

+ 15 - 0
crmeb-service/src/main/resources/mapper/user/UserMapper.xml

@@ -97,4 +97,19 @@
         </if>
         ORDER BY ${sortKey} ${sortValue}
     </select>
+
+    <select id="getParentId" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+        SELECT
+        	user_id
+        FROM
+        	eb_user_bypassaccount
+        WHERE
+        	enterprise_id = (
+        	SELECT
+        		enterprise_id
+        	FROM
+        		eb_user_bypassaccount
+        WHERE
+        	user_id = #{userId})
+    </select>
 </mapper>