Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppFamilyMembersController.java

@@ -0,0 +1,44 @@
+package org.jeecg.modules.app.controller.my;
+
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.dto.AddFamilyMembersDTO;
+import org.jeecg.modules.system.app.service.IFamilyMembersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 家庭成员
+ */
+@Slf4j
+@Tag(name = "APP家庭成员信息")
+@RestController()
+@RequestMapping("/app/my/familyMembers")
+public class AppFamilyMembersController {
+
+    @Autowired
+    IFamilyMembersService iFamilyMembersService;
+
+    @PostMapping("/addFamilyMembers")
+    @Operation(summary = "添加家庭成员")
+    public Result<String> addFamilyMembers(@RequestBody AddFamilyMembersDTO addFamilyMembersDTO){
+        return iFamilyMembersService.addFamilyMembers(addFamilyMembersDTO);
+    }
+
+    @PostMapping("/editFamilyMembers")
+    @Operation(summary = "修改家庭成员")
+    public Result<String> editFamilyMembers(@RequestBody AddFamilyMembersDTO addFamilyMembersDTO){
+        return iFamilyMembersService.editFamilyMembers(addFamilyMembersDTO);
+    }
+
+
+    @GetMapping("/deleteFamilyMembers")
+    @Operation(summary = "删除家庭成员")
+    public Result<String> deleteFamilyMembers(@RequestParam("id") String id){
+        return iFamilyMembersService.deleteFamilyMembers(id);
+    }
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/my/AppFeedbackController.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.app.controller.my;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.utils.UuidUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.dto.AppFeedbackFindRequestDTO;
+import org.jeecg.modules.app.dto.AppSubmitFeedbackRequestDTO;
+import org.jeecg.modules.system.app.dto.FindPageRequestDTO;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
+import org.jeecg.modules.system.app.entity.AppFeedback;
+import org.jeecg.modules.system.app.service.IAppFeedbackService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 意见反馈
+ */
+@Slf4j
+@Tag(name = "app意见反馈相关接口")
+@RestController()
+@RequestMapping("/app/my/feedback")
+public class AppFeedbackController {
+
+    @Autowired
+    IAppFeedbackService iAppFeedbackService;
+
+
+    /**
+     * 查询意见反馈列表接口
+     * @param appFeedbackFindRequestDTO
+     * @return
+     */
+    @GetMapping("/findByPage")
+    @Operation(summary = "app意见反馈分页查询")
+    public Result<IPage<FindResponseDTO>> findByList(AppFeedbackFindRequestDTO appFeedbackFindRequestDTO){
+        FindPageRequestDTO findPageRequestDTO = new FindPageRequestDTO();
+        findPageRequestDTO.setUserId(appFeedbackFindRequestDTO.getUserId());
+        return Result.ok(iAppFeedbackService.findPage(appFeedbackFindRequestDTO.getPageNo(),appFeedbackFindRequestDTO.getPageSize(),findPageRequestDTO));
+    }
+
+
+    @PostMapping("/submitFeedback")
+    @Operation(summary = "提交意见反馈")
+    public Result<String> submitFeedback(@RequestBody AppSubmitFeedbackRequestDTO appSubmitFeedbackRequestDTO){
+        AppFeedback appFeedback = new AppFeedback();
+        BeanUtils.copyProperties(appSubmitFeedbackRequestDTO,appFeedback);
+        appFeedback.setId(UuidUtils.getUUID());
+        boolean save = iAppFeedbackService.save(appFeedback);
+        if (!save){
+            return Result.error("提交反馈意见失败,请联系管理员");
+        }
+        return Result.ok("提交成功");
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AddFamilyMembersDTO.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+import lombok.experimental.Accessors;
+
+/**
+ * 家庭成员
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="APP添加家庭成员请求入参")
+public class AddFamilyMembersDTO {
+
+
+    @Schema(description = "id")
+    private String id;
+    /**姓名*/
+    @NonNull
+    @Schema(description = "姓名")
+    private String fullName;
+    /**用户编号*/
+    @Schema(description = "用户编号")
+    @NonNull
+    private String userId;
+    /**身份证号*/
+    @Schema(description = "身份证号")
+    @NonNull
+    private String identityCard;
+    /**身份证正面照*/
+    @NonNull
+    @Schema(description = "身份证正面照")
+    private String idCardFrontImg;
+    /**身份证反面照*/
+    @NonNull
+    @Schema(description = "身份证反面照")
+    private String idCardBackImg;
+    /**手机号*/
+    @NonNull
+    @Schema(description = "手机号")
+    private String phone;
+    /**实名状态 0-未实名 ；1-已实名*/
+    @Schema(description = "实名状态 0-未实名 ；1-已实名，默认未实名")
+    private Integer realNameStatus;
+    /**身份证反面照*/
+    @NonNull
+    @Schema(description = "实名认证照片")
+    private String realNameImg;
+
+    /**实名状态 0-未实名 ；1-已实名*/
+    @Schema(description = "用户类型0-本人；1-家人 默认家人")
+    private Integer userType;
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppFeedbackFindRequestDTO.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 意见反馈
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="APP意见反馈请求入参")
+public class AppFeedbackFindRequestDTO  {
+
+    //用户编号
+    private String userId;
+    //当前页
+    private Integer pageNo=1;
+    //每页显示条数
+    private  Integer pageSize=10;
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppSubmitFeedbackRequestDTO.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.app.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 意见反馈
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="APP意见反馈请求入参")
+public class AppSubmitFeedbackRequestDTO {
+
+    /**用户id*/
+    @NonNull
+    @Schema(description = "用户id")
+    private String userId;
+    /**反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他*/
+    @NonNull
+    @Schema(description = "反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他")
+    private Integer feedbackType;
+    /**反馈描述*/
+    @NonNull
+    @Schema(description = "反馈描述")
+    private String feedbackDescribed;
+    /**反馈图片地址，使用；进行隔开*/
+    @Schema(description = "反馈图片地址，使用；进行隔开")
+    private String feedbackImg;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间")
+    private Date createTime=new Date();
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppCategoryController.java

@@ -10,10 +10,14 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.app.dto.AppCategoryDTO;
 import org.jeecg.modules.system.app.entity.AppCategory;
 import org.jeecg.modules.system.app.service.IAppCategoryService;
 
@@ -22,6 +26,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.system.app.vo.AppCategoryVO;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -46,7 +51,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="运动类型表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appCategory")
+@RequestMapping("/app/appCategory")
 @Slf4j
 public class AppCategoryController extends JeecgController<AppCategory, IAppCategoryService> {
 	@Autowired
@@ -55,56 +60,42 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 	/**
 	 * 分页列表查询
 	 *
-	 * @param appCategory
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param dto
 	 * @return
 	 */
 	//@AutoLog(value = "运动类型表-分页列表查询")
 	@Operation(summary="运动类型表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<AppCategory>> queryPageList(AppCategory appCategory,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-
-
-        QueryWrapper<AppCategory> queryWrapper = QueryGenerator.initQueryWrapper(appCategory, req.getParameterMap());
-		Page<AppCategory> page = new Page<AppCategory>(pageNo, pageSize);
-		IPage<AppCategory> pageList = appCategoryService.page(page, queryWrapper);
-		return Result.OK(pageList);
+	public Result<IPage<AppCategoryVO>> queryPageList(AppCategoryDTO dto) {
+		return Result.OK(appCategoryService.queryCategoryList(dto));
 	}
 	
 	/**
 	 *   添加
 	 *
-	 * @param appCategory
+	 * @param appCategoryVO
 	 * @return
 	 */
 	@AutoLog(value = "运动类型表-添加")
 	@Operation(summary="运动类型表-添加")
-	@RequiresPermissions("org.jeecg.modules.app:nm_category:add")
+//	@RequiresPermissions("org.jeecg.modules.app:nm_category:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody AppCategory appCategory) {
-		appCategoryService.save(appCategory);
-
-		return Result.OK("添加成功！");
+	public Result<String> add(@RequestBody AppCategoryVO appCategoryVO) {
+		return appCategoryService.saveCategory(appCategoryVO)?Result.OK("添加成功！") :Result.error("添加失败！");
 	}
 	
 	/**
 	 *  编辑
 	 *
-	 * @param appCategory
+	 * @param appCategoryDTO
 	 * @return
 	 */
 	@AutoLog(value = "运动类型表-编辑")
 	@Operation(summary="运动类型表-编辑")
-	@RequiresPermissions("org.jeecg.modules.app:nm_category:edit")
+//	@RequiresPermissions("org.jeecg.modules.app:nm_category:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody AppCategory appCategory) {
-		appCategoryService.updateById(appCategory);
-		return Result.OK("编辑成功!");
+	public Result<String> edit(@RequestBody AppCategoryDTO appCategoryDTO) {
+		return appCategoryService.editCategory(appCategoryDTO)?Result.OK("操作成功！") :Result.error("操作失败！");
 	}
 	
 	/**
@@ -115,11 +106,10 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 	 */
 	@AutoLog(value = "运动类型表-通过id删除")
 	@Operation(summary="运动类型表-通过id删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_category:delete")
+//	@RequiresPermissions("org.jeecg.modules.app:nm_category:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		appCategoryService.removeById(id);
-		return Result.OK("删除成功!");
+		return appCategoryService.deleteCategory(id)?Result.OK("操作成功！"):Result.error("操作失败！");
 	}
 	
 	/**
@@ -130,7 +120,7 @@ public class AppCategoryController extends JeecgController<AppCategory, IAppCate
 	 */
 	@AutoLog(value = "运动类型表-批量删除")
 	@Operation(summary="运动类型表-批量删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_category:deleteBatch")
+//	@RequiresPermissions("org.jeecg.modules.app:nm_category:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.appCategoryService.removeByIds(Arrays.asList(ids.split(",")));

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppCoureseController.java → national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppCoursesController.java

@@ -3,8 +3,11 @@ package org.jeecg.modules.system.app.controller;
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.app.dto.AppCoursesDTO;
 import org.jeecg.modules.system.app.entity.AppCourses;
 import org.jeecg.modules.system.app.service.IAppCoureseService;
@@ -30,11 +33,11 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="课程/培训表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appCourese")
+@RequestMapping("/app/appCourese")
 @Slf4j
-public class AppCoureseController extends JeecgController<AppCourses, IAppCoureseService> {
+public class AppCoursesController extends JeecgController<AppCourses, IAppCoureseService> {
 	@Autowired
-	private IAppCoureseService appCoureseService;
+	private IAppCoureseService appCoursesService;
 	
 	/**
 	 * 分页列表查询
@@ -55,8 +58,11 @@ public class AppCoureseController extends JeecgController<AppCourses, IAppCoures
 
 
         QueryWrapper<AppCourses> queryWrapper = QueryGenerator.initQueryWrapper(appCourese, req.getParameterMap());
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+		queryWrapper.eq("org_code",loginUser.getOrgCode());
 		Page<AppCourses> page = new Page<AppCourses>(pageNo, pageSize);
-		IPage<AppCourses> pageList = appCoureseService.page(page, queryWrapper);
+		IPage<AppCourses> pageList = appCoursesService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
@@ -71,9 +77,7 @@ public class AppCoureseController extends JeecgController<AppCourses, IAppCoures
 	@RequiresPermissions("org.jeecg.modules.app:nm_courese:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody AppCoursesDTO appCoursesDTO) {
-
-
-		return Result.OK("添加成功！");
+		return appCoursesService.saveWitchPriceRules(appCoursesDTO)?Result.OK("添加成功！"):Result.error("添加失败！");
 	}
 	
 	/**
@@ -87,8 +91,7 @@ public class AppCoureseController extends JeecgController<AppCourses, IAppCoures
 	@RequiresPermissions("org.jeecg.modules.app:nm_courese:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody AppCoursesDTO appCoursesDTO) {
-		appCoureseService.editWitchPriceRules(appCoursesDTO);
-		return Result.OK("编辑成功!");
+		return appCoursesService.editWitchPriceRules(appCoursesDTO)?Result.OK("操作成功！"):Result.error("操作失败！");
 	}
 	
 	/**
@@ -102,24 +105,23 @@ public class AppCoureseController extends JeecgController<AppCourses, IAppCoures
 	@RequiresPermissions("org.jeecg.modules.app:nm_courese:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		appCoureseService.removeById(id);
-		return Result.OK("删除成功!");
+		return appCoursesService.deleteWitchPriceRulesById(id)?Result.OK("操作成功！"):Result.error("操作失败！");
 	}
 	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "课程/培训表-批量删除")
-	@Operation(summary="课程/培训表-批量删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_courese:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.appCoureseService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
+//	/**
+//	 *  批量删除
+//	 *
+//	 * @param ids
+//	 * @return
+//	 */
+//	@AutoLog(value = "课程/培训表-批量删除")
+//	@Operation(summary="课程/培训表-批量删除")
+//	@RequiresPermissions("org.jeecg.modules.app:nm_courese:deleteBatch")
+//	@DeleteMapping(value = "/deleteBatch")
+//	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+//		this.appCoursesService.removeByIds(Arrays.asList(ids.split(",")));
+//		return Result.OK("批量删除成功!");
+//	}
 	
 	/**
 	 * 通过id查询
@@ -130,12 +132,8 @@ public class AppCoureseController extends JeecgController<AppCourses, IAppCoures
 	//@AutoLog(value = "课程/培训表-通过id查询")
 	@Operation(summary="课程/培训表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<AppCourses> queryById(@RequestParam(name="id",required=true) String id) {
-		AppCourses appCourese = appCoureseService.getById(id);
-		if(appCourese==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(appCourese);
+	public Result<AppCoursesDTO> queryById(@RequestParam(name="id",required=true) String id) {
+		return Result.OK(appCoursesService.queryWitchPriceRulesById(id));
 	}
 
     /**

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppCoursesPriceRulesController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="课程价格规则表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appCoursesPriceRules")
+@RequestMapping("/app/appCoursesPriceRules")
 @Slf4j
 public class AppCoursesPriceRulesController extends JeecgController<AppCoursesPriceRules, IAppCoursesPriceRulesService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppGameController.java

@@ -10,9 +10,12 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.system.app.dto.AppGameDTO;
 import org.jeecg.modules.system.app.entity.AppGame;
@@ -72,6 +75,8 @@ public class AppGameController extends JeecgController<AppGame, IAppGameService>
 
 
         QueryWrapper<AppGame> queryWrapper = QueryGenerator.initQueryWrapper(appGame, req.getParameterMap());
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		queryWrapper.eq("org_code",loginUser.getOrgCode());
 		Page<AppGame> page = new Page<AppGame>(pageNo, pageSize);
 		IPage<AppGame> pageList = appGameService.page(page, queryWrapper);
 		return Result.OK(pageList);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppGamePriceRulesController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="赛事价格规则表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appGamePriceRules")
+@RequestMapping("/app/appGamePriceRules")
 @Slf4j
 public class AppGamePriceRulesController extends JeecgController<AppGamePriceRules, IAppGamePriceRulesService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppInsureController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="保险表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appInsure")
+@RequestMapping("/app/appInsure")
 @Slf4j
 public class AppInsureController extends JeecgController<AppInsure, IAppInsureService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppInsureNumberController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="保单表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appInsureNumber")
+@RequestMapping("/app/appInsureNumber")
 @Slf4j
 public class AppInsureNumberController extends JeecgController<AppInsureNumber, IAppInsureNumberService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppOrderController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="订单表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appOrder")
+@RequestMapping("/app/appOrder")
 @Slf4j
 public class AppOrderController extends JeecgController<AppOrder, IAppOrderService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppOrderProductController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="订单产品明细")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appOrderProduct")
+@RequestMapping("/app/appOrderProduct")
 @Slf4j
 public class AppOrderProductController extends JeecgController<AppOrderProduct, IAppOrderProductService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppOrderUserController.java

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="订单人员详细表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appOrderUser")
+@RequestMapping("/app/appOrderUser")
 @Slf4j
 public class AppOrderUserController extends JeecgController<AppOrderUser, IAppOrderUserService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppProductCategoryController.java

@@ -1,182 +0,0 @@
-package org.jeecg.modules.system.app.controller;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.system.app.entity.AppProductCategory;
-import org.jeecg.modules.system.app.service.IAppProductCategoryService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
- /**
- * @Description: 产品类目表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-@Tag(name="产品类目表")
-@RestController
-@RequestMapping("/org/jeecg/modules/app/appProductCategory")
-@Slf4j
-public class AppProductCategoryController extends JeecgController<AppProductCategory, IAppProductCategoryService> {
-	@Autowired
-	private IAppProductCategoryService appProductCategoryService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param appProductCategory
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "产品类目表-分页列表查询")
-	@Operation(summary="产品类目表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<AppProductCategory>> queryPageList(AppProductCategory appProductCategory,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-
-
-        QueryWrapper<AppProductCategory> queryWrapper = QueryGenerator.initQueryWrapper(appProductCategory, req.getParameterMap());
-		Page<AppProductCategory> page = new Page<AppProductCategory>(pageNo, pageSize);
-		IPage<AppProductCategory> pageList = appProductCategoryService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param appProductCategory
-	 * @return
-	 */
-	@AutoLog(value = "产品类目表-添加")
-	@Operation(summary="产品类目表-添加")
-	@RequiresPermissions("org.jeecg.modules.app:nm_product_category:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody AppProductCategory appProductCategory) {
-		appProductCategoryService.save(appProductCategory);
-
-		return Result.OK("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param appProductCategory
-	 * @return
-	 */
-	@AutoLog(value = "产品类目表-编辑")
-	@Operation(summary="产品类目表-编辑")
-	@RequiresPermissions("org.jeecg.modules.app:nm_product_category:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody AppProductCategory appProductCategory) {
-		appProductCategoryService.updateById(appProductCategory);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "产品类目表-通过id删除")
-	@Operation(summary="产品类目表-通过id删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_product_category:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		appProductCategoryService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "产品类目表-批量删除")
-	@Operation(summary="产品类目表-批量删除")
-	@RequiresPermissions("org.jeecg.modules.app:nm_product_category:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.appProductCategoryService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "产品类目表-通过id查询")
-	@Operation(summary="产品类目表-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<AppProductCategory> queryById(@RequestParam(name="id",required=true) String id) {
-		AppProductCategory appProductCategory = appProductCategoryService.getById(id);
-		if(appProductCategory==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(appProductCategory);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param appProductCategory
-    */
-    @RequiresPermissions("org.jeecg.modules.app:nm_product_category:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, AppProductCategory appProductCategory) {
-        return super.exportXls(request, appProductCategory, AppProductCategory.class, "产品类目表");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequiresPermissions("org.jeecg.modules.app:nm_product_category:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, AppProductCategory.class);
-    }
-
-}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppSiteController.java

@@ -4,8 +4,11 @@ import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.system.app.dto.AppSiteDTO;
 import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.entity.AppSitePriceRules;
@@ -61,6 +64,8 @@ public class AppSiteController extends JeecgController<AppSite, IAppSiteService>
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
         QueryWrapper<AppSite> queryWrapper = QueryGenerator.initQueryWrapper(appSite, req.getParameterMap());
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		queryWrapper.eq("org_code",loginUser.getOrgCode());
 		Page<AppSite> page = new Page<AppSite>(pageNo, pageSize);
 		IPage<AppSite> pageList = appSiteService.page(page, queryWrapper);
 		return Result.OK(pageList);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppSitePriceRulesController.java

@@ -29,7 +29,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  */
 @Tag(name="场地价格规则表")
 @RestController
-@RequestMapping("/org/jeecg/modules/app/appSitePriceRules")
+@RequestMapping("/app/appSitePriceRules")
 @Slf4j
 public class AppSitePriceRulesController extends JeecgController<AppSitePriceRules, IAppSitePriceRulesService> {
 	@Autowired

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/CUserInfoController.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.system.app.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoRequestDTO;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @Description: 家庭成员信息表
+ * @Author: zx
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Tag(name="c端用户信息表")
+@RestController
+@RequestMapping("/cUserInfo")
+@Slf4j
+public class CUserInfoController {
+
+    @Autowired
+    ISysUserService iSysUserService;
+
+    @Operation(summary="家庭成员信息表-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<FindPageCUserInfoResponseDTO>> queryPageList(FindPageCUserInfoRequestDTO findPageCUserInfoRequestDTO,
+                                                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                                     @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                                     HttpServletRequest req) {
+        return Result.OK(iSysUserService.findByCUserInfo(pageNo,pageSize,findPageCUserInfoRequestDTO));
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/FamilyMembersController.java

@@ -0,0 +1,175 @@
+package org.jeecg.modules.system.app.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.system.app.dto.FindFamilyMembersResponseDTO;
+import org.jeecg.modules.system.app.entity.FamilyMembers;
+import org.jeecg.modules.system.app.service.IFamilyMembersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 家庭成员信息表
+ * @Author: zx
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Tag(name="家庭成员信息表")
+@RestController
+@RequestMapping("/familyMembers")
+@Slf4j
+public class FamilyMembersController extends JeecgController<FamilyMembers, IFamilyMembersService> {
+	@Autowired
+	private IFamilyMembersService familyMembersService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param familyMembers
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "家庭成员信息表-分页列表查询")
+	@Operation(summary="家庭成员信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<FamilyMembers>> queryPageList(FamilyMembers familyMembers,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+        QueryWrapper<FamilyMembers> queryWrapper = QueryGenerator.initQueryWrapper(familyMembers, req.getParameterMap());
+		Page<FamilyMembers> page = new Page<FamilyMembers>(pageNo, pageSize);
+		IPage<FamilyMembers> pageList = familyMembersService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param familyMembers
+	 * @return
+	 */
+	@AutoLog(value = "家庭成员信息表-添加")
+	@Operation(summary="家庭成员信息表-添加")
+	@RequiresPermissions("familyMembers:nm_family_members:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody FamilyMembers familyMembers) {
+		familyMembersService.save(familyMembers);
+
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param familyMembers
+	 * @return
+	 */
+	@AutoLog(value = "家庭成员信息表-编辑")
+	@Operation(summary="家庭成员信息表-编辑")
+	@RequiresPermissions("familyMembers:nm_family_members:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody FamilyMembers familyMembers) {
+		familyMembersService.updateById(familyMembers);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "家庭成员信息表-通过id删除")
+	@Operation(summary="家庭成员信息表-通过id删除")
+	@RequiresPermissions("familyMembers:nm_family_members:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		familyMembersService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "家庭成员信息表-批量删除")
+	@Operation(summary="家庭成员信息表-批量删除")
+	@RequiresPermissions("familyMembers:nm_family_members:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.familyMembersService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "家庭成员信息表-通过id查询")
+	@Operation(summary="家庭成员信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<FamilyMembers> queryById(@RequestParam(name="id",required=true) String id) {
+		FamilyMembers familyMembers = familyMembersService.getById(id);
+		if(familyMembers==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(familyMembers);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param familyMembers
+    */
+    @RequiresPermissions("familyMembers:nm_family_members:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, FamilyMembers familyMembers) {
+        return super.exportXls(request, familyMembers, FamilyMembers.class, "家庭成员信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("familyMembers:nm_family_members:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, FamilyMembers.class);
+    }
+
+	 /**
+	  * 根据用户id查询家庭成员列表
+	  * @param userId
+	  * @return
+	  */
+
+	 @Operation(summary="家庭成员信息表-通过用户id查询家庭成员信息")
+	 @GetMapping(value = "/findByUserId")
+	 public Result<FindFamilyMembersResponseDTO> findByUserId(@RequestParam(name="userId",required=true) String userId) {
+		 return familyMembersService.findByUserId(userId);
+	 }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/FeedbackController.java

@@ -0,0 +1,179 @@
+package org.jeecg.modules.system.app.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.subject.Subject;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.system.app.dto.FindPageRequestDTO;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
+import org.jeecg.modules.system.app.entity.AppFeedback;
+import org.jeecg.modules.system.app.enums.ReplyStatusEnum;
+import org.jeecg.modules.system.app.service.IAppFeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Date;
+
+/**
+ * @Description: 意见反馈
+ * @Author: zx
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Tag(name="意见反馈")
+@RestController
+@RequestMapping("/appFeedback")
+@Slf4j
+public class FeedbackController extends JeecgController<AppFeedback, IAppFeedbackService> {
+	@Autowired
+	private IAppFeedbackService appFeedbackService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param findPageRequestDTO
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@Operation(summary="意见反馈-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<FindResponseDTO>> queryPageList(FindPageRequestDTO findPageRequestDTO,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+
+
+		IPage<FindResponseDTO> pageList = appFeedbackService.findPage(pageNo,pageSize, findPageRequestDTO);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param appFeedback
+	 * @return
+	 */
+	@AutoLog(value = "意见反馈-添加")
+	@Operation(summary="意见反馈-添加")
+	@RequiresPermissions("feedback:nm_feedback:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody AppFeedback appFeedback) {
+		appFeedbackService.save(appFeedback);
+
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param appFeedback
+	 * @return
+	 */
+	@AutoLog(value = "意见反馈-编辑")
+	@Operation(summary="意见反馈-编辑")
+	@RequiresPermissions("feedback:nm_feedback:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody AppFeedback appFeedback) {
+		Subject subject = SecurityUtils.getSubject();
+		LoginUser loginUser =null;
+		if (subject.isAuthenticated()) {
+			// 获取当前登录的用户信息
+			loginUser= (LoginUser) subject.getPrincipal();
+		}
+		if (loginUser==null){
+			return Result.error("当前未登录,请先登录;或者未获取到用户信息，请联系管理员");
+		}
+		appFeedback.setReplyStatus(ReplyStatusEnum.REPLIED.getCode());
+		appFeedback.setReplyUserId(loginUser.getId());
+		appFeedback.setUpdateTime(new Date());
+		appFeedback.setUpdateBy(loginUser.getId());
+		appFeedbackService.updateById(appFeedback);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "意见反馈-通过id删除")
+	@Operation(summary="意见反馈-通过id删除")
+	@RequiresPermissions("feedback:nm_feedback:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		appFeedbackService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "意见反馈-批量删除")
+	@Operation(summary="意见反馈-批量删除")
+	@RequiresPermissions("feedback:nm_feedback:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.appFeedbackService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "意见反馈-通过id查询")
+	@Operation(summary="意见反馈-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<FindResponseDTO> queryById(@RequestParam(name="id",required=true) String id) {
+		FindResponseDTO findResponseDTO = appFeedbackService.FindById(id);
+		if(findResponseDTO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(findResponseDTO);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param appFeedback
+    */
+    @RequiresPermissions("feedback:nm_feedback:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, AppFeedback appFeedback) {
+        return super.exportXls(request, appFeedback, AppFeedback.class, "意见反馈");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("feedback:nm_feedback:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, AppFeedback.class);
+    }
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCategoryDTO.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.system.app.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author DM
+ * @date 2025/7/7 15:41
+ * @description
+ */
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="运动类目入参DTO")
+public class AppCategoryDTO extends BasePageDTO{
+    @Schema(description ="id")
+    private String id;
+    @Schema(description ="名称", example = "篮球")
+    private String name;
+    @Schema(description ="排序", example = "1")
+    private int sort;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesDTO.java

@@ -22,6 +22,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 @NoArgsConstructor
+@Schema(description="课程入参DTO")
 public class AppCoursesDTO {
     private AppCourses course;
     @ArraySchema(schema = @Schema(implementation = AppCoursesPriceRules.class), minItems = 1)

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppGameDTO.java

@@ -22,7 +22,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = false)
 @AllArgsConstructor
 @NoArgsConstructor
-@Schema(description = "场地入参DTO")
+@Schema(description = "赛事入参DTO")
 public class AppGameDTO {
     private AppGame game;
     @ArraySchema(schema = @Schema(implementation = AppGamePriceRules.class), minItems = 1)

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppOrderDTO.java

@@ -0,0 +1,37 @@
+package org.jeecg.modules.system.app.dto;
+
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.system.app.entity.AppOrder;
+import org.jeecg.modules.system.app.entity.AppOrderProduct;
+import org.jeecg.modules.system.app.entity.AppOrderUser;
+
+import java.util.List;
+
+/**
+ * @author DM
+ * @date 2025/7/7 14:29
+ * @description
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="订单入参DTO")
+public class AppOrderDTO {
+    private AppOrder order;
+    @ArraySchema(schema = @Schema(implementation = AppOrderProduct.class), minItems = 1)
+    /**
+     * 订单中产品id列表
+     */
+    @Schema(description = "订单中产品id列表")
+    private List<String> orderProductList;
+    @ArraySchema(schema = @Schema(implementation = AppOrderUserDTO.class), minItems = 1)
+    private List<AppOrderUserDTO> orderUserList;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppOrderUserDTO.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.system.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @author DM
+ * @date 2025/7/7 20:01
+ * @description
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="订单人员入参DTO")
+public class AppOrderUserDTO {
+    /**人员名称*/
+    @Schema(description = "人员名称")
+    private String name;
+    /**身份证*/
+    @Schema(description = "身份证")
+    private String idNumber;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSitePriceRulesDTO.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.system.app.dto;
+
+/**
+ * @author DM
+ * @date 2025/7/7 17:39
+ * @description
+ */
+public class AppSitePriceRulesDTO {
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/BasePageDTO.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.system.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author DM
+ * @date 2025/7/7 16:17
+ * @description
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="分页入参DTO")
+public class BasePageDTO {
+    @Schema(description = "当前页码", example = "1")
+    private Long pageNum = 1L;
+
+    @Schema(description = "每页条数", example = "10")
+    private Long pageSize = 10L;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindFamilyMembersResponseDTO.java

@@ -0,0 +1,62 @@
+package org.jeecg.modules.system.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.system.app.entity.FamilyMembers;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 意见反馈
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="家庭成员返回参数")
+public class FindFamilyMembersResponseDTO {
+
+    @Schema(description = "id")
+    private String id;
+    /**
+     * 登录账号
+     */
+    @Schema(description = "登录账号")
+    private String username;
+
+    /**
+     * 真实姓名
+     */
+    @Schema(description = "真实姓名")
+    private String realname;
+    /**
+     * 头像
+     */
+    @Schema(description = "头像")
+    private String avatar;
+    /**
+     * 电话
+     */
+    @Schema(description = "电话")
+    private String phone;
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间")
+    private Date createTime;
+    /**
+     * 小程序openId
+     */
+    @Schema(description = "微信openId")
+    private String openid;
+
+    @Schema(description = "家庭成员列表")
+    private List<FamilyMembers> familyMembersList;
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindPageCUserInfoRequestDTO.java

@@ -0,0 +1,29 @@
+package org.jeecg.modules.system.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 意见反馈
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="C端用户请求入参")
+public class FindPageCUserInfoRequestDTO {
+
+    //用户昵称
+    @Schema(description = "用户昵称")
+    private String username;
+    //实名状态 0-未实名 ；1-已实名
+    @Schema(description = "实名状态 0-未实名 ；1-已实名")
+    private Integer realNameStatus;
+
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindPageCUserInfoResponseDTO.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.system.app.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * c端用户
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="C端用户请求入参")
+public class FindPageCUserInfoResponseDTO {
+
+    //用户昵称
+    @Schema(description = "用户昵称")
+    private String username;
+    //实名状态 0-未实名 ；1-已实名
+    @Schema(description = "实名状态 0-未实名 ；1-已实名")
+    private Integer realNameStatus;
+    @Schema(description = "头像")
+    private String avatar;
+    @Schema(description = "手机号")
+    private String phone;
+    @Schema(description = "家庭成员数(包括自己)")
+    private Integer familyNum;
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间")
+    private Date createTime;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindPageRequestDTO.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.system.app.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+/**
+ * 意见反馈
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="意见反馈请求入参")
+public class FindPageRequestDTO {
+
+    //手机号
+    @Schema(description = "手机号")
+    private String phone;
+    //意见反馈类型
+    @Schema(description = "反馈类型")
+    private Integer feedbackType;
+    //用户id
+    @Schema(description = "用户id")
+    private String userId;
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/FindResponseDTO.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.system.app.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 意见反馈
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="意见反馈返回参数")
+public class FindResponseDTO {
+
+    @Schema(description = "主键id")
+    private String id;
+    /**用户id*/
+    @Excel(name = "用户名称", width = 15)
+    @Schema(description = "用户名称")
+    private String userName;
+    /**用户手机号*/
+    @Excel(name = "用户手机号", width = 15)
+    @Schema(description = "用户手机号")
+    private String phone;
+    /**反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他*/
+    @Excel(name = "反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他", width = 15)
+    @Schema(description = "反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他")
+    private Integer feedbackType;
+    /**反馈描述*/
+    @Excel(name = "反馈描述", width = 15)
+    @Schema(description = "反馈描述")
+    private String feedbackDescribed;
+    /**反馈图片地址，使用；进行隔开*/
+    @Excel(name = "反馈图片地址，使用；进行隔开", width = 15)
+    @Schema(description = "反馈图片地址，使用；进行隔开")
+    private String feedbackImg;
+    /**回复状态0-未回复 1-已回复*/
+    @Excel(name = "回复状态0-未回复 1-已回复", width = 15)
+    @Schema(description = "回复状态0-未回复 1-已回复")
+    private Integer replyStatus;
+    /**回复内容*/
+    @Excel(name = "回复内容", width = 15)
+    @Schema(description = "回复内容")
+    private String replyContent;
+
+    /**创建时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间")
+    private Date createTime;
+    @Schema(description = "图片集合")
+    private List<String> feedbackImgList;
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppCategory.java

@@ -49,6 +49,10 @@ public class AppCategory implements Serializable {
 	@Excel(name = "名称", width = 15)
     @Schema(description = "名称")
     private String name;
+	/**顺序*/
+	@Excel(name = "顺序", width = 15)
+    @Schema(description = "顺序")
+    private Integer sort;
 	/**乐观锁*/
 	@Excel(name = "乐观锁", width = 15)
     @Schema(description = "乐观锁")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppFeedback.java

@@ -0,0 +1,85 @@
+package org.jeecg.modules.system.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 意见反馈
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("nm_feedback")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="意见反馈")
+public class AppFeedback implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键id")
+    private String id;
+	/**用户id*/
+	@Excel(name = "用户id", width = 15)
+    @Schema(description = "用户id")
+    private String userId;
+	/**反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他*/
+	@Excel(name = "反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他", width = 15)
+    @Schema(description = "反馈类型0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他")
+    private Integer feedbackType;
+	/**反馈描述*/
+	@Excel(name = "反馈描述", width = 15)
+    @Schema(description = "反馈描述")
+    private String feedbackDescribed;
+	/**反馈图片地址，使用；进行隔开*/
+	@Excel(name = "反馈图片地址，使用；进行隔开", width = 15)
+    @Schema(description = "反馈图片地址，使用；进行隔开")
+    private String feedbackImg;
+	/**回复状态0-未回复 1-已回复*/
+	@Excel(name = "回复状态0-未回复 1-已回复", width = 15)
+    @Schema(description = "回复状态0-未回复 1-已回复")
+    private Integer replyStatus;
+	/**回复内容*/
+	@Excel(name = "回复内容", width = 15)
+    @Schema(description = "回复内容")
+    private String replyContent;
+	/**回复人id*/
+	@Excel(name = "回复人id", width = 15)
+    @Schema(description = "回复人id")
+    private String replyUserId;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间")
+    private Date createTime;
+	/**修改人*/
+    @Schema(description = "修改人")
+    private String updateBy;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "修改时间")
+    private Date updateTime;
+	/**删除标志;删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除标志;删除状态(0-正常,1-已删除)", width = 15)
+    @Schema(description = "删除标志;删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppOrder.java

@@ -40,7 +40,11 @@ public class AppOrder implements Serializable {
 	/**订单号*/
 	@Excel(name = "订单号", width = 15)
     @Schema(description = "订单号")
-    private String order_id;
+    private String orderCode;
+    /**订单类型*/
+    @Excel(name = "订单类型", width = 15)
+    @Schema(description = "订单类型")
+    private Integer type;
     /**部门id*/
 	@Excel(name = "部门id", width = 15)
     @Schema(description = "部门id")
@@ -57,7 +61,7 @@ public class AppOrder implements Serializable {
 	@Excel(name = "用户id", width = 15)
     @Schema(description = "用户id")
     private String userId;
-    /**订单人员*/
+    /**订单人员信息表ids*/
     @Excel(name = "订单人员", width = 15)
     @Schema(description = "订单人员")
     private String peoples;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppProductCategory.java

@@ -1,85 +0,0 @@
-package org.jeecg.modules.system.app.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: 产品类目表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-@Data
-@TableName("nm_product_category")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@Schema(description="产品类目表")
-public class AppProductCategory implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @Schema(description = "id")
-    private String id;
-	/**部门id*/
-	@Excel(name = "部门id", width = 15)
-    @Schema(description = "部门id")
-    private String orgCode;
-	/**租户id*/
-	@Excel(name = "租户id", width = 15)
-    @Schema(description = "租户id")
-    private String tenantId;
-	/**场地*/
-	@Excel(name = "场地", width = 15)
-    @Schema(description = "场地")
-    private String productId;
-	/**运动类型*/
-	@Excel(name = "运动类型", width = 15)
-    @Schema(description = "运动类型")
-    private String categoryId;
-	/**乐观锁*/
-	@Excel(name = "乐观锁", width = 15)
-    @Schema(description = "乐观锁")
-    private Integer revision;
-	/**创建人;创建人*/
-    @Schema(description = "创建人;创建人")
-    private String createBy;
-	/**创建时间;创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @Schema(description = "创建时间;创建时间")
-    private Date createTime;
-	/**更新人;更新人*/
-    @Schema(description = "更新人;更新人")
-    private String updateBy;
-	/**更新时间;更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @Schema(description = "更新时间;更新时间")
-    private Date updateTime;
-	/**系统状态;状态(0-正常,1-冻结)*/
-	@Excel(name = "系统状态;状态(0-正常,1-冻结)", width = 15)
-    @Schema(description = "系统状态;状态(0-正常,1-冻结)")
-    private Integer status;
-	/**删除标志;删除状态(0-正常,1-已删除)*/
-	@Excel(name = "删除标志;删除状态(0-正常,1-已删除)", width = 15)
-    @Schema(description = "删除标志;删除状态(0-正常,1-已删除)")
-    @TableLogic
-    private Integer delFlag;
-}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppSite.java

@@ -89,6 +89,14 @@ public class AppSite implements Serializable {
 	@Excel(name = "适用人数", width = 15)
     @Schema(description = "适用人数")
     private Integer usableCount;
+	/**不可用时间 星期*/
+	@Excel(name = "不可用时间 星期", width = 15)
+    @Schema(description = "不可用时间 星期")
+    private String downTime;
+	/**购买限制*/
+	@Excel(name = "购买限制", width = 15)
+    @Schema(description = "购买限制")
+    private Integer buyLimit;
  	/**设施/信息*/
 	@Excel(name = "设施/信息", width = 15)
     @Schema(description = "设施/信息")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/FamilyMembers.java

@@ -0,0 +1,89 @@
+package org.jeecg.modules.system.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 家庭成员信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Data
+@TableName("nm_family_members")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="家庭成员信息表")
+public class FamilyMembers implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键")
+    private String id;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @Schema(description = "姓名")
+    private String fullName;
+	/**用户编号*/
+	@Excel(name = "用户编号", width = 15)
+    @Schema(description = "用户编号")
+    private String userId;
+	/**身份证号*/
+	@Excel(name = "身份证号", width = 15)
+    @Schema(description = "身份证号")
+    private String identityCard;
+	/**身份证正面照*/
+	@Excel(name = "身份证正面照", width = 15)
+    @Schema(description = "身份证正面照")
+    private String idCardFrontImg;
+	/**身份证反面照*/
+	@Excel(name = "身份证反面照", width = 15)
+    @Schema(description = "身份证反面照")
+    private String idCardBackImg;
+	/**手机号*/
+	@Excel(name = "手机号", width = 15)
+    @Schema(description = "手机号")
+    private String phone;
+	/**实名状态 0-未实名 ；1-已实名*/
+	@Excel(name = "实名状态 0-未实名 ；1-已实名", width = 15)
+    @Schema(description = "实名状态 0-未实名 ；1-已实名")
+    private Integer realNameStatus;
+    /**身份证反面照*/
+    @Excel(name = "实名认证照片", width = 15)
+    @Schema(description = "实名认证照片")
+    private String realNameImg;
+
+    /**实名状态 0-未实名 ；1-已实名*/
+    @Excel(name = "用户类型0-本人；1-家人", width = 15)
+    @Schema(description = "用户类型0-本人；1-家人")
+    private Integer userType;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间")
+    private Date createTime;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "修改时间")
+    private Date updateTime;
+
+    /**删除标志;删除状态(0-正常,1-已删除)*/
+    @Excel(name = "删除标志;删除状态(0-正常,1-已删除)", width = 15)
+    @Schema(description = "删除标志;删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/enums/DelFlagEnum.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.system.app.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+
+/**
+ * 回复状态枚举
+ */
+@EnumDict("delFlagEnum")
+public enum DelFlagEnum {
+//   0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他
+    NO_DELETE(0, "未删除"),
+    YES_DELETE(1, "已删除");
+
+    Integer code;
+    String name;
+    DelFlagEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+    public static DelFlagEnum getByCode(Integer code) {
+        for (DelFlagEnum value : values()) {
+            if (value.code.equals(code) ) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/enums/FeedbackTypeEnum.java

@@ -0,0 +1,46 @@
+package org.jeecg.modules.system.app.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+
+/**
+ * 意见反馈类型枚举
+ */
+@EnumDict("feedbackType")
+public enum FeedbackTypeEnum {
+//   0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他
+    TSTC(0, "投诉吐槽"),
+    GNYC(1, "功能异常"),
+    YHTY(2, "用户体验"),
+    GNJY(3, "功能建议"),
+    QT(4, "其他");
+
+    Integer code;
+    String name;
+    FeedbackTypeEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+    public static FeedbackTypeEnum getByCode(Integer code) {
+        for (FeedbackTypeEnum value : values()) {
+            if (value.code.equals(code) ) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/enums/OrderTypeEnum.java

@@ -0,0 +1,40 @@
+package org.jeecg.modules.system.app.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum OrderTypeEnum {
+    //    0学校 1包场 2不固定场
+    /**
+     * 场地
+     */
+    SITE(0, "场地"),
+    /**
+     * 赛事
+     */
+    GAME(1, "赛事"),
+    /**
+     * 课程
+     */
+    COURSES(2, "课程");
+    final int code;
+    final String name;
+    OrderTypeEnum(int code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    public int getCode() {
+        return code;
+    }
+    public String getName() {
+        return name;
+    }
+    public static OrderTypeEnum getByCode(int code) {
+        for (OrderTypeEnum value : values()) {
+            if (value.code == code) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/enums/ReplyStatusEnum.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.system.app.enums;
+
+import org.jeecg.common.system.annotation.EnumDict;
+
+/**
+ * 回复状态枚举
+ */
+@EnumDict("ReplyStatus")
+public enum ReplyStatusEnum {
+//   0-投诉吐槽；1-功能异常；2-用户体验；3-功能建议；4-其他
+    REPLIED(0, "已回复"),
+    NO_REPLY(1, "未回复");
+
+    Integer code;
+    String name;
+    ReplyStatusEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+    public static ReplyStatusEnum getByCode(Integer code) {
+        for (ReplyStatusEnum value : values()) {
+            if (value.code.equals(code) ) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/enums/SiteTypeEnum.java

@@ -8,8 +8,8 @@ public enum SiteTypeEnum {
     SCHOOL(0, "学校"),
     PACKAGE(1, "包场"),
     UNFIXED(2, "不固定场");
-    int code;
-    String name;
+    final int code;
+    final String name;
     SiteTypeEnum(int code, String name) {
         this.code = code;
         this.name = name;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppFeedbackMapper.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.system.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.system.app.dto.FindPageRequestDTO;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
+import org.jeecg.modules.system.app.entity.AppFeedback;
+
+/**
+ * @Description: 意见反馈
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+public interface AppFeedbackMapper extends BaseMapper<AppFeedback> {
+
+    IPage<FindResponseDTO> findPage(@Param("page")Page<FindResponseDTO> page, @Param("findPageRequestDTO") FindPageRequestDTO findPageRequestDTO);
+    @Select(" select  f.id,f.feedback_type,f.feedback_described,f.feedback_img,f.reply_status,f.reply_content,f.create_time,su.username,su.phone from nm_feedback f left join  sys_user su on f.user_id =su.id " +
+            "       where f.del_flag =0 AND f.id = #{id}")
+    FindResponseDTO findById(@Param("id") String id);
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppProductCategoryMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.system.app.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.app.entity.AppProductCategory;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 产品类目表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-public interface AppProductCategoryMapper extends BaseMapper<AppProductCategory> {
-
-}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/FamilyMembersMapper.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.system.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.system.app.entity.FamilyMembers;
+
+import java.util.List;
+
+/**
+ * @Description: 家庭成员信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+public interface FamilyMembersMapper extends BaseMapper<FamilyMembers> {
+
+    @Select("select  * from nm_family_members where  user_id = #{userId} order by user_type asc,create_time desc")
+    List<FamilyMembers> findByUserId(@Param("userId") String userId);
+
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppFeedbackMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.system.app.mapper.AppFeedbackMapper">
+
+
+    <select id="findPage" resultType="org.jeecg.modules.system.app.dto.FindResponseDTO">
+        select  f.id,f.feedback_type,f.feedback_described,f.feedback_img,f.reply_status,f.reply_content,f.create_time,su.username,su.phone from nm_feedback f left join  sys_user su on f.user_id =su.id
+        where f.del_flag =0
+        <if test="findPageRequestDTO.phone != null and findPageRequestDTO.phone != ''">
+            and su.phone=#{findPageRequestDTO.phone}
+        </if>
+        <if test="findPageRequestDTO.feedbackType != null and findPageRequestDTO.feedbackType != ''">
+            and f.feedback_type=#{findPageRequestDTO.feedbackType}
+        </if>
+        <if test="findPageRequestDTO.userId != null and findPageRequestDTO.userId != ''">
+            and f.user_id=#{findPageRequestDTO.userId}
+        </if>
+        order by f.create_time desc
+    </select>
+</mapper>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppProductCategoryMapper.xml → national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/FamilyMembersMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.app.mapper.AppProductCategoryMapper">
+<mapper namespace="org.jeecg.modules.system.app.mapper.FamilyMembersMapper">
 
 </mapper>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppCategoryService.java

@@ -1,7 +1,10 @@
 package org.jeecg.modules.system.app.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.system.app.dto.AppCategoryDTO;
 import org.jeecg.modules.system.app.entity.AppCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.app.vo.AppCategoryVO;
 
 /**
  * @Description: 运动类型表
@@ -10,5 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IAppCategoryService extends IService<AppCategory> {
+    Boolean saveCategory(AppCategoryVO appCategoryVO);
+    Boolean editCategory(AppCategoryDTO appCategoryVO);
+    Boolean deleteCategory(String id);
+    IPage<AppCategoryVO> queryCategoryList(AppCategoryDTO appCategoryDTO);
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppFeedbackService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.system.app.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.app.dto.FindPageRequestDTO;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
+import org.jeecg.modules.system.app.entity.AppFeedback;
+
+
+/**
+ * @Description: 意见反馈
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+public interface IAppFeedbackService extends IService<AppFeedback> {
+
+    IPage<FindResponseDTO> findPage(Integer pageNo,Integer pageSize, FindPageRequestDTO findPageRequestDTO);
+
+    FindResponseDTO FindById(String id);
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppOrderService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.system.app.service;
 
+import org.jeecg.modules.system.app.dto.AppOrderDTO;
 import org.jeecg.modules.system.app.entity.AppOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -10,5 +11,32 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IAppOrderService extends IService<AppOrder> {
+    /**
+     * 添加订单表
+     * @param appOrderDTO
+     * @return
+     */
+    Boolean saveWitchProduct(AppOrderDTO appOrderDTO);
+
+    /**
+     * 修改订单表
+     * @param appOrderDTO
+     * @return
+     */
+    Boolean editWitchProduct(AppOrderDTO appOrderDTO);
+
+    /**
+     * 删除订单表
+     * @param id
+     * @return
+     */
+    Boolean deleteWitchProductById(String id);
+
+    /**
+     * 查询订单详情
+     * @param id
+     * @return
+     */
+    AppOrderDTO queryWitchProductById(String id);
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppProductCategoryService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.system.app.service;
-
-import org.jeecg.modules.system.app.entity.AppProductCategory;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 产品类目表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-public interface IAppProductCategoryService extends IService<AppProductCategory> {
-
-}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IAppSiteService.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.system.app.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.system.app.dto.AppCategoryDTO;
 import org.jeecg.modules.system.app.dto.AppSiteDTO;
 import org.jeecg.modules.system.app.entity.AppSite;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.app.vo.AppCategoryVO;
 
 /**
  * @Description: 场地表
@@ -37,4 +40,6 @@ public interface IAppSiteService extends IService<AppSite> {
      */
     Boolean deleteWitchPriceRulesById(String id);
 
+    IPage<AppSite> querySiteList(AppSiteDTO dto);
+
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IFamilyMembersService.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.system.app.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.dto.AddFamilyMembersDTO;
+import org.jeecg.modules.system.app.dto.FindFamilyMembersResponseDTO;
+import org.jeecg.modules.system.app.entity.FamilyMembers;
+
+/**
+ * @Description: 家庭成员信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+public interface IFamilyMembersService extends IService<FamilyMembers> {
+
+    Result<FindFamilyMembersResponseDTO> findByUserId(String userId);
+
+    Result<String> addFamilyMembers(AddFamilyMembersDTO addFamilyMembersDTO);
+
+    Result<String> editFamilyMembers(AddFamilyMembersDTO addFamilyMembersDTO);
+
+    Result<String> deleteFamilyMembers(String id);
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppCategoryServiceImpl.java

@@ -1,12 +1,30 @@
 package org.jeecg.modules.system.app.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.system.app.dto.AppCategoryDTO;
 import org.jeecg.modules.system.app.entity.AppCategory;
+import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.mapper.AppCategoryMapper;
 import org.jeecg.modules.system.app.service.IAppCategoryService;
+import org.jeecg.modules.system.app.vo.AppCategoryVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
+import static org.jeecg.common.constant.CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
+
 /**
  * @Description: 运动类型表
  * @Author: jeecg-boot
@@ -16,4 +34,68 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class AppCategoryServiceImpl extends ServiceImpl<AppCategoryMapper, AppCategory> implements IAppCategoryService {
 
+
+    @Override
+    public Boolean saveCategory(AppCategoryVO categoryVO) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        AppCategory category = new AppCategory();
+        BeanUtils.copyProperties(categoryVO, category);
+        category.setOrgCode(loginUser.getOrgCode());
+        category.setTenantId(loginUser.getOrgId());
+        int insert = baseMapper.insert(category);
+        if (insert > 0) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Boolean editCategory(AppCategoryDTO categoryDTO) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        AppCategory selectedById = baseMapper.selectById(categoryDTO.getId());
+        if (null==selectedById) throw new JeecgBootException("无此类目信息");
+        checkPermission(selectedById, loginUser);
+        AppCategory category = new AppCategory();
+        BeanUtils.copyProperties(categoryDTO, category);
+        int update = baseMapper.updateById(category);
+        if (update > 0) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public Boolean deleteCategory(String id) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        AppCategory selectedById = baseMapper.selectById(id);
+        if (null==selectedById) throw new JeecgBootException("无此类目信息");
+        checkPermission(selectedById, loginUser);
+        int delete = baseMapper.deleteById(id);
+        if (delete > 0) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+    @Override
+    public IPage<AppCategoryVO> queryCategoryList(AppCategoryDTO dto) {
+        Page<AppCategory> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+        LambdaQueryWrapper<AppCategory> wrapper = Wrappers.<AppCategory>lambdaQuery()
+                .like(StringUtils.isNotBlank(dto.getName()), AppCategory::getName, dto.getName()).last("order by sort");
+        IPage<AppCategory> resultPage = baseMapper.selectPage(page, wrapper);
+        return resultPage.convert(record -> {
+            AppCategoryVO vo = new AppCategoryVO();
+            BeanUtils.copyProperties(record, vo);
+            return vo;
+        });
+    }
+    /**
+     * 权限校验
+     * @param category
+     * @param sysUser
+     */
+    private void checkPermission(AppCategory category, LoginUser sysUser ){
+        if (!sysUser.getOrgCode().equals(category.getOrgCode())) throw new JeecgBootException("无权限操作", SC_INTERNAL_SERVER_ERROR_500);
+    }
+
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppFeedbackServiceImpl.java

@@ -0,0 +1,66 @@
+package org.jeecg.modules.system.app.service.impl;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.modules.system.app.dto.FindPageRequestDTO;
+import org.jeecg.modules.system.app.dto.FindResponseDTO;
+import org.jeecg.modules.system.app.entity.AppFeedback;
+import org.jeecg.modules.system.app.mapper.AppFeedbackMapper;
+import org.jeecg.modules.system.app.service.IAppFeedbackService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description: 意见反馈
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Service
+public class AppFeedbackServiceImpl extends ServiceImpl<AppFeedbackMapper, AppFeedback> implements IAppFeedbackService {
+
+    @Autowired
+    AppFeedbackMapper appFeedbackMapper;
+
+    @Override
+    public IPage<FindResponseDTO> findPage(Integer pageNo,Integer pageSize, FindPageRequestDTO findPageRequestDTO) {
+        Page<FindResponseDTO> page = new Page<FindResponseDTO>(pageNo, pageSize);
+        IPage<FindResponseDTO> findPage = appFeedbackMapper.findPage(page, findPageRequestDTO);
+        if (findPage!=null){
+            for (FindResponseDTO record : findPage.getRecords()) {
+                if (StringUtils.isNotEmpty(record.getFeedbackImg())){
+                    imgSplit(record);
+                }
+            }
+        }
+        return findPage;
+    }
+
+    @Override
+    public FindResponseDTO FindById(String id) {
+        FindResponseDTO findResponseDTO = appFeedbackMapper.findById(id);
+        if (findResponseDTO!=null&&StringUtils.isNotEmpty(findResponseDTO.getFeedbackImg())){
+            imgSplit(findResponseDTO);
+        }
+        return findResponseDTO;
+    }
+
+
+    private static void imgSplit(FindResponseDTO findResponseDTO ){
+        List<String> strings = new ArrayList<>();
+        if (findResponseDTO.getFeedbackImg().indexOf(";")>0){
+            strings = Arrays.asList(findResponseDTO.getFeedbackImg().split(";"));
+        }else {
+            strings.add(findResponseDTO.getFeedbackImg());
+
+        }
+        findResponseDTO.setFeedbackImgList(strings);
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderServiceImpl.java

@@ -1,11 +1,21 @@
 package org.jeecg.modules.system.app.service.impl;
 
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.system.app.dto.AppOrderDTO;
 import org.jeecg.modules.system.app.entity.AppOrder;
-import org.jeecg.modules.system.app.mapper.AppOrderMapper;
+import org.jeecg.modules.system.app.entity.AppOrderProduct;
+import org.jeecg.modules.system.app.entity.AppOrderUser;
+import org.jeecg.modules.system.app.enums.OrderTypeEnum;
+import org.jeecg.modules.system.app.mapper.*;
 import org.jeecg.modules.system.app.service.IAppOrderService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
 
 /**
  * @Description: 订单表
@@ -15,5 +25,33 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> implements IAppOrderService {
+    @Resource
+    AppOrderProductMapper appOrderProductMapper;
+    @Resource
+    AppInsureNumberMapper appInsureMapper;
+    @Resource
+    AppOrderUserMapper appOrderUserMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean saveWitchProduct(AppOrderDTO appOrderDTO) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public Boolean editWitchProduct(AppOrderDTO appOrderDTO) {
+        return null;
+    }
+
+    @Override
+    public Boolean deleteWitchProductById(String id) {
+        return null;
+    }
 
+    @Override
+    public AppOrderDTO queryWitchProductById(String id) {
+        return null;
+    }
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppProductCategoryServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.system.app.service.impl;
-
-import org.jeecg.modules.system.app.entity.AppProductCategory;
-import org.jeecg.modules.system.app.mapper.AppProductCategoryMapper;
-import org.jeecg.modules.system.app.service.IAppProductCategoryService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 产品类目表
- * @Author: jeecg-boot
- * @Date:   2025-07-03
- * @Version: V1.0
- */
-@Service
-public class AppProductCategoryServiceImpl extends ServiceImpl<AppProductCategoryMapper, AppProductCategory> implements IAppProductCategoryService {
-
-}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSiteServiceImpl.java

@@ -1,16 +1,23 @@
 package org.jeecg.modules.system.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.system.app.dto.AppCategoryDTO;
 import org.jeecg.modules.system.app.dto.AppSiteDTO;
+import org.jeecg.modules.system.app.entity.AppCategory;
 import org.jeecg.modules.system.app.entity.AppSite;
 import org.jeecg.modules.system.app.entity.AppSitePriceRules;
 import org.jeecg.modules.system.app.mapper.AppSiteMapper;
 import org.jeecg.modules.system.app.mapper.AppSitePriceRulesMapper;
 import org.jeecg.modules.system.app.service.IAppSiteService;
+import org.jeecg.modules.system.app.vo.AppCategoryVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -123,6 +130,20 @@ public class AppSiteServiceImpl extends ServiceImpl<AppSiteMapper, AppSite> impl
         return Boolean.TRUE;
     }
 
+    @Override
+    public IPage<AppSite> querySiteList(AppSiteDTO dto) {
+//        Page<AppSite> page = new Page<>(dto.getPageNum(), dto.getPageSize());
+//        LambdaQueryWrapper<AppSite> wrapper = Wrappers.<AppSite>lambdaQuery()
+//                .like(StringUtils.isNotBlank(dto.getName()), AppSite::getName, dto.getName());
+//        IPage<AppSite> resultPage = baseMapper.selectPage(page, wrapper);
+//        return resultPage.convert(record -> {
+//            AppSiteVO vo = new AppCategoryVO();
+//            BeanUtils.copyProperties(record, vo);
+//            return vo;
+//        });
+        return null;
+    }
+
     /**
      * 权限校验
      * @param site

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/FamilyMembersServiceImpl.java

@@ -0,0 +1,100 @@
+package org.jeecg.modules.system.app.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import me.zhyd.oauth.utils.UuidUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.dto.AddFamilyMembersDTO;
+import org.jeecg.modules.system.app.dto.FindFamilyMembersResponseDTO;
+import org.jeecg.modules.system.app.entity.FamilyMembers;
+import org.jeecg.modules.system.app.enums.DelFlagEnum;
+import org.jeecg.modules.system.app.mapper.FamilyMembersMapper;
+import org.jeecg.modules.system.app.service.IFamilyMembersService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 家庭成员信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-07-07
+ * @Version: V1.0
+ */
+@Service
+public class FamilyMembersServiceImpl extends ServiceImpl<FamilyMembersMapper, FamilyMembers> implements IFamilyMembersService {
+
+    @Autowired
+    FamilyMembersMapper familyMembersMapper;
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+
+    @Override
+    public Result<FindFamilyMembersResponseDTO> findByUserId(String userId) {
+        if (StringUtils.isEmpty(userId)){
+            return Result.error("请求参数为空");
+        }
+        FindFamilyMembersResponseDTO findFamilyMembersResponseDTO = new FindFamilyMembersResponseDTO();
+
+        //查询用户信息
+        SysUser sysUser = sysUserMapper.selectById(userId);
+        if (sysUser==null){
+            return Result.error("未查询到用户信息,请核实是否正确");
+        }
+        BeanUtils.copyProperties(sysUser,findFamilyMembersResponseDTO);
+        //查询家庭成员列表信息
+        List<FamilyMembers> familyMembersList = familyMembersMapper.findByUserId(userId);
+        findFamilyMembersResponseDTO.setFamilyMembersList(familyMembersList);
+        return Result.ok(findFamilyMembersResponseDTO);
+    }
+
+    @Override
+    public Result<String> addFamilyMembers(AddFamilyMembersDTO addFamilyMembersDTO) {
+        FamilyMembers familyMembers = new FamilyMembers();
+        BeanUtils.copyProperties(addFamilyMembersDTO,familyMembers);
+        familyMembers.setId(UuidUtils.getUUID());
+        familyMembers.setCreateTime(new Date());
+        if (familyMembersMapper.insert(familyMembers)<1){
+            return Result.error("添加家庭成员失败，请联系管理员");
+        }
+        return Result.ok("添加成功");
+    }
+
+    @Override
+    public Result<String> editFamilyMembers(AddFamilyMembersDTO addFamilyMembersDTO) {
+        FamilyMembers familyMembers = new FamilyMembers();
+        BeanUtils.copyProperties(addFamilyMembersDTO,familyMembers);
+        if (StringUtils.isEmpty(familyMembers.getId())){
+            return Result.error("修改家庭成员失败，请选择家庭成员");
+        }
+        familyMembers.setUpdateTime(new Date());
+        if (familyMembersMapper.updateById(familyMembers)<1){
+            return Result.error("修改家庭成员失败，请联系管理员");
+        }
+        return Result.ok("修改成功");
+    }
+
+    @Override
+    public Result<String> deleteFamilyMembers(String id) {
+
+        if (StringUtils.isEmpty(id)){
+            return Result.error("删除失败，请选择需要删除的家庭成员");
+        }
+        FamilyMembers familyMembers = familyMembersMapper.selectById(id);
+        if (familyMembers==null){
+            return Result.error("删除失败，未查询到家庭成员");
+        }
+        familyMembers.setDelFlag(DelFlagEnum.NO_DELETE.getCode());
+        familyMembers.setUpdateTime(new Date());
+        if (familyMembersMapper.updateById(familyMembers)<1){
+            return Result.error("删除家庭成员失败，请联系管理员");
+        }
+        return Result.ok("删除成功");
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/utils/OrderCodeGenerator.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.system.app.utils;
+
+import java.time.LocalDate;
+import java.util.Random;
+
+/**
+ * @author DM
+ * @date 2025/7/7 18:23
+ * @description
+ */
+public class OrderCodeGenerator {
+    /**
+     * 生成 8 位编码：前 4 位随机数，后 4 位为当前日期（MMDD）
+     */
+    public static String generateCode() {
+        // 获取当前日期，格式化为 MMdd（例如：0715）
+        LocalDate currentDate = LocalDate.now();
+        String datePart = String.format("%02d%02d",
+                currentDate.getMonthValue(), // 月份
+                currentDate.getDayOfMonth()); // 日期
+
+        // 生成 4 位随机数字
+        Random random = new Random();
+        int randomNumber = 1000 + random.nextInt(9000); // 1000 ~ 9999
+
+        // 拼接结果
+        return String.format("%04d%s", randomNumber, datePart);
+    }
+
+    /**
+     *
+     * @param businessType 88支付 86退款
+     * @return
+     */
+    public static String getOrderCode(Integer businessType){
+        return businessType + generateCode();
+    }
+
+    public static void main(String[] args) {
+        System.out.println("生成的编码：" + getOrderCode(88));
+    }
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/AppCategoryVO.java

@@ -0,0 +1,34 @@
+package org.jeecg.modules.system.app.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author DM
+ * @date 2025/7/7 15:32
+ * @description
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description="订单入参DTO")
+public class AppCategoryVO {
+    /**名称*/
+    @Schema(description = "名称")
+    private String name;
+    /**顺序*/
+    @Schema(description = "顺序")
+    private Integer sort;
+
+    /**创建时间*/
+    @Schema(description = "创建时间")
+    private Date createTime;;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/vo/AppSiteVO.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.system.app.vo;
+
+/**
+ * @author DM
+ * @date 2025/7/7 17:37
+ * @description
+ */
+public class AppSiteVO {
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoRequestDTO;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO;
 import org.jeecg.modules.system.entity.SysUser;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -231,4 +233,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	 * @return
 	 **/
 	List<String> getUserIdListByRoleId(@Param("roleCode") String roleCode);
+
+    IPage<FindPageCUserInfoResponseDTO> findPage(Page<FindPageCUserInfoResponseDTO> page, FindPageCUserInfoRequestDTO findPageCUserInfoRequestDTO);
+
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -303,4 +303,14 @@
 		SELECT b.id FROM `sys_role` a LEFT JOIN sys_user_role b ON a.id = b.role_id
 		WHERE a.role_code = #{roleCode}
 	</select>
+    <select id="findPage" resultType="org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO">
+		select * from (
+		select su.id,su.username,su.avatar,su.phone,su.create_time,fm.real_name_status from sys_user su
+		left join  nm_family_members fm on su.id=fm.userId
+		where su.del_flag=0 and su.org_code='A03' and fm.del_flag=0 and fm.user_type=0 ) t
+		left join
+		(select user_id, count(1) from nm_family_members group by  user_id ) t1 on  t.id=t1.user_id
+		order by  t.create_time desc
+
+	</select>
 </mapper>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoRequestDTO;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO;
 import org.jeecg.modules.system.entity.SysRoleIndex;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -19,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -482,4 +483,6 @@ public interface ISysUserService extends IService<SysUser> {
      * @param username
      */
     void updatePasswordNotBindPhone(String oldPassword, String password, String username);
+
+    IPage<FindPageCUserInfoResponseDTO> findByCUserInfo(Integer pageNo, Integer pageSize, FindPageCUserInfoRequestDTO findPageCUserInfoRequestDTO);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -37,6 +37,8 @@ import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.jeecg.modules.base.service.BaseCommonService;
 import org.jeecg.modules.jmreport.common.util.OkConvertUtils;
 import org.jeecg.modules.message.handle.impl.SystemSendMsgHandle;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoRequestDTO;
+import org.jeecg.modules.system.app.dto.FindPageCUserInfoResponseDTO;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -58,11 +60,9 @@ import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -2356,4 +2356,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String newPassWord = PasswordUtil.encrypt(username, password, user.getSalt());
         this.userMapper.update(new SysUser().setPassword(newPassWord), new LambdaQueryWrapper<SysUser>().eq(SysUser::getId, user.getId()));
     }
+
+	/**
+	 * 查询c端用户信息
+	 * @param pageNo
+	 * @param pageSize
+	 * @param findPageCUserInfoRequestDTO
+	 * @return
+	 */
+	@Override
+	public IPage<FindPageCUserInfoResponseDTO> findByCUserInfo(Integer pageNo, Integer pageSize, FindPageCUserInfoRequestDTO findPageCUserInfoRequestDTO) {
+		Page<FindPageCUserInfoResponseDTO> page = new Page<FindPageCUserInfoResponseDTO>(pageNo, pageSize);
+		return userMapper.findPage(page, findPageCUserInfoRequestDTO);
+	}
 }