处理成就等级逻辑

.gitignore

@@ -0,0 +1,2 @@
+target
+.idea

.idea/jarRepositories.xml

@@ -26,5 +26,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

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

@@ -38,8 +38,8 @@ public class AppletAchievementController {
 
 
 
-    //根据用户标识和书籍标识查询该用户的成就等级
-    @ApiOperation(value="根据用户标识和书籍标识查询该用户的成就等级", notes="根据用户标识和书籍标识查询该用户的成就等级")
+    //获取作者设置的成就等级对象
+    @ApiOperation(value="获取作者设置的成就等级对象", notes="获取作者设置的成就等级对象")
     @GetMapping(value = "/getAchievement")
     public Result<?> getAchievement(@RequestHeader("X-Access-Token")String token,String bookId){
         return appletAchievementService.getAchievement(token, bookId);
@@ -47,5 +47,14 @@ public class AppletAchievementController {
 
 
 
+    //根据用户标识和书籍标识查询该用户的成就等级
+    @ApiOperation(value="根据用户标识和书籍标识查询该用户的成就等级", notes="根据用户标识和书籍标识查询该用户的成就等级")
+    @GetMapping(value = "/getAchievementByBookId")
+    public Result<?> getAchievementByBookId(@RequestHeader("X-Access-Token")String token,String bookId){
+        return appletAchievementService.getAchievementByBookId(token, bookId);
+    }
+
+
+
 
 }

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

@@ -28,7 +28,7 @@ public class AppletBookController {
     //获取我阅读过的书籍列表带分页
     @ApiOperation(value="获取我阅读过的书籍列表带分页", notes="获取我阅读过的书籍列表带分页")
     @GetMapping(value = "/getReadBookPage")
-    public Result<?> getReadBookPage(@RequestHeader("X-Access-Token") String token, PageBean pageBean ){
+    public Result<?> getReadBookPage(@RequestHeader("X-Access-Token") String token, PageBean pageBean){
         return appletBookService.getReadBookPage(token,pageBean);
     }
 
@@ -48,12 +48,19 @@ public class AppletBookController {
 
 
     //增加我的书架阅读记录
-    @ApiOperation(value="增加我的书架阅读记录", notes="增加我的书架阅读记录")
+    @ApiOperation(value="增加我的书架记录", notes="增加我的书架阅读记录")
     @PostMapping(value = "/addReadBook")
     public Result<?> addReadBook(@RequestHeader("X-Access-Token") String token, CommonBook commonBook){
         return appletBookService.addReadBook(token, commonBook);
     }
 
+    //查询这本书是否加入书架
+    @ApiOperation(value="查询这本书是否加入书架", notes="查询这本书是否加入书架")
+    @GetMapping(value = "/isAddBook")
+    public Result<?> isAddBook(@RequestHeader(value = "X-Access-Token", required = false) String token, Long bookId){
+        return appletBookService.isAddBook(token, bookId);
+    }
+
     //移除我阅读过的书籍根据书籍标识
     @ApiOperation(value="移除我阅读过的书籍根据书籍标识", notes="移除我阅读过的书籍根据书籍标识")
     @GetMapping(value = "/removeReadBook")
@@ -69,4 +76,11 @@ public class AppletBookController {
         return appletBookService.batchRemoveReadBook(token,bookIds);
     }
 
+    //根据书籍id删除书架
+    @ApiOperation(value="根据书籍id删除书架", notes="根据书籍id删除书架")
+    @PostMapping(value = "/deleteBookshelfByBookId")
+    public Result<?> deleteBookshelfByBookId(@RequestHeader("X-Access-Token") String token, Long bookId){
+        return appletBookService.deleteBookshelfByBookId(token, bookId);
+    }
+
 }

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

@@ -10,10 +10,11 @@ public interface AppletAchievementService {
     Result<?> getAchievementList();
 
     // 设置读者成就等级名称
-    Result<?> setAchievementName(String token, CommonBookAchievementLog bookAchievementLog );
+    Result<?> setAchievementName(String token, CommonBookAchievementLog bookAchievementLog);
 
     // 根据用户标识和书籍标识查询该用户的成就等级
     Result<?> getAchievement(String token , String bookId);
 
 
+    Result<?> getAchievementByBookId(String token, String bookId);
 }

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

@@ -25,6 +25,7 @@ public interface AppletBookService {
     Result<?> batchRemoveReadBook(String token,String bookIds);
 
 
+    Result<?> isAddBook(String token, Long bookId);
 
-
+    Result<?> deleteBookshelfByBookId(String token, Long bookId);
 }

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

@@ -8,9 +8,12 @@ import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement;
 import org.jeecg.modules.commonBookAchievement.service.ICommonBookAchievementService;
 import org.jeecg.modules.commonBookAchievementLog.entity.CommonBookAchievementLog;
 import org.jeecg.modules.commonBookAchievementLog.service.ICommonBookAchievementLogService;
+import org.jeecg.modules.commonRanking.entity.CommonRanking;
+import org.jeecg.modules.commonRanking.service.ICommonRankingService;
 import org.jeecg.modules.commonShop.entity.CommonShop;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
 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;
 
@@ -30,6 +33,12 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
     @Autowired
     private ICommonShopService commonShopService;
 
+    @Autowired
+    private ICommonRankingService commonRankingService;
+
+    @Autowired
+    private IHanHaiMemberService hanHaiMemberService;
+
     // 获取读者成就列表
     @Override
     public Result<?> getAchievementList(){
@@ -56,14 +65,11 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
 
     }
 
-    // 根据用户标识和书籍标识查询该用户的成就等级
+    //
     @Override
     public Result<?> getAchievement(String token, String bookId){
         HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        //根据书籍标识获取当前作者
-        CommonShop commonShop = commonShopService.lambdaQuery()
-                .eq(CommonShop::getId, bookId)
-                .one();
+
 
         CommonBookAchievementLog one = commonBookAchievementLogService.lambdaQuery()
                 .eq(CommonBookAchievementLog::getUserId, member.getId())
@@ -87,4 +93,20 @@ public class AppletAchievementServiceImpl implements AppletAchievementService {
         return Result.OK("查询成功",one);
     }
 
+    @Override
+    public Result<?> getAchievementByBookId(String token, String bookId) {
+
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        CommonShop book = commonShopService.getById(bookId);
+
+        CommonRanking intimacyLevel = commonRankingService.getIntimacyLevel(member.getId(), bookId);
+
+        intimacyLevel.setHanHaiMember(hanHaiMemberService.getById(intimacyLevel.getUserId()));
+        intimacyLevel.setCommonShop(book);
+        intimacyLevel.setCommonBookAchievement(commonBookAchievementService.getLevelById(intimacyLevel.getLevel(), Long.valueOf(book.getUserId())));
+
+        return Result.OK(intimacyLevel);
+    }
+
 }

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

@@ -1,7 +1,9 @@
 package org.jeecg.api.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletBookService;
@@ -38,7 +40,6 @@ import java.util.Arrays;
 public class AppletBookServiceImpl implements AppletBookService {
 
 
-
     //权限
     @Resource
     private ShiroRealm shiroRealm;
@@ -103,8 +104,6 @@ public class AppletBookServiceImpl implements AppletBookService {
         if(one!=null){
             commonBook.setId(one.getId());
             commonBookService.updateById(commonBook);
-        }else{
-            commonBookService.save(commonBook);
         }
         return Result.OK("保存成功");
     }
@@ -114,6 +113,13 @@ public class AppletBookServiceImpl implements AppletBookService {
     public Result<?> addReadBook(String token, CommonBook commonBook) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         commonBook.setUserId(hanHaiMember.getId());
+
+        if (commonBookService.lambdaQuery()
+                .eq(CommonBook::getShopId, commonBook.getShopId())
+                .eq(CommonBook::getUserId, hanHaiMember.getId()).count() > 0){
+            return Result.OK("保存成功");
+        }
+
         commonBookService.save(commonBook);
         return Result.OK("保存成功");
     }
@@ -136,6 +142,27 @@ public class AppletBookServiceImpl implements AppletBookService {
         return Result.OK("移除成功");
     }
 
+    @Override
+    public Result<?> isAddBook(String token, Long bookId) {
+        if (StringUtils.isNoneBlank(token)){
+            HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+            Long count = commonBookService.lambdaQuery()
+                    .eq(CommonBook::getShopId, bookId)
+                    .eq(CommonBook::getUserId, hanHaiMember.getId()).count();
+            return Result.OK(count > 0);
+        }
+        return Result.OK(false);
+    }
+
+    @Override
+    public Result<?> deleteBookshelfByBookId(String token, Long bookId) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        boolean remove = commonBookService.remove(Wrappers.<CommonBook>lambdaQuery()
+                .eq(CommonBook::getShopId, bookId)
+                .eq(CommonBook::getUserId, hanHaiMember.getId()));
+        return Result.OK(remove);
+    }
 
 
 }

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

@@ -43,6 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -207,8 +208,14 @@ 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())){
+            return Result.error("票数不够");
+        }
         commonShop.setTuiNum(commonShop.getTuiNum()+Integer.parseInt(num));
         commonShopService.updateById(commonShop);
+
+        hanHaiMember.setMoney(hanHaiMember.getMoney().subtract(new BigDecimal(num)));
+        hanHaiMemberService.updateById(hanHaiMember);
         return Result.OK("投票成功");
     }
 
@@ -239,8 +246,6 @@ public class AppletIndexServiceImpl implements AppletIndexService {
                                 CommonBookNovel::getUserId,
                                 CommonBookNovel::getIsPay,
                                 CommonBookNovel::getNum
-
-
                         )
                         .eq(CommonBookNovel::getBookId,bookId)
                         .orderByAsc(CommonBookNovel::getSort)
@@ -281,14 +286,18 @@ public class AppletIndexServiceImpl implements AppletIndexService {
     @Override
     public Result<?> getIntimacyRankList(String bookId,PageBean pageBean){
         Page<CommonRanking> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
+
         IPage<CommonRanking> pageList = commonRankingService.lambdaQuery()
                 .eq(CommonRanking::getBookId,bookId)
                 .orderByDesc(CommonRanking::getNum)
                 .page(page);
+
+        CommonShop book = commonShopService.getById(bookId);
+
         pageList.getRecords().forEach(item->{
             item.setHanHaiMember(hanHaiMemberService.getById(item.getUserId()));
-            item.setCommonShop(commonShopService.getById(item.getBookId()));
-            item.setCommonBookAchievement(commonBookAchievementService.getById(item.getLevel()));
+            item.setCommonShop(book);
+            item.setCommonBookAchievement(commonBookAchievementService.getLevelById(item.getLevel(), Long.valueOf(book.getUserId())));
         });
 
         return Result.OK("亲密度排行版",pageList);

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

@@ -2,11 +2,14 @@ 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.ObjectUtils;
 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;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.GiveGifts.entity.GiveGifts;
+import org.jeecg.modules.GiveGifts.service.IGiveGiftsService;
 import org.jeecg.modules.commonBookNovel.service.ICommonBookNovelService;
 import org.jeecg.modules.commonGift.entity.CommonGift;
 import org.jeecg.modules.commonGift.service.ICommonGiftService;
@@ -17,8 +20,12 @@ 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.commonRanking.entity.CommonRanking;
+import org.jeecg.modules.commonRanking.service.ICommonRankingService;
+import org.jeecg.modules.commonShop.entity.CommonShop;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.jeecg.modules.pay.MpWxPayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +57,15 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     private MpWxPayService mpWxPayService;
     @Autowired
     private ICommonPackageService commonPackageService;
+    
+    @Autowired
+    private IHanHaiMemberService hanHaiMemberService;
+
+    @Autowired
+    private IGiveGiftsService giveGiftsService;
+
+    @Autowired
+    private ICommonRankingService commonRankingService;
 
     //查询互动打赏礼物信息列表
     @Override
@@ -161,6 +177,47 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     @Override
     public  Result<?> giveGift(String token, String bookId, String giftId, Integer num){
         HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        CommonGift gift = commonGiftService.getById(giftId);
+        CommonShop shop = commonShopService.getById(bookId);
+
+        if (ObjectUtils.isEmpty(gift)){
+            Result.error("礼物不存在");
+        }
+        if (ObjectUtils.isEmpty(shop)){
+            Result.error("书籍不存在");
+        }
+        HanHaiMember author = hanHaiMemberService.getById(shop.getUserId());
+
+        if (ObjectUtils.isEmpty(author)){
+            Result.error("作者不存在");
+        }
+
+        if (member.getIntegerPrice().intValue() < (gift.getIntegerPrice() * num)){
+            Result.error("豆豆不足");
+        }
+
+        // 消耗豆豆
+        member.setIntegerPrice(member.getIntegerPrice().subtract(new BigDecimal(gift.getIntegerPrice() * num)));
+        hanHaiMemberService.updateById(member);
+
+        // 添加送礼记录
+        GiveGifts build = GiveGifts.builder()
+                .authorId(author.getId())
+                .bookId(bookId)
+                .userId(member.getId())
+                .giftId(giftId)
+                .price(gift.getPrice())
+                .integerPrice(new BigDecimal(gift.getIntegerPrice()))
+                .intimacyValue(gift.getIntimacyValue())
+                .num(num)
+                .build();
+
+        giveGiftsService.save(build);
+
+        //增加亲密值
+        commonRankingService.addIntimacy(member.getId(), bookId, gift.getIntimacyValue() == null ? 0 : gift.getIntimacyValue().intValue());
+
         return Result.OK("赠送礼物成功");
     }
 

module-common/src/main/java/org/jeecg/modules/GiveGifts/controller/GiveGiftsController.java

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

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

@@ -0,0 +1,87 @@
+package org.jeecg.modules.GiveGifts.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-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("give_gifts")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="give_gifts对象", description="送礼记录")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class GiveGifts 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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**用户*/
+	@Excel(name = "用户", width = 15)
+    @ApiModelProperty(value = "用户")
+    private java.lang.String userId;
+	/**书籍*/
+	@Excel(name = "书籍", width = 15)
+    @ApiModelProperty(value = "书籍")
+    private java.lang.String bookId;
+	/**作者*/
+	@Excel(name = "作者", width = 15)
+    @ApiModelProperty(value = "作者")
+    private java.lang.String authorId;
+	/**礼物*/
+	@Excel(name = "礼物", width = 15)
+    @ApiModelProperty(value = "礼物")
+    private java.lang.String giftId;
+	/**数量*/
+	@Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private java.lang.Integer num;
+	/**价格*/
+	@Excel(name = "价格", width = 15)
+    @ApiModelProperty(value = "价格")
+    private BigDecimal price;
+	/**亲密值*/
+	@Excel(name = "亲密值", width = 15)
+    @ApiModelProperty(value = "亲密值")
+    private BigDecimal intimacyValue;
+
+    @Excel(name = "豆豆", width = 15)
+    @ApiModelProperty(value = "豆豆")
+    private BigDecimal integerPrice;
+}

module-common/src/main/java/org/jeecg/modules/GiveGifts/mapper/GiveGiftsMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.GiveGifts.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.GiveGifts.entity.GiveGifts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 送礼记录
+ * @Author: jeecg-boot
+ * @Date:   2025-06-21
+ * @Version: V1.0
+ */
+public interface GiveGiftsMapper extends BaseMapper<GiveGifts> {
+
+}

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

module-common/src/main/java/org/jeecg/modules/GiveGifts/service/IGiveGiftsService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.GiveGifts.service;
+
+import org.jeecg.modules.GiveGifts.entity.GiveGifts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 送礼记录
+ * @Author: jeecg-boot
+ * @Date:   2025-06-21
+ * @Version: V1.0
+ */
+public interface IGiveGiftsService extends IService<GiveGifts> {
+
+}

module-common/src/main/java/org/jeecg/modules/GiveGifts/service/impl/GiveGiftsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.GiveGifts.service.impl;
+
+import org.jeecg.modules.GiveGifts.entity.GiveGifts;
+import org.jeecg.modules.GiveGifts.mapper.GiveGiftsMapper;
+import org.jeecg.modules.GiveGifts.service.IGiveGiftsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 送礼记录
+ * @Author: jeecg-boot
+ * @Date:   2025-06-21
+ * @Version: V1.0
+ */
+@Service
+public class GiveGiftsServiceImpl extends ServiceImpl<GiveGiftsMapper, GiveGifts> implements IGiveGiftsService {
+
+}

module-common/src/main/java/org/jeecg/modules/GiveGifts/vue/GiveGiftsList.vue

@@ -0,0 +1,239 @@
+<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-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict=",,"/>
+            </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.bookId" dict=",,"/>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="作者">
+                <j-search-select-tag placeholder="请选择作者" v-model="queryParam.authorId" dict=",,"/>
+              </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.giftId" dict=",,"/>
+              </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>
+
+    <give-gifts-modal ref="modalForm" @ok="modalFormOk"></give-gifts-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import GiveGiftsModal from './modules/GiveGiftsModal'
+
+  export default {
+    name: 'GiveGiftsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      GiveGiftsModal
+    },
+    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: 'userId_dictText'
+          },
+          {
+            title:'书籍',
+            align:"center",
+            dataIndex: 'bookId_dictText'
+          },
+          {
+            title:'作者',
+            align:"center",
+            dataIndex: 'authorId_dictText'
+          },
+          {
+            title:'礼物',
+            align:"center",
+            dataIndex: 'giftId_dictText'
+          },
+          {
+            title:'数量',
+            align:"center",
+            dataIndex: 'num'
+          },
+          {
+            title:'价格',
+            align:"center",
+            dataIndex: 'price'
+          },
+          {
+            title:'亲密值',
+            align:"center",
+            dataIndex: 'intimacyValue'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/GiveGifts/giveGifts/list",
+          delete: "/GiveGifts/giveGifts/delete",
+          deleteBatch: "/GiveGifts/giveGifts/deleteBatch",
+          exportXlsUrl: "/GiveGifts/giveGifts/exportXls",
+          importExcelUrl: "GiveGifts/giveGifts/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'sel_search',value:'bookId',text:'书籍',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'sel_search',value:'authorId',text:'作者',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'sel_search',value:'giftId',text:'礼物',dictTable:"", dictText:'', dictCode:''})
+        fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
+        fieldList.push({type:'double',value:'price',text:'价格',dictCode:''})
+        fieldList.push({type:'int',value:'intimacyValue',text:'亲密值',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/GiveGifts/vue/modules/GiveGiftsForm.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="userId">
+              <j-search-select-tag v-model="model.userId" dict=""  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="书籍" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bookId">
+              <j-search-select-tag v-model="model.bookId" dict=""  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="作者" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="authorId">
+              <j-search-select-tag v-model="model.authorId" dict=""  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="礼物" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giftId">
+              <j-search-select-tag v-model="model.giftId" dict=""  />
+            </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="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="intimacyValue">
+              <a-input-number v-model="model.intimacyValue" 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: 'GiveGiftsForm',
+    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: "/GiveGifts/giveGifts/add",
+          edit: "/GiveGifts/giveGifts/edit",
+          queryById: "/GiveGifts/giveGifts/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/GiveGifts/vue/modules/GiveGiftsModal.Style#Drawer.vue

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

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

@@ -0,0 +1,131 @@
+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: 'userId_dictText'
+   },
+   {
+    title: '书籍',
+    align:"center",
+    dataIndex: 'bookId_dictText'
+   },
+   {
+    title: '作者',
+    align:"center",
+    dataIndex: 'authorId_dictText'
+   },
+   {
+    title: '礼物',
+    align:"center",
+    dataIndex: 'giftId_dictText'
+   },
+   {
+    title: '数量',
+    align:"center",
+    dataIndex: 'num'
+   },
+   {
+    title: '价格',
+    align:"center",
+    dataIndex: 'price'
+   },
+   {
+    title: '亲密值',
+    align:"center",
+    dataIndex: 'intimacyValue'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "用户",
+      field: "userId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:",,"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "书籍",
+      field: "bookId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:",,"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "作者",
+      field: "authorId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:",,"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "礼物",
+      field: "giftId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:",,"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '用户',
+    field: 'userId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:""
+    },
+  },
+  {
+    label: '书籍',
+    field: 'bookId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:""
+    },
+  },
+  {
+    label: '作者',
+    field: 'authorId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:""
+    },
+  },
+  {
+    label: '礼物',
+    field: 'giftId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:""
+    },
+  },
+  {
+    label: '数量',
+    field: 'num',
+    component: 'InputNumber',
+  },
+  {
+    label: '价格',
+    field: 'price',
+    component: 'InputNumber',
+  },
+  {
+    label: '亲密值',
+    field: 'intimacyValue',
+    component: 'InputNumber',
+  },
+];

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

@@ -57,6 +57,15 @@ public class CommonBookAchievement implements Serializable {
     @ApiModelProperty(value = "成就标题")
     private java.lang.String title;
 
+    /**等级序号*/
+    @Excel(name = "等级序号", width = 15)
+    @ApiModelProperty(value = "等级序号")
+    private java.lang.Integer num;
+
+    /**亲密值达成条件*/
+    @Excel(name = "亲密值达成条件", width = 15)
+    @ApiModelProperty(value = "亲密值达成条件")
+    private Integer IntimacyValueCondition;
 
 
     @TableField (exist = false)
@@ -66,5 +75,5 @@ public class CommonBookAchievement implements Serializable {
     private java.lang.String oldName;
 
     @TableField (exist = false)
-    private java.lang.Integer num;
+    private java.lang.Integer IntimacyValue;
 }

module-common/src/main/java/org/jeecg/modules/commonBookAchievement/service/ICommonBookAchievementService.java

@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICommonBookAchievementService extends IService<CommonBookAchievement> {
 
+    /**
+     * 根据作者id和成就id
+     * @param id
+     * @param authorId
+     * @return
+     */
+    CommonBookAchievement getLevelById(String id, Long authorId);
 }

module-common/src/main/java/org/jeecg/modules/commonBookAchievement/service/impl/CommonBookAchievementServiceImpl.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.commonBookAchievement.service.impl;
 
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement;
 import org.jeecg.modules.commonBookAchievement.mapper.CommonBookAchievementMapper;
 import org.jeecg.modules.commonBookAchievement.service.ICommonBookAchievementService;
+import org.jeecg.modules.commonBookAchievementLog.entity.CommonBookAchievementLog;
+import org.jeecg.modules.commonBookAchievementLog.service.ICommonBookAchievementLogService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +20,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CommonBookAchievementServiceImpl extends ServiceImpl<CommonBookAchievementMapper, CommonBookAchievement> implements ICommonBookAchievementService {
 
+    @Autowired
+    private ICommonBookAchievementLogService commonBookAchievementLogService;
+
+    /**
+     * 获取该书本等级
+     * @param id
+     * @param authorId 作者id
+     * @return
+     */
+    @Override
+    public CommonBookAchievement getLevelById(String id, Long authorId) {
+
+        CommonBookAchievement byId = getById(id);
+
+        if (ObjectUtils.isEmpty(byId)){
+            throw new RuntimeException("成就等级不存在");
+        }
+
+        commonBookAchievementLogService.setAchievementNameAuthorId(byId, authorId);
+
+        return byId;
+    }
 }

module-common/src/main/java/org/jeecg/modules/commonBookAchievementLog/service/ICommonBookAchievementLogService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.commonBookAchievementLog.service;
 
+import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement;
 import org.jeecg.modules.commonBookAchievementLog.entity.CommonBookAchievementLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -11,4 +12,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICommonBookAchievementLogService extends IService<CommonBookAchievementLog> {
 
+    /**
+     * 根据作者名称给成绩等级设置
+     * @param achievement
+     * @param authorId
+     */
+    void setAchievementNameAuthorId(CommonBookAchievement achievement, Long authorId);
 }

module-common/src/main/java/org/jeecg/modules/commonBookAchievementLog/service/impl/CommonBookAchievementLogServiceImpl.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.commonBookAchievementLog.service.impl;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement;
 import org.jeecg.modules.commonBookAchievementLog.entity.CommonBookAchievementLog;
 import org.jeecg.modules.commonBookAchievementLog.mapper.CommonBookAchievementLogMapper;
 import org.jeecg.modules.commonBookAchievementLog.service.ICommonBookAchievementLogService;
@@ -16,4 +18,23 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CommonBookAchievementLogServiceImpl extends ServiceImpl<CommonBookAchievementLogMapper, CommonBookAchievementLog> implements ICommonBookAchievementLogService {
 
+    @Override
+    public void setAchievementNameAuthorId(CommonBookAchievement byId, Long authorId) {
+        CommonBookAchievementLog one = lambdaQuery()
+                .eq(CommonBookAchievementLog::getUserId, authorId)
+                .one();
+
+        if (ObjectUtils.isNotEmpty(one) && ObjectUtils.isNotEmpty(byId)){
+            if (byId.getNum() == 0){
+                byId.setName(one.getOneName());
+                byId.setOldName(one.getOneOldName());
+            }else if ((byId.getNum() == 1)){
+                byId.setName(one.getTwoName());
+                byId.setOldName(one.getTwoOldName());
+            }else if ((byId.getNum() == 2)){
+                byId.setName(one.getThreeName());
+                byId.setOldName(one.getThreeOldName());
+            }
+        }
+    }
 }

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

@@ -63,4 +63,8 @@ public class CommonGift implements Serializable {
 	@Excel(name = "名称", width = 15)
     @ApiModelProperty(value = "名称")
     private java.lang.String title;
+    /**亲密值*/
+    @Excel(name = "亲密值", width = 15)
+    @ApiModelProperty(value = "亲密值")
+    private BigDecimal intimacyValue;
 }

module-common/src/main/java/org/jeecg/modules/commonMyGift/controller/CommonMyGiftController.java

@@ -47,6 +47,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @RequestMapping("/commonMyGift/commonMyGift")
 @Slf4j
 public class CommonMyGiftController extends JeecgController<CommonMyGift, ICommonMyGiftService> {
+
 	@Autowired
 	private ICommonMyGiftService commonMyGiftService;
 	

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

@@ -64,7 +64,7 @@ public class CommonRanking implements Serializable {
 	/**亲密度*/
 	@Excel(name = "亲密度", width = 15)
     @ApiModelProperty(value = "亲密度")
-    private java.lang.String num;
+    private java.lang.Integer num;
 	/**等级*/
 	@Excel(name = "等级", width = 15, dictTable = "common_book_achievement", dicText = "title", dicCode = "id")
 	@Dict(dictTable = "common_book_achievement", dicText = "title", dicCode = "id")

module-common/src/main/java/org/jeecg/modules/commonRanking/service/ICommonRankingService.java

@@ -11,4 +11,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICommonRankingService extends IService<CommonRanking> {
 
+
+    /**
+     * 增加亲密值
+     * @param userId 用户id
+     * @param bookId 书籍id
+     * @param intimacyValue 亲密值
+     */
+    void addIntimacy(String userId, String bookId, Integer intimacyValue);
+
+    /**
+     * 获取用户在该书的亲密等级
+     * @param userId 用户id
+     * @param bookId 书籍id
+     */
+    CommonRanking getIntimacyLevel(String userId, String bookId);
 }

module-common/src/main/java/org/jeecg/modules/commonRanking/service/impl/CommonRankingServiceImpl.java

@@ -1,12 +1,18 @@
 package org.jeecg.modules.commonRanking.service.impl;
 
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.modules.commonBookAchievement.entity.CommonBookAchievement;
+import org.jeecg.modules.commonBookAchievement.service.ICommonBookAchievementService;
 import org.jeecg.modules.commonRanking.entity.CommonRanking;
 import org.jeecg.modules.commonRanking.mapper.CommonRankingMapper;
 import org.jeecg.modules.commonRanking.service.ICommonRankingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 读者亲密度排行版
  * @Author: jeecg-boot
@@ -16,4 +22,73 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CommonRankingServiceImpl extends ServiceImpl<CommonRankingMapper, CommonRanking> implements ICommonRankingService {
 
+    @Autowired
+    private ICommonBookAchievementService commonBookAchievementService;
+
+    /**
+     * 增加亲密值
+     * @param userId 用户id
+     * @param bookId 书籍id
+     * @param intimacyValue 亲密值
+     */
+    @Override
+    public void addIntimacy(String userId, String bookId, Integer intimacyValue) {
+
+        CommonRanking one = lambdaQuery()
+                .eq(CommonRanking::getUserId, userId)
+                .eq(CommonRanking::getBookId, bookId).one();
+
+        if (ObjectUtils.isEmpty(one)){
+            one = getIntimacyLevel(userId, bookId);
+        }
+
+        one.setNum(one.getNum() + intimacyValue);
+        calculateIntimacyLevel(one);
+        updateById(one);
+
+    }
+
+    /**
+     * 计算亲密值等级
+     */
+    public void calculateIntimacyLevel(CommonRanking one){
+        List<CommonBookAchievement> list = commonBookAchievementService.lambdaQuery()
+                .orderByAsc(CommonBookAchievement::getNum)
+                .list();
+
+        if (list.size() == 0){
+            throw new RuntimeException("成就等级为空");
+        }
+
+        // TODO 这里需要计算等级
+
+        CommonBookAchievement achievement = list.get(0);
+        one.setLevel(achievement.getId());
+        one.setIcon(achievement.getImage());
+
+    }
+
+
+    /**
+     * 获取用户在该书的亲密等级
+     * @param userId 用户id
+     * @param bookId 书籍id
+     */
+    public CommonRanking getIntimacyLevel(String userId, String bookId){
+
+        CommonRanking one = lambdaQuery()
+                .eq(CommonRanking::getUserId, userId)
+                .eq(CommonRanking::getBookId, bookId).one();
+
+        if (ObjectUtils.isEmpty(one)){
+            one = new CommonRanking();
+            one.setNum(0);//亲密值
+            one.setUserId(userId);
+            one.setBookId(bookId);
+            calculateIntimacyLevel(one);
+            save(one);
+        }
+
+        return one;
+    }
 }