处理订阅章节逻辑

module-common/src/main/java/org/jeecg/api/controller/AppletCommentController.java

@@ -26,11 +26,18 @@ public class AppletCommentController {
     }
 
 
-    //查询我未读的评论列表
+    //获取我的评论列表
     @ApiOperation(value="获取我的评论列表", notes="获取我的评论列表")
     @GetMapping(value = "/getMyCommentList")
     public Result<?> getMyCommentList(@RequestHeader("X-Access-Token") String token,String type, PageBean pageBean) {
-        return appletCommentService.getMyCommentList(token,type, pageBean);
+        return appletCommentService.getMyCommentList(token, type, pageBean);
+    }
+
+    //查询我未读的评论列表
+    @ApiOperation(value="查询我未读的评论列表", notes="获取我的评论列表")
+    @GetMapping(value = "/getMyReplyCommentList")
+    public Result<?> getMyReplyCommentList(@RequestHeader("X-Access-Token") String token,String type, PageBean pageBean) {
+        return appletCommentService.getMyReplyCommentList(token,type, pageBean);
     }
 
 

module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java

@@ -109,8 +109,9 @@ public class AppletIndexController {
     //根据书本标识获取书本目录列表
     @ApiOperation(value="根据书本标识获取书本目录列表", notes="根据书本标识获取书本目录列表")
     @GetMapping(value = "/getBookCatalogList")
-    public Result<?> getBookCatalogList(String bookId,String orderBy, PageBean pageBean){
-        return appletIndexService.getBookCatalogList(bookId,orderBy,pageBean);
+    public Result<?> getBookCatalogList(String bookId, Integer reverse, PageBean pageBean,
+                                        @RequestHeader(value = "X-Access-Token", required = false) String token){
+        return appletIndexService.getBookCatalogList(bookId, reverse,pageBean, token);
     }
 
 

module-common/src/main/java/org/jeecg/api/controller/AppletMoneyLogController.java

@@ -32,7 +32,7 @@ public class AppletMoneyLogController {
 
     @ApiOperation( value="获取我的流水列表带分页", notes="获取我的流水列表带分页")
     @GetMapping(value = "/getMyMoneyLogPage")
-    public Result<?> getMyMoneyLogPage(@RequestHeader("X-Access-Token") String token,Integer  status, PageBean pageBean){
-        return appletMoneyLogService.getMyMoneyLogPage(token,status,pageBean);
+    public Result<?> getMyMoneyLogPage(@RequestHeader("X-Access-Token") String token,Integer  status, Integer type, PageBean pageBean){
+        return appletMoneyLogService.getMyMoneyLogPage(token,type, status,pageBean);
     }
 }

module-common/src/main/java/org/jeecg/api/service/AppletCommentService.java

@@ -29,4 +29,6 @@ public interface AppletCommentService {
 
     //查看评论详情
     Result<?> getCommentDetail(String token, String commentId);
+
+    Result<?> getMyReplyCommentList(String token, String type, PageBean pageBean);
 }

module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java

@@ -37,7 +37,7 @@ public interface AppletIndexService {
     Result<?> vote(String token,String bookId,String num);
 
     // 根据书本标识获取书本目录列表
-    Result<?> getBookCatalogList(String bookId,String orderBy, PageBean pageBean);
+    Result<?> getBookCatalogList(String bookId, Integer reverse, PageBean pageBean, String token);
 
     // 根据目录查询章节小说信息明细
     Result<?> getBookCatalogDetail(String id);

module-common/src/main/java/org/jeecg/api/service/AppletMoneyLogService.java

@@ -10,7 +10,7 @@ public interface AppletMoneyLogService {
     Result<?> getMyMoneyNum(String token);
 
     //查询我的流水信息列表带分页
-    Result<?> getMyMoneyLogPage(String token,Integer  status, PageBean pageBean);
+    Result<?> getMyMoneyLogPage(String token, Integer type, Integer  status, PageBean pageBean);
 
 
 

module-common/src/main/java/org/jeecg/api/service/impl/AppletCommentServiceImpl.java

@@ -43,9 +43,39 @@ public class AppletCommentServiceImpl implements AppletCommentService {
         return Result.OK("未读评论数",n.size());
     }
 
-    //查询我未读的评论列表
+    //查询我发布的评论列表
     @Override
-    public Result<?> getMyCommentList(String token,String type, PageBean pageBean){
+    public Result<?> getMyCommentList(String token, String type, PageBean pageBean){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        Page<CommonBookComment> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
+
+        IPage<CommonBookComment> pageList = commonBookCommentService
+                .lambdaQuery()
+                .eq(CommonBookComment::getUserId, member.getId())
+                .page(page);
+
+        //循环写入数据
+        for (CommonBookComment commonBookComment : pageList.getRecords()) {
+            commonBookComment.setChildren(
+                    commonBookCommentService.lambdaQuery()
+                            .eq(CommonBookComment::getPid, commonBookComment.getId())
+                            .orderByDesc(CommonBookComment::getCreateTime)
+                            .list()
+            );
+            commonBookComment.setCommonShop(
+                    commonShopService.getById(commonBookComment.getBookId())
+            );
+            commonBookComment.setHanHaiMember(
+                    hanHaiMemberService.getById(commonBookComment.getUserId())
+            );
+        }
+        return Result.OK("查询成功",pageList);
+    }
+
+    //查询回复我的评论列表
+    @Override
+    public Result<?> getMyReplyCommentList(String token,String type, PageBean pageBean){
         HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<CommonBookComment> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
         IPage<CommonBookComment> pageList = commonBookCommentService

module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java

@@ -2,12 +2,15 @@ package org.jeecg.api.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletIndexService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.CommonChapterSubscribe.entity.CommonChapterSubscribe;
+import org.jeecg.modules.CommonChapterSubscribe.service.ICommonChapterSubscribeService;
 import org.jeecg.modules.commonBanner.entity.CommonBanner;
 import org.jeecg.modules.commonBanner.service.ICommonBannerService;
 import org.jeecg.modules.commonBook.entity.CommonBook;
@@ -47,6 +50,7 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -85,6 +89,10 @@ public class AppletIndexServiceImpl implements AppletIndexService {
     private ICommonBookAchievementService  commonBookAchievementService;
     @Autowired
     private ICommonBookAchievementLogService commonBookAchievementLogService;
+    @Autowired
+    private ICommonChapterSubscribeService commonChapterSubscribeService;
+
+
     //权限
     @Resource
     private ShiroRealm shiroRealm;
@@ -126,14 +134,32 @@ public class AppletIndexServiceImpl implements AppletIndexService {
     @Override
     public Result<?> getRecommendList(String name,String shopCion,String shopClass, PageBean pageBean){
         Page<CommonShop> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
-        IPage<CommonShop> commonBooks = commonShopService
+
+        LambdaQueryChainWrapper<CommonShop> qw = commonShopService
                 .lambdaQuery()
-                .like(StringUtils.isNotBlank(name),CommonShop::getName,name)
-                .eq(StringUtils.isNotBlank(shopCion),CommonShop::getShopCion,shopCion)
-                .eq(StringUtils.isNotBlank(shopClass),CommonShop::getShopClass,shopClass)
-                .eq(CommonShop::getToolStatus,1)
-                .orderByDesc(CommonShop::getCreateTime)
-                .page(page);
+                .like(StringUtils.isNotBlank(shopCion), CommonShop::getShopCion, shopCion)
+                .like(StringUtils.isNotBlank(shopClass), CommonShop::getShopClass, shopClass)
+                .eq(CommonShop::getToolStatus, 1)
+                .orderByDesc(CommonShop::getCreateTime);
+
+        //通过作者名称搜素
+        if (StringUtils.isNotBlank(name)){
+            List<String> ids = hanHaiMemberService.lambdaQuery()
+                    .like(StringUtils.isNotBlank(name), HanHaiMember::getName, name)
+                    .select(HanHaiMember::getId)
+                    .list()
+                    .stream().map(n -> n.getId())
+                    .collect(Collectors.toList());
+
+            qw.and(q -> {
+                q.like(StringUtils.isNotBlank(name), CommonShop::getName, name)
+                .or()
+                .in(CommonShop::getUserId, ids);
+            });
+
+        }
+
+        IPage<CommonShop> commonBooks = qw.page(page);
 
         //添加作者
         commonBooks.getRecords().forEach(book -> {
@@ -141,7 +167,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
             book.setAuthor(member.getName());
         });
 
-        return Result.OK("首页精品推荐小说列表",commonBooks);
+        return Result.OK("首页精品推荐小说列表", commonBooks);
     }
 
 
@@ -215,7 +241,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
         if(Integer.parseInt(num)<=0){
             return Result.error("投票数量必须大于0");
         }
-        if(Integer.parseInt(num) <= (hanHaiMember.getMoney() == null ? 0 : hanHaiMember.getMoney().intValue())){
+        if(Integer.parseInt(num) > (hanHaiMember.getMoney() == null ? 0 : hanHaiMember.getMoney().intValue())){
             return Result.error("票数不够");
         }
 
@@ -231,45 +257,49 @@ public class AppletIndexServiceImpl implements AppletIndexService {
 
     // 根据书本标识获取书本目录列表
     @Override
-    public Result<?> getBookCatalogList(String bookId,String orderBy, PageBean pageBean){
+    public Result<?> getBookCatalogList(String bookId, Integer reverse, PageBean pageBean, String token){
         Page<CommonBookNovel> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
         IPage<CommonBookNovel> commonBooks = commonBookNovelService
                 .lambdaQuery()
+                .select(
+                        CommonBookNovel::getId,
+                        CommonBookNovel::getSort,
+                        CommonBookNovel::getTitle,
+                        CommonBookNovel::getBookId,
+                        CommonBookNovel::getStatus,
+                        CommonBookNovel::getCreateTime,
+                        CommonBookNovel::getUpdateTime,
+                        CommonBookNovel::getUpdateBy,
+                        CommonBookNovel::getCreateBy,
+                        CommonBookNovel::getUserId,
+                        CommonBookNovel::getIsPay,
+                        CommonBookNovel::getNum
+                )
                 .eq(CommonBookNovel::getBookId,bookId)
+                .eq(CommonBookNovel::getStatus, 1)
+//                .orderBy(true, reverse == 0, CommonBookNovel::getSort, CommonBookNovel::getCreateTime)
                 .page(page);
-        //如果orderBy不为空，则根据orderBy排序
-        if(StringUtils.isNotBlank(orderBy)){
-            if(orderBy.equals("asc")){
-                commonBooks = commonBookNovelService
-
-                        .lambdaQuery()
-                        .select(
-                                CommonBookNovel::getId,
-                                CommonBookNovel::getSort,
-                                CommonBookNovel::getTitle,
-                                CommonBookNovel::getBookId,
-                                CommonBookNovel::getStatus,
-                                CommonBookNovel::getCreateTime,
-                                CommonBookNovel::getUpdateTime,
-                                CommonBookNovel::getUpdateBy,
-                                CommonBookNovel::getCreateBy,
-                                CommonBookNovel::getUserId,
-                                CommonBookNovel::getIsPay,
-                                CommonBookNovel::getNum
-                        )
-                        .eq(CommonBookNovel::getBookId,bookId)
-                        .orderByAsc(CommonBookNovel::getSort)
-                        .page(page);
-            }else{
-                commonBooks = commonBookNovelService
-                        .lambdaQuery()
-                        .eq(CommonBookNovel::getBookId,bookId)
-                        .orderByDesc(CommonBookNovel::getSort)
-                        .page(page);
+
+
+        //检查是否购买了该章节
+        if (StringUtils.isNotBlank(token)){
+            HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+            List<String> chapterIds = commonChapterSubscribeService.lambdaQuery()
+                    .eq(CommonChapterSubscribe::getBookId, bookId)
+                    .eq(CommonChapterSubscribe::getUserId, member.getId())
+                    .select(CommonChapterSubscribe::getChapterId)
+                    .list()
+                    .stream().map(n -> n.getChapterId())
+                    .collect(Collectors.toList());
+
+            for (CommonBookNovel record : commonBooks.getRecords()) {
+                record.setPay(chapterIds.contains(record.getId()));
             }
 
         }
-        return Result.OK("目录列表",commonBooks);
+
+        return Result.OK("目录列表", commonBooks);
     }
 
     // 根据目录查询章节小说信息明细

module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java

@@ -30,13 +30,14 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService {
     }
 
     @Override
-    public Result<?> getMyMoneyLogPage(String token,Integer  status, PageBean pageBean) {
+    public Result<?> getMyMoneyLogPage(String token, Integer type, Integer status, PageBean pageBean) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<CommonMoneyLog> page = new Page<CommonMoneyLog>(pageBean.getPageNo(), pageBean.getPageSize());
         IPage<CommonMoneyLog> pageList = commonMoneyLogService
                 .lambdaQuery()
                 .eq(CommonMoneyLog::getUserId,hanHaiMember.getId())
                 .eq(status!=null,CommonMoneyLog::getState,status)
+                .eq(type!=null,CommonMoneyLog::getType,type)
                 .orderByDesc(CommonMoneyLog::getCreateTime)
                 .page(page);
         return Result.OK("我的流水信息",pageList);

module-common/src/main/java/org/jeecg/api/service/impl/AppletMyBookServiceImpl.java

@@ -86,34 +86,25 @@ public class AppletMyBookServiceImpl implements AppletMyBookService {
         Page<CommonBookNovel> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
         IPage<CommonBookNovel> commonBookNovels = commonBookNovelService
                 .lambdaQuery()
+                .select(
+                        CommonBookNovel::getId,
+                        CommonBookNovel::getSort,
+                        CommonBookNovel::getTitle,
+                        CommonBookNovel::getBookId,
+                        CommonBookNovel::getStatus,
+                        CommonBookNovel::getCreateTime,
+                        CommonBookNovel::getUpdateTime,
+                        CommonBookNovel::getUpdateBy,
+                        CommonBookNovel::getCreateBy,
+                        CommonBookNovel::getUserId,
+                        CommonBookNovel::getIsPay,
+                        CommonBookNovel::getNum
+                )
                 .eq(CommonBookNovel::getBookId,bookId)
-                .eq(CommonBookNovel::getStatus,status)
+                .eq(status != null, CommonBookNovel::getStatus, status)
+                .orderBy(true, reverse == 0, CommonBookNovel::getSort, CommonBookNovel::getCreateTime)
                 .page(page);
-        if(reverse == 0){
-            commonBookNovels = commonBookNovelService
-                    .lambdaQuery()
-                    .select(
-                            CommonBookNovel::getId,
-                            CommonBookNovel::getBookId,
-                            CommonBookNovel::getTitle,
-                            CommonBookNovel::getSort,
-                            CommonBookNovel::getStatus,
-                            CommonBookNovel::getCreateTime,
-                            CommonBookNovel::getIsPay
-
-                    )
-                    .eq(CommonBookNovel::getBookId,bookId)
-                    .eq(CommonBookNovel::getStatus,status)
-                    .orderByAsc(CommonBookNovel::getCreateTime)
-                    .page(page);
-        }else{
-            commonBookNovels = commonBookNovelService
-                    .lambdaQuery()
-                    .eq(CommonBookNovel::getBookId,bookId)
-                    .eq(CommonBookNovel::getStatus,status)
-                    .orderByDesc(CommonBookNovel::getCreateTime)
-                    .page(page);
-        }
+
         return Result.OK("我的小说章节列表",commonBookNovels);
     }
 
@@ -134,12 +125,6 @@ public class AppletMyBookServiceImpl implements AppletMyBookService {
     }
 
 
-
-
-
-
-
-
     //增加或者修改作品章节
     @Override
     public Result<?> saveOrUpdateShopNovel(String token, CommonBookNovel commonBookNovel){
@@ -153,7 +138,7 @@ public class AppletMyBookServiceImpl implements AppletMyBookService {
                 .eq(CommonShop::getId,commonBookNovel.getBookId())
                 .eq(CommonShop::getUserId,hanHaiMember.getId())
                 .one();
-        if(commonShop==null){
+        if(commonShop == null){
             return Result.error("书籍不存在或者该书籍不是您的作品无法更新");
         }
         if(commonBookNovel.getStatus() == null){

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -11,6 +11,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.CommonChapterSubscribe.entity.CommonChapterSubscribe;
 import org.jeecg.modules.CommonChapterSubscribe.service.ICommonChapterSubscribeService;
+import org.jeecg.modules.CommonOrder.entity.CommonOrder;
+import org.jeecg.modules.CommonOrder.service.ICommonOrderService;
 import org.jeecg.modules.GiveGifts.entity.GiveGifts;
 import org.jeecg.modules.GiveGifts.service.IGiveGiftsService;
 import org.jeecg.modules.commonBookNovel.entity.CommonBookNovel;
@@ -41,6 +43,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
 
+import static org.jeecg.modules.online.auth.b.a.c;
 import static org.jeecg.modules.online.auth.b.a.i;
 
 @Service
@@ -82,6 +85,10 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     @Autowired
     private ICommonChapterSubscribeService commonChapterSubscribeService;
 
+    @Autowired
+    private ICommonOrderService commonOrderService;
+
+
     //查询互动打赏礼物信息列表
     @Override
     public Result<?> getInteractionGiftList(PageBean pageBean) {
@@ -153,18 +160,30 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         }
 
 
+        CommonOrder order = CommonOrder.builder()
+                .num(commonPackage.getNum().intValue())
+                .giveNum(commonPackage.getGiveNum().intValue())
+                .packageId(commonPackage.getId())
+                .price(commonPackage.getMoney())
+                .userId(member.getId())
+                .title(commonPackage.getTitle())
+                .status("0")
+                .build();
+
+        commonOrderService.save(order);
+
         //吊起微信支付
-        int i = commonPackage.getMoney().multiply(new BigDecimal(100)).intValue();
+        int i = order.getPrice().multiply(new BigDecimal(100)).intValue();
         Object appOrder = mpWxPayService.createOrder(
-                "测试支付" ,
+                commonPackage.getTitle(),
                 "127.0.0.1",
-                System.currentTimeMillis()+"",
+                commonPackage.getId(),
                 i,
-                System.currentTimeMillis()+"",
+                order.getId(),
                 member.getAppletOpenid(),
                 "{}");
 
-        return Result.OK("支付成功",appOrder);
+        return Result.OK("支付成功", appOrder);
     }
 
 
@@ -236,6 +255,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                 .money(new BigDecimal(gift.getIntegerPrice() * num))
                 .type(1)//支付豆豆
                 .state(0)
+                .userId(member.getId())
                 .build());
 
         // TODO 这里需要给作者分钱
@@ -302,6 +322,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                     .money(new BigDecimal(i))
                     .type(1)//支付豆豆
                     .state(0)
+                    .userId(member.getId())
                     .build());
 
             // TODO 这里需要给作者分钱

module-common/src/main/java/org/jeecg/modules/CommonOrder/controller/CommonOrderController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.CommonOrder.controller;
+
+import java.util.Arrays;
+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.util.oConvertUtils;
+import org.jeecg.modules.CommonOrder.entity.CommonOrder;
+import org.jeecg.modules.CommonOrder.service.ICommonOrderService;
+
+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.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-06-23
+ * @Version: V1.0
+ */
+@Api(tags="订单信息表")
+@RestController
+@RequestMapping("/CommonOrder/commonOrder")
+@Slf4j
+public class CommonOrderController extends JeecgController<CommonOrder, ICommonOrderService> {
+	@Autowired
+	private ICommonOrderService commonOrderService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonOrder
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "订单信息表-分页列表查询")
+	@ApiOperation(value="订单信息表-分页列表查询", notes="订单信息表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonOrder>> queryPageList(CommonOrder commonOrder,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonOrder> queryWrapper = QueryGenerator.initQueryWrapper(commonOrder, req.getParameterMap());
+		Page<CommonOrder> page = new Page<CommonOrder>(pageNo, pageSize);
+		IPage<CommonOrder> pageList = commonOrderService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonOrder
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-添加")
+	@ApiOperation(value="订单信息表-添加", notes="订单信息表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonOrder commonOrder) {
+		commonOrderService.save(commonOrder);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonOrder
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-编辑")
+	@ApiOperation(value="订单信息表-编辑", notes="订单信息表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonOrder commonOrder) {
+		commonOrderService.updateById(commonOrder);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-通过id删除")
+	@ApiOperation(value="订单信息表-通过id删除", notes="订单信息表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		commonOrderService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "订单信息表-批量删除")
+	@ApiOperation(value="订单信息表-批量删除", notes="订单信息表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.commonOrderService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "订单信息表-通过id查询")
+	@ApiOperation(value="订单信息表-通过id查询", notes="订单信息表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CommonOrder> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonOrder commonOrder = commonOrderService.getById(id);
+		if(commonOrder==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonOrder);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonOrder
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonOrder commonOrder) {
+        return super.exportXls(request, commonOrder, CommonOrder.class, "订单信息表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CommonOrder.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/CommonOrder/entity/CommonOrder.java

@@ -0,0 +1,82 @@
+package org.jeecg.modules.CommonOrder.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 lombok.*;
+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.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-06-23
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_order")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_order对象", description="订单信息表")
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CommonOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**订单状态*/
+	@Excel(name = "订单状态", width = 15, dicCode = "order_state")
+	@Dict(dicCode = "order_state")
+    @ApiModelProperty(value = "订单状态")
+    private java.lang.String status;
+	/**下单用户*/
+	@Excel(name = "下单用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
+    @ApiModelProperty(value = "下单用户")
+    private java.lang.String userId;
+	/**订单标题*/
+	@Excel(name = "订单标题", width = 15)
+    @ApiModelProperty(value = "订单标题")
+    private java.lang.String title;
+	/**套餐*/
+	@Excel(name = "套餐", width = 15)
+    @ApiModelProperty(value = "套餐")
+    private java.lang.String packageId;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private java.math.BigDecimal price;
+	/**豆豆*/
+	@Excel(name = "豆豆", width = 15)
+    @ApiModelProperty(value = "豆豆")
+    private java.lang.Integer num;
+	/**赠送的豆豆*/
+	@Excel(name = "赠送的豆豆", width = 15)
+    @ApiModelProperty(value = "赠送的豆豆")
+    private java.lang.Integer giveNum;
+}

module-common/src/main/java/org/jeecg/modules/CommonOrder/mapper/CommonOrderMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.CommonOrder.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.CommonOrder.entity.CommonOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-06-23
+ * @Version: V1.0
+ */
+public interface CommonOrderMapper extends BaseMapper<CommonOrder> {
+
+}

module-common/src/main/java/org/jeecg/modules/CommonOrder/mapper/xml/CommonOrderMapper.xml

@@ -0,0 +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.CommonOrder.mapper.CommonOrderMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/CommonOrder/service/ICommonOrderService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.CommonOrder.service;
+
+import org.jeecg.modules.CommonOrder.entity.CommonOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-06-23
+ * @Version: V1.0
+ */
+public interface ICommonOrderService extends IService<CommonOrder> {
+
+}

module-common/src/main/java/org/jeecg/modules/CommonOrder/service/impl/CommonOrderServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.CommonOrder.service.impl;
+
+import org.jeecg.modules.CommonOrder.entity.CommonOrder;
+import org.jeecg.modules.CommonOrder.mapper.CommonOrderMapper;
+import org.jeecg.modules.CommonOrder.service.ICommonOrderService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 订单信息表
+ * @Author: jeecg-boot
+ * @Date:   2025-06-23
+ * @Version: V1.0
+ */
+@Service
+public class CommonOrderServiceImpl extends ServiceImpl<CommonOrderMapper, CommonOrder> implements ICommonOrderService {
+
+}

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue/CommonOrderList.vue

@@ -0,0 +1,241 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="订单状态">
+              <j-dict-select-tag placeholder="请选择订单状态" v-model="queryParam.status" dictCode="order_state"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="下单用户">
+              <j-search-select-tag placeholder="请选择下单用户" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="套餐">
+                <a-input placeholder="请输入套餐" v-model="queryParam.packageId"></a-input>
+              </a-form-item>
+            </a-col>
+          </template>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('订单信息表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <common-order-modal ref="modalForm" @ok="modalFormOk"></common-order-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonOrderModal from './modules/CommonOrderModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonOrderList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonOrderModal
+    },
+    data () {
+      return {
+        description: '订单信息表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'订单状态',
+            align:"center",
+            dataIndex: 'status_dictText'
+          },
+          {
+            title:'下单用户',
+            align:"center",
+            dataIndex: 'userId_dictText'
+          },
+          {
+            title:'订单标题',
+            align:"center",
+            dataIndex: 'title'
+          },
+          {
+            title:'套餐',
+            align:"center",
+            dataIndex: 'packageId'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'豆豆',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'赠送的豆豆',
+            align:"center",
+            dataIndex: 'giveNum'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/CommonOrder/commonOrder/list",
+          delete: "/CommonOrder/commonOrder/delete",
+          deleteBatch: "/CommonOrder/commonOrder/deleteBatch",
+          exportXlsUrl: "/CommonOrder/commonOrder/exportXls",
+          importExcelUrl: "CommonOrder/commonOrder/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
+        fieldList.push({type:'string',value:'status',text:'订单状态',dictCode:'order_state'})
+        fieldList.push({type:'sel_search',value:'userId',text:'下单用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
+        fieldList.push({type:'string',value:'title',text:'订单标题',dictCode:''})
+        fieldList.push({type:'string',value:'packageId',text:'套餐',dictCode:"common_package,title,id"})
+        fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'Text',value:'num',text:'豆豆',dictCode:''})
+        fieldList.push({type:'Text',value:'giveNum',text:'赠送的豆豆',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue/modules/CommonOrderForm.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="订单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <j-dict-select-tag type="list" v-model="model.status" dictCode="order_state" placeholder="请选择订单状态" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="下单用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
+              <j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="订单标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
+              <a-input v-model="model.title" placeholder="请输入订单标题"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="套餐" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="packageId">
+              <a-input v-model="model.packageId" placeholder="请输入套餐"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
+              <a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="豆豆" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
+              <a-input v-model="model.num" placeholder="请输入豆豆"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="赠送的豆豆" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveNum">
+              <a-input v-model="model.giveNum" placeholder="请输入赠送的豆豆"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonOrderForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/CommonOrder/commonOrder/add",
+          edit: "/CommonOrder/commonOrder/edit",
+          queryById: "/CommonOrder/commonOrder/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue/modules/CommonOrderModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonOrderForm from './CommonOrderForm'
+
+  export default {
+    name: 'CommonOrderModal',
+    components: {
+      CommonOrderForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue/modules/CommonOrderModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonOrderForm from './CommonOrderForm'
+  export default {
+    name: 'CommonOrderModal',
+    components: {
+      CommonOrderForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue3/CommonOrder.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/CommonOrder/commonOrder/list',
+  save='/CommonOrder/commonOrder/add',
+  edit='/CommonOrder/commonOrder/edit',
+  deleteOne = '/CommonOrder/commonOrder/delete',
+  deleteBatch = '/CommonOrder/commonOrder/deleteBatch',
+  importExcel = '/CommonOrder/commonOrder/importExcel',
+  exportXls = '/CommonOrder/commonOrder/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue3/CommonOrder.data.ts

@@ -0,0 +1,118 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '创建日期',
+    align:"center",
+    dataIndex: 'createTime'
+   },
+   {
+    title: '订单状态',
+    align:"center",
+    dataIndex: 'status_dictText'
+   },
+   {
+    title: '下单用户',
+    align:"center",
+    dataIndex: 'userId_dictText'
+   },
+   {
+    title: '订单标题',
+    align:"center",
+    dataIndex: 'title'
+   },
+   {
+    title: '套餐',
+    align:"center",
+    dataIndex: 'packageId'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '豆豆',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '赠送的豆豆',
+    align:"center",
+    dataIndex: 'giveNum'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "订单状态",
+      field: "status",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"order_state"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "下单用户",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"han_hai_member,nick_name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "套餐",
+      field: "packageId",
+      component: 'Input',
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '订单状态',
+    field: 'status',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"order_state"
+     },
+  },
+  {
+    label: '下单用户',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"han_hai_member,nick_name,id"
+    },
+  },
+  {
+    label: '订单标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '套餐',
+    field: 'packageId',
+    component: 'Input',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '豆豆',
+    field: 'num',
+    component: 'Input',
+  },
+  {
+    label: '赠送的豆豆',
+    field: 'giveNum',
+    component: 'Input',
+  },
+];

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue3/CommonOrderList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CommonOrderModal @register="registerModal" @success="handleSuccess"></CommonOrderModal>
+  </div>
+</template>
+
+<script lang="ts" name="CommonOrder-commonOrder" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CommonOrderModal from './components/CommonOrderModal.vue'
+  import {columns, searchFormSchema} from './commonOrder.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonOrder.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '订单信息表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"订单信息表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/CommonOrder/vue3/components/CommonOrderModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../commonOrder.data';
+    import {saveOrUpdate} from '../commonOrder.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonBookNovel/entity/CommonBookNovel.java

@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -79,4 +80,7 @@ public class CommonBookNovel implements Serializable {
     @Excel(name = "排序", width = 15)
     @ApiModelProperty(value = "排序")
     private java.lang.Integer sort;
+
+    @TableField(exist = false)
+    private Boolean pay;
 }