feat:商户配置-代订餐用户关系

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/user/SysUserRelationTypeDto.java

@@ -0,0 +1,9 @@
+package com.bsd.pjcloud.admin.api.dto.user;
+
+import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity;
+import lombok.Data;
+
+@Data
+public class SysUserRelationTypeDto extends SysUserRelationTypeEntity {
+
+}

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/user/SysUserRelationTypeController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto;
 import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity;
 import com.bsd.pjcloud.admin.service.SysUserRelationTypeService;
 import com.bsd.pjcloud.common.core.util.R;
@@ -30,15 +31,23 @@ public class SysUserRelationTypeController {
 
     private final SysUserRelationTypeService sysUserRelationTypeService;
 
+    /**
+     * 分页查询
+     */
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("/select")
+    public R<Page<SysUserRelationTypeEntity>> selectList(@ParameterObject Page page, @ParameterObject SysUserRelationTypeDto dto) {
+        return R.ok(sysUserRelationTypeService.scopePageList(page, dto, null));
+    }
+
     /**
      * 分页查询
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
     @PreAuthorize("@pms.hasPermission('dzc_sysUserRelationType_view')")
-    public R getSysUserRelationTypePage(@ParameterObject Page page, @ParameterObject SysUserRelationTypeEntity sysUserRelationType) {
-        LambdaQueryWrapper<SysUserRelationTypeEntity> wrapper = Wrappers.lambdaQuery();
-        return R.ok(sysUserRelationTypeService.page(page, wrapper));
+    public R<Page<SysUserRelationTypeEntity>> scopePageList(@ParameterObject Page page, @ParameterObject SysUserRelationTypeDto dto) {
+        return R.ok(sysUserRelationTypeService.scopePageList(page, dto, null));
     }
 
     /**

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/user/SysUserRelationTypeMapper.java

@@ -1,10 +1,21 @@
 package com.bsd.pjcloud.admin.mapper.user;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto;
 import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface SysUserRelationTypeMapper extends PjcloudBaseMapper<SysUserRelationTypeEntity> {
 
+    default Page<SysUserRelationTypeEntity> scopePageList(Page page, SysUserRelationTypeDto dto, DataScope dataScope) {
+        LambdaQueryWrapper<SysUserRelationTypeEntity> wrapper = new LambdaQueryWrapper<SysUserRelationTypeEntity>()
+                .eq(ObjectUtil.isNotEmpty(dto.getRelationTypeId()), SysUserRelationTypeEntity::getRelationTypeId, dto.getRelationTypeId())
+                .like(ObjectUtil.isNotEmpty(dto.getRelationName()), SysUserRelationTypeEntity::getRelationName, dto.getRelationName());
+        return selectPageByScope(page, wrapper, dataScope);
+    }
 }

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserRelationTypeService.java

@@ -1,12 +1,17 @@
 package com.bsd.pjcloud.admin.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto;
 import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 
 import java.util.ArrayList;
 
 public interface SysUserRelationTypeService extends IService<SysUserRelationTypeEntity> {
 
+    Page<SysUserRelationTypeEntity> scopePageList(Page page, SysUserRelationTypeDto dto, DataScope dataScope);
+
     /**
      * 新增用户关系类型表
      */

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationTypeServiceImpl.java

@@ -1,12 +1,15 @@
 package com.bsd.pjcloud.admin.service.impl.user;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.admin.api.dto.user.SysUserRelationTypeDto;
 import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationEntity;
 import com.bsd.pjcloud.admin.api.entity.user.SysUserRelationTypeEntity;
 import com.bsd.pjcloud.admin.mapper.user.SysUserRelationMapper;
 import com.bsd.pjcloud.admin.mapper.user.SysUserRelationTypeMapper;
 import com.bsd.pjcloud.admin.service.SysUserRelationTypeService;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +25,11 @@ public class SysUserRelationTypeServiceImpl extends ServiceImpl<SysUserRelationT
 
     private final SysUserRelationMapper sysUserRelationMapper;
 
+    @Override
+    public Page<SysUserRelationTypeEntity> scopePageList(Page page, SysUserRelationTypeDto dto, DataScope dataScope) {
+        return baseMapper.scopePageList(page, dto, dataScope);
+    }
+
     /**
      * 新增用户关系类型表
      */

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchManageEntity.java

@@ -225,6 +225,9 @@ public class MchManageEntity extends Model<MchManageEntity> {
     @Schema(description = "租户ID")
     private Long tenantId;
 
+    /**
+     * 订餐详细配置
+     */
     @Data
     public static class TableReservationConf {
 
@@ -233,6 +236,10 @@ public class MchManageEntity extends Model<MchManageEntity> {
          */
         private Boolean singleProductOnlyInCart = false;
 
+        /**
+         * 为什么的`用户关系类型`代订餐(一般是监护人为被监护人代订餐)
+         */
+        private List<Long> userRelationTypeIdList;
     }
 
     @Data