代码修复提交

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

@@ -57,4 +57,13 @@ public class AppletLoginController {
     	return appletLoginService.updateUserInfo(token,userInfoReq);
     }
 
+
+    //pc端手机号码验证码登录
+    @ApiOperation(value="pc端手机号码验证码登录", notes="pc端手机号码验证码登录")
+    @GetMapping(value = "/phoneLogin")
+    public Result<Object> phoneLogin(String phone, String code){
+        return appletLoginService.phoneLogin(phone,code);
+    }
+
+
 }

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

@@ -45,10 +45,21 @@ public class AppletMyBookController {
     //获取我的小说章节列表带分页
     @ApiOperation(value="获取我的小说章节列表带分页", notes="获取我的小说章节列表带分页")
     @PostMapping(value = "/getMyShopNovelPage")
-    public Result<?> getMyShopNovelPage(@RequestHeader("X-Access-Token") String token,String bookId,Integer status,Integer reverse, PageBean pageBean){
+    public Result<?> getMyShopNovelPage(String token,String bookId,Integer status,Integer reverse, PageBean pageBean){
         return appletMyBookService.getMyShopNovelPage(token, bookId,status,reverse,pageBean);
     }
 
+    //查询我是否购买了这个章节
+    @ApiOperation(value="查询我是否购买了这个章节", notes="查询我是否购买了这个章节")
+    @GetMapping(value = "/getMyShopNovel")
+    public Result<?> getMyShopNovel(@RequestHeader("X-Access-Token") String token,String bookId,String novelId){
+        return appletMyBookService.getMyShopNovel(token,bookId,novelId);
+    }
+
+
+
+
+
 
     //增加或修改作品章节
     @ApiOperation(value="增加或修改作品章节", notes="增加或修改作品章节")

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

@@ -8,10 +8,7 @@ import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletOrderService;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags="我的-礼物订阅接口")
 @RestController
@@ -67,4 +64,40 @@ public class AppletOrderController {
     }
 
 
+
+    //创建支付套餐订单
+    @ApiOperation( value="创建支付套餐订单", notes="创建支付套餐订单")
+    @PostMapping("/createPayPackageOrder")
+    public Result<?> createPayPackageOrder(@RequestHeader("X-Access-Token") String token, String packageId) {
+        return appletOrderService.createPayPackageOrder(token, packageId);
+    }
+
+    //充值套餐列表
+    @ApiOperation( value="充值套餐列表", notes="充值套餐列表")
+    @GetMapping("/getPayPackageList")
+    public Result<?> getPayPackageList() {
+        return appletOrderService.getPayPackageList();
+    }
+
+
+    //根据书籍id，礼物id赠送礼物
+    @ApiOperation( value="根据书籍id，礼物id赠送礼物", notes="根据书籍id，礼物id赠送礼物")
+    @PostMapping("/giveGift")
+    public Result<?> giveGift(@RequestHeader("X-Access-Token") String token, String bookId, String giftId, Integer num) {
+        return appletOrderService.giveGift(token, bookId, giftId, num);
+    }
+
+
+    //c
+    @ApiOperation( value="购买章节", notes="购买章节")
+    @PostMapping("/buyNovel")
+    public Result<?> buyNovel(@RequestHeader("X-Access-Token") String token, String bookId, String novelId) {
+        return appletOrderService.buyNovel(token, bookId, novelId);
+    }
+
+
+
+
+
+
 }

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

@@ -32,4 +32,7 @@ public interface AppletLoginService {
     //修改用户信息
     Result<?> updateUserInfo(String token,UserInfoReq userInfoReq);
 
+
+    //pc端手机号码验证码登录
+    Result<Object> phoneLogin(String phone, String code);
 }

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

@@ -17,6 +17,10 @@ public interface AppletMyBookService {
     //获取我的小说章节列表带分页
     Result<?> getMyShopNovelPage(String token, String bookId,Integer status,Integer reverse, PageBean pageBean);
 
+    //查询我是否购买了这个章节
+    Result<?> getMyShopNovel(String token, String bookId, String novelId);
+
+
     //增加或修改我的小说章节
     Result<?> saveOrUpdateShopNovel(String token, CommonBookNovel commonBookNovel);
 

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

@@ -2,6 +2,7 @@ package org.jeecg.api.service;
 
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.common.api.vo.Result;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 public interface AppletOrderService {
 
@@ -29,4 +30,19 @@ public interface AppletOrderService {
     //支付成功支付回调
     Result<?> paySuccess(String orderId);
 
+
+
+    //创建支付套餐订单
+    Result<?> createPayPackageOrder(String token, String packageId);
+
+    //充值套餐列表
+    Result<?> getPayPackageList();
+
+
+    //根据书籍id，礼物id赠送礼物
+    Result<?> giveGift(String token, String bookId, String giftId, Integer num);
+
+
+    //购买章节
+    Result<?> buyNovel(String token, String bookId, String novelId);
 }

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

@@ -66,7 +66,7 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
                 .one();
 
         CommonBookAchievementLog one = commonBookAchievementLogService.lambdaQuery()
-                .eq(CommonBookAchievementLog::getUserId, commonShop.getUserId())
+                .eq(CommonBookAchievementLog::getUserId, member.getId())
                 .one();
         //如果对象不为空
 //        List<CommonBookAchievement> list =commonBookAchievementService.list();

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

@@ -38,6 +38,7 @@ import org.jeecg.modules.commonSignLog.service.ICommonSignLogService;
 import org.jeecg.modules.commonTask.service.ICommonTaskService;
 import org.jeecg.modules.commonTaskLog.service.ICommonTaskLogService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -50,6 +51,8 @@ import java.util.Map;
 @Service
 public class AppletIndexServiceImpl implements AppletIndexService {
 
+    @Autowired
+    private IHanHaiMemberService hanHaiMemberService;
     @Autowired
     private ICommonBannerService commonBannerService;
     @Autowired
@@ -127,6 +130,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                 .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);
         return Result.OK("首页精品推荐小说列表",commonBooks);
@@ -142,6 +146,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                 .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);
         return Result.OK("首页最新小说列表",commonBooks);
@@ -219,7 +224,24 @@ public class AppletIndexServiceImpl implements AppletIndexService {
         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);
@@ -263,6 +285,12 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                 .eq(CommonRanking::getBookId,bookId)
                 .orderByDesc(CommonRanking::getNum)
                 .page(page);
+        pageList.getRecords().forEach(item->{
+            item.setHanHaiMember(hanHaiMemberService.getById(item.getUserId()));
+            item.setCommonShop(commonShopService.getById(item.getBookId()));
+            item.setCommonBookAchievement(commonBookAchievementService.getById(item.getLevel()));
+        });
+
         return Result.OK("亲密度排行版",pageList);
     }
 

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

@@ -216,4 +216,27 @@ public class AppletLoginServiceImpl implements AppletLoginService {
     }
 
 
+    //pc端手机号码验证码登录
+    @Override
+    public Result<Object> phoneLogin(String phone, String code){
+        Result<Object> result = new Result<>();
+        Map<String, Object> map = new HashMap<>();
+        HanHaiMember member = memberService.lambdaQuery().eq(HanHaiMember::getPhone,phone).one();
+        // 判断用户是否存在
+        if (member == null) {
+            throw new JeecgBootException("电话号码不存在："+phone);
+        }
+        // 生成token返回给小程序端
+        String token = JwtUtil.sign(member.getAppletOpenid(), member.getAppletOpenid());
+        redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
+        // 设置超时时间
+        redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 100);
+        map.put("userInfo", member);
+        map.put("token", token);
+        //用户id做im账号
+        result.setResult(map);
+        result.setCode(200);
+        return result;
+    }
+
 }

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

@@ -74,7 +74,10 @@ public class AppletMyBookServiceImpl implements AppletMyBookService {
     //获取我的小说章节列表带分页
     @Override
     public Result<?> getMyShopNovelPage(String token, String bookId,Integer status,Integer reverse, PageBean pageBean){
-        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        if(StringUtils.isNotEmpty(token)){
+            HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        }
+
         Page<CommonBookNovel> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
         IPage<CommonBookNovel> commonBookNovels = commonBookNovelService
                 .lambdaQuery()
@@ -90,7 +93,8 @@ public class AppletMyBookServiceImpl implements AppletMyBookService {
                             CommonBookNovel::getTitle,
                             CommonBookNovel::getSort,
                             CommonBookNovel::getStatus,
-                            CommonBookNovel::getCreateTime
+                            CommonBookNovel::getCreateTime,
+                            CommonBookNovel::getIsPay
 
                     )
                     .eq(CommonBookNovel::getBookId,bookId)
@@ -110,7 +114,13 @@ public class AppletMyBookServiceImpl implements AppletMyBookService {
 
 
 
+    //查询我是否购买了这个章节
+    @Override
+    public Result<?> getMyShopNovel(String token, String bookId, String novelId){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
+        return Result.OK("您已订阅该章节",true);
+    }
 
 
 

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

@@ -2,6 +2,7 @@ package org.jeecg.api.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.AppletOrderService;
 import org.jeecg.common.api.vo.Result;
@@ -14,12 +15,17 @@ import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService;
 import org.jeecg.modules.commonMyBook.service.ICommonMyBookService;
 import org.jeecg.modules.commonMyGift.entity.CommonMyGift;
 import org.jeecg.modules.commonMyGift.service.ICommonMyGiftService;
+import org.jeecg.modules.commonPackage.entity.CommonPackage;
+import org.jeecg.modules.commonPackage.service.ICommonPackageService;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.pay.MpWxPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
 
 @Service
 public class AppletOrderServiceImpl implements AppletOrderService {
@@ -39,6 +45,11 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     private ICommonGiftBackService commonGiftBackService;
     @Autowired
     private ICommonGiftService commonGiftService;
+    //支付接口
+    @Autowired
+    private MpWxPayService mpWxPayService;
+    @Autowired
+    private ICommonPackageService commonPackageService;
 
     //查询互动打赏礼物信息列表
     @Override
@@ -95,4 +106,69 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     }
 
 
+
+    //创建支付套餐订单
+    @Override
+    public  Result<?> createPayPackageOrder(String token, String packageId){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //套餐标识不能为空
+        if(StringUtils.isEmpty(packageId)){
+            return Result.error("套餐标识不能为空");
+        }
+        //根据套餐标识查询套餐信息
+        CommonPackage commonPackage = commonPackageService.getById(packageId);
+        if(commonPackage==null){
+            return Result.error("套餐不存在");
+        }
+
+
+
+
+
+
+
+
+
+        BigDecimal totalPrice = new BigDecimal(0.01);
+        //吊起微信支付
+        String s = totalPrice.multiply(new BigDecimal(100)).toString();
+        int i1 = Double.valueOf(1).intValue();
+        Object appOrder = mpWxPayService.createOrder(
+                "测试支付" ,
+                "127.0.0.1",
+                System.currentTimeMillis()+"",
+                i1,
+                System.currentTimeMillis()+"",
+                member.getAppletOpenid(),
+                "{}");
+
+        return Result.OK("支付成功",appOrder);
+    }
+
+
+
+    //充值套餐列表
+    @Override
+    public  Result<?> getPayPackageList(){
+        List<CommonPackage> list = commonPackageService.lambdaQuery()
+                .orderByDesc(CommonPackage::getSort)
+                .list();
+        return Result.OK("充值套餐列表",list);
+    }
+
+
+    //根据书籍id，礼物id赠送礼物
+    @Override
+    public  Result<?> giveGift(String token, String bookId, String giftId, Integer num){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        return Result.OK("赠送礼物成功");
+    }
+
+
+    //购买章节
+    @Override
+    public Result<?> buyNovel(String token, String bookId, String novelId){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        return Result.OK("购买成功");
+    }
 }

module-common/src/main/java/org/jeecg/modules/commonPackage/controller/CommonPackageController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonPackage.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.commonPackage.entity.CommonPackage;
+import org.jeecg.modules.commonPackage.service.ICommonPackageService;
+
+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-08
+ * @Version: V1.0
+ */
+@Api(tags="充值套餐")
+@RestController
+@RequestMapping("/commonPackage/commonPackage")
+@Slf4j
+public class CommonPackageController extends JeecgController<CommonPackage, ICommonPackageService> {
+	@Autowired
+	private ICommonPackageService commonPackageService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonPackage
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "充值套餐-分页列表查询")
+	@ApiOperation(value="充值套餐-分页列表查询", notes="充值套餐-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonPackage>> queryPageList(CommonPackage commonPackage,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonPackage> queryWrapper = QueryGenerator.initQueryWrapper(commonPackage, req.getParameterMap());
+		Page<CommonPackage> page = new Page<CommonPackage>(pageNo, pageSize);
+		IPage<CommonPackage> pageList = commonPackageService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonPackage
+	 * @return
+	 */
+	@AutoLog(value = "充值套餐-添加")
+	@ApiOperation(value="充值套餐-添加", notes="充值套餐-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonPackage commonPackage) {
+		commonPackageService.save(commonPackage);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonPackage
+	 * @return
+	 */
+	@AutoLog(value = "充值套餐-编辑")
+	@ApiOperation(value="充值套餐-编辑", notes="充值套餐-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonPackage commonPackage) {
+		commonPackageService.updateById(commonPackage);
+		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) {
+		commonPackageService.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.commonPackageService.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<CommonPackage> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonPackage commonPackage = commonPackageService.getById(id);
+		if(commonPackage==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonPackage);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonPackage
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonPackage commonPackage) {
+        return super.exportXls(request, commonPackage, CommonPackage.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, CommonPackage.class);
+    }
+
+}

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

@@ -0,0 +1,70 @@
+package org.jeecg.modules.commonPackage.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.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.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 充值套餐
+ * @Author: jeecg-boot
+ * @Date:   2025-06-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_package")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_package对象", description="充值套餐")
+public class CommonPackage 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)
+    @ApiModelProperty(value = "标题")
+    private java.lang.String title;
+	/**金额*/
+	@Excel(name = "金额", width = 15)
+    @ApiModelProperty(value = "金额")
+    private java.math.BigDecimal money;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private java.math.BigDecimal num;
+	/**赠送数量*/
+	@Excel(name = "赠送数量", width = 15)
+    @ApiModelProperty(value = "赠送数量")
+    private java.math.BigDecimal giveNum;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @ApiModelProperty(value = "排序")
+    private java.lang.Integer sort;
+}

module-common/src/main/java/org/jeecg/modules/commonPackage/mapper/CommonPackageMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonPackage.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonPackage.entity.CommonPackage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 充值套餐
+ * @Author: jeecg-boot
+ * @Date:   2025-06-08
+ * @Version: V1.0
+ */
+public interface CommonPackageMapper extends BaseMapper<CommonPackage> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonPackage/mapper/xml/CommonPackageMapper.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.commonPackage.mapper.CommonPackageMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/commonPackage/service/ICommonPackageService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonPackage.service;
+
+import org.jeecg.modules.commonPackage.entity.CommonPackage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 充值套餐
+ * @Author: jeecg-boot
+ * @Date:   2025-06-08
+ * @Version: V1.0
+ */
+public interface ICommonPackageService extends IService<CommonPackage> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonPackage/service/impl/CommonPackageServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonPackage.service.impl;
+
+import org.jeecg.modules.commonPackage.entity.CommonPackage;
+import org.jeecg.modules.commonPackage.mapper.CommonPackageMapper;
+import org.jeecg.modules.commonPackage.service.ICommonPackageService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 充值套餐
+ * @Author: jeecg-boot
+ * @Date:   2025-06-08
+ * @Version: V1.0
+ */
+@Service
+public class CommonPackageServiceImpl extends ServiceImpl<CommonPackageMapper, CommonPackage> implements ICommonPackageService {
+
+}

module-common/src/main/java/org/jeecg/modules/commonPackage/vue/CommonPackageList.vue

@@ -0,0 +1,195 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </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-package-modal ref="modalForm" @ok="modalFormOk"></common-package-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonPackageModal from './modules/CommonPackageModal'
+
+  export default {
+    name: 'CommonPackageList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonPackageModal
+    },
+    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: 'title'
+          },
+          {
+            title:'金额',
+            align:"center",
+            dataIndex: 'money'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'赠送数量',
+            align:"center",
+            dataIndex: 'giveNum'
+          },
+          {
+            title:'排序',
+            align:"center",
+            dataIndex: 'sort'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonPackage/commonPackage/list",
+          delete: "/commonPackage/commonPackage/delete",
+          deleteBatch: "/commonPackage/commonPackage/deleteBatch",
+          exportXlsUrl: "/commonPackage/commonPackage/exportXls",
+          importExcelUrl: "commonPackage/commonPackage/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'num',text:'数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'giveNum',text:'赠送数量',dictCode:''})
+        fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/commonPackage/vue/modules/CommonPackageForm.vue

@@ -0,0 +1,124 @@
+<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="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="money">
+              <a-input-number v-model="model.money" 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-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="赠送数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveNum">
+              <a-input-number v-model="model.giveNum" placeholder="请输入赠送数量" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
+              <a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
+            </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: 'CommonPackageForm',
+    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: "/commonPackage/commonPackage/add",
+          edit: "/commonPackage/commonPackage/edit",
+          queryById: "/commonPackage/commonPackage/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/commonPackage/vue/modules/CommonPackageModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-package-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-package-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 CommonPackageForm from './CommonPackageForm'
+
+  export default {
+    name: 'CommonPackageModal',
+    components: {
+      CommonPackageForm
+    },
+    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/commonPackage/vue/modules/CommonPackageModal.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-package-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-package-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonPackageForm from './CommonPackageForm'
+  export default {
+    name: 'CommonPackageModal',
+    components: {
+      CommonPackageForm
+    },
+    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/commonPackage/vue3/CommonPackage.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonPackage/commonPackage/list',
+  save='/commonPackage/commonPackage/add',
+  edit='/commonPackage/commonPackage/edit',
+  deleteOne = '/commonPackage/commonPackage/delete',
+  deleteBatch = '/commonPackage/commonPackage/deleteBatch',
+  importExcel = '/commonPackage/commonPackage/importExcel',
+  exportXls = '/commonPackage/commonPackage/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/commonPackage/vue3/CommonPackage.data.ts

@@ -0,0 +1,63 @@
+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: 'title'
+   },
+   {
+    title: '金额',
+    align:"center",
+    dataIndex: 'money'
+   },
+   {
+    title: '数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '赠送数量',
+    align:"center",
+    dataIndex: 'giveNum'
+   },
+   {
+    title: '排序',
+    align:"center",
+    dataIndex: 'sort'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '标题',
+    field: 'title',
+    component: 'Input',
+  },
+  {
+    label: '金额',
+    field: 'money',
+    component: 'InputNumber',
+  },
+  {
+    label: '数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '赠送数量',
+    field: 'giveNum',
+    component: 'InputNumber',
+  },
+  {
+    label: '排序',
+    field: 'sort',
+    component: 'InputNumber',
+  },
+];

module-common/src/main/java/org/jeecg/modules/commonPackage/vue3/CommonPackageList.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>
+    <!-- 表单区域 -->
+    <CommonPackageModal @register="registerModal" @success="handleSuccess"></CommonPackageModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonPackage-commonPackage" 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 CommonPackageModal from './components/CommonPackageModal.vue'
+  import {columns, searchFormSchema} from './commonPackage.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonPackage.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/commonPackage/vue3/components/CommonPackageModal.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 '../commonPackage.data';
+    import {saveOrUpdate} from '../commonPackage.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/commonRanking/entity/CommonRanking.java

@@ -5,10 +5,14 @@ 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;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement;
+import org.jeecg.modules.commonShop.entity.CommonShop;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -70,4 +74,16 @@ public class CommonRanking implements Serializable {
 	@Excel(name = "图标", width = 15)
     @ApiModelProperty(value = "图标")
     private java.lang.String icon;
+
+
+    //用户对象
+    @TableField (exist = false)
+    private HanHaiMember hanHaiMember;
+    //书对象
+    @TableField (exist = false)
+    private CommonShop commonShop;
+    //等级对象
+    @TableField (exist = false)
+    private CommonBookAchievement commonBookAchievement;
+
 }

module-system/src/main/resources/pay_weixin.properties

@@ -1,6 +1,6 @@
 pay.mchId=1711831449
 pay.appId=wxd21ddb1fbf3f5150
-pay.mchKey=0fdb77429ffdf206c151af76a663
+pay.mchKey=0fdb77429ffdf206c151af76a663041c
 pay.keyPath=classpath:apiclient_cert.pem
 pay.notifyUrl=https://prod-api.budingxiaoshuo.com/novel-admin/order/payNotify
 pay.notifyUrlDev=https://prod-api.budingxiaoshuo.com/novel-admin/order/payNotify