From 9badb8999473a08c6852320ebb9fb80e724eccab Mon Sep 17 00:00:00 2001 From: "925116093-qq.com" <925116093@qq.com> Date: Thu, 3 Jul 2025 17:43:38 +0800 Subject: [PATCH] 202507031743 --- .../system/controller/AppletController.java | 63 +++++++++ .../UserSecondaryCardController.java | 10 ++ .../domain/UserMemnerConsumptionLog.java | 15 +++ .../system/domain/UserSecondaryCard.java | 43 ++++++ .../system/mapper/ServiceCateMapper.java | 4 + .../system/service/IServiceCateService.java | 3 + .../service/impl/ServiceCateServiceImpl.java | 4 + .../mapper/system/ServiceCateMapper.xml | 11 +- .../mapper/system/ServiceGoodsMapper.xml | 2 +- .../system/UserMemnerConsumptionLogMapper.xml | 10 +- .../mapper/system/UserSecondaryCardMapper.xml | 21 +-- .../system/UserUseSecondaryCardMapper.xml | 14 +- .../views/system/UserSecondaryCard/index.vue | 126 ++++++++++++++++-- 13 files changed, 292 insertions(+), 34 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java index 8488228..ee2d99d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppletController.java @@ -131,6 +131,9 @@ public class AppletController extends BaseController { private IUsersInvoiceInfoService usersInvoiceInfoService; @Autowired private IUserGroupBuyingService userGroupBuyingService; + + @Autowired + private IUserSecondaryCardService userSecondaryCardService; /** * 获取服务分类列表 * @@ -6901,11 +6904,71 @@ public AjaxResult checkUserDefault(HttpServletRequest request) { + @GetMapping("/api/secondary/classification") + public AjaxResult classification(HttpServletRequest request) { + try { + + List list = serviceCateService.selectServiceCateCiKaList(); + + return AppletControllerUtil.appletSuccess(list); + } catch (Exception e) { + System.err.println("验证用户图像和昵称异常：" + e.getMessage()); + return AppletControllerUtil.appletError("验证失败：" + e.getMessage()); + } + } /** * 拼团支付接口 * IUserGroupBuyingService userGroupBuyingService; */ + @PostMapping("/api/secondary/card/list") + public AjaxResult getSecondaryCardList(@RequestBody Map params, HttpServletRequest request) { + try { + // 1. 获取并验证分页参数 + int page = params.get("page") != null ? Integer.parseInt(params.get("page").toString()) : 1; + int limit = params.get("limit") != null ? Integer.parseInt(params.get("limit").toString()) : 15; + + Map pageValidation = PageUtil.validatePageParams(page, limit); + if (!(Boolean) pageValidation.get("valid")) { + return AppletControllerUtil.appletWarning((String) pageValidation.get("message")); + } + + // 2. 获取type参数 + Long type = params.get("type") != null ? Long.parseLong(params.get("type").toString()) : null; + + // 3. 创建查询对象 + UserSecondaryCard queryParams = new UserSecondaryCard(); + queryParams.setStatus(1L); // 只查询状态为1的数据 + if (type != null) { + queryParams.setType(type); + } + + // 4. 设置分页参数 + PageHelper.startPage(page, limit); + + // 5. 执行查询 + List list = userSecondaryCardService.selectUserSecondaryCardList(queryParams); + + for (UserSecondaryCard card : list) { + List idsList = com.alibaba.fastjson2.JSONArray.parseArray(card.getGoodsids(), String.class); + card.setServiceDetail(serviceGoodsService.selectServiceGoodsfrocikaList(idsList)); + } + + + // 6. 获取分页信息并构建响应 + TableDataInfo tableDataInfo = getDataTable(list); + + // 7. 构建符合要求的分页响应格式 + Map pageData = PageUtil.buildPageResponse(tableDataInfo, page, limit); + + return AppletControllerUtil.appletSuccess(pageData); + + } catch (Exception e) { + System.err.println("查询次卡列表异常：" + e.getMessage()); + return AppletControllerUtil.appletError("获取次卡列表失败：" + e.getMessage()); + } + } + @PostMapping("api/group/once_pay") public AjaxResult apigroupOncePay(@RequestBody Map params, HttpServletRequest request) { // 1. 验证用户登录状态 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserSecondaryCardController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserSecondaryCardController.java index 4bc81cc..731f2b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserSecondaryCardController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserSecondaryCardController.java @@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson2.JSONArray; import com.ruoyi.system.ControllerUtil.GenerateCustomCode; import com.ruoyi.system.domain.QuoteMaterial; +import com.ruoyi.system.domain.ServiceCate; +import com.ruoyi.system.service.IServiceCateService; import com.ruoyi.system.service.IServiceGoodsService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -44,6 +46,9 @@ public class UserSecondaryCardController extends BaseController @Autowired private IServiceGoodsService serviceGoodsService; + @Autowired + private IServiceCateService serviceCateService; + /** @@ -60,6 +65,11 @@ public class UserSecondaryCardController extends BaseController for(UserSecondaryCard t:list){ List idsList = com.alibaba.fastjson2.JSONArray.parseArray(t.getGoodsids(), String.class); t.setGoodsname(serviceGoodsService.selectTitlesJSONArrayByIds(idsList)); + ServiceCate serviceCate = serviceCateService.selectServiceCateById(t.getType()); + if(serviceCate!=null){ + t.setTypename(serviceCate.getTitle()); + } + } return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserMemnerConsumptionLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserMemnerConsumptionLog.java index caec52a..5d3a1aa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserMemnerConsumptionLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserMemnerConsumptionLog.java @@ -69,6 +69,13 @@ public class UserMemnerConsumptionLog extends BaseEntity @Excel(name = "删除标记") private Integer del; + + /** 删除标记 */ + @Excel(name = "数据类别 1:收入 2:支出") + private Integer type; + + + public void setId(Integer id) { this.id = id; @@ -199,6 +206,14 @@ public class UserMemnerConsumptionLog extends BaseEntity return del; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSecondaryCard.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSecondaryCard.java index 3ce3e2d..11293e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSecondaryCard.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSecondaryCard.java @@ -2,6 +2,9 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -37,6 +40,13 @@ public class UserSecondaryCard extends BaseEntity @Excel(name = "服务名称") private String goodsname; + + /** 服务id */ + @Excel(name = "简介") + private String introduction; + + + /** 展示价格 */ @Excel(name = "展示价格") private BigDecimal showMoney; @@ -70,10 +80,19 @@ public class UserSecondaryCard extends BaseEntity @Excel(name = "分类") private Long type; + /** 分类 */ + @Excel(name = "分类名称") + private String typename; + /** 可提供服务数 */ @Excel(name = "可提供服务数") private Long num; + + /** 可提供服务数 */ + @Excel(name = "服务详情") + private List ServiceDetail; + /** 总服务数 */ @Excel(name = "总服务数") private Long allnum; @@ -227,6 +246,30 @@ public class UserSecondaryCard extends BaseEntity this.goodsname = goodsname; } + public String getTypename() { + return typename; + } + + public void setTypename(String typename) { + this.typename = typename; + } + + public String getIntroduction() { + return introduction; + } + + public void setIntroduction(String introduction) { + this.introduction = introduction; + } + + public List getServiceDetail() { + return ServiceDetail; + } + + public void setServiceDetail(List serviceDetail) { + ServiceDetail = serviceDetail; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceCateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceCateMapper.java index d7da349..f4bcf01 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceCateMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceCateMapper.java @@ -27,6 +27,10 @@ public interface ServiceCateMapper */ public List selectServiceCateList(ServiceCate serviceCate); + + public List selectServiceCateCiKaList(); + + /** * 新增服务分类 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceCateService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceCateService.java index 65c24f8..8a43180 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceCateService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceCateService.java @@ -19,6 +19,9 @@ public interface IServiceCateService */ public ServiceCate selectServiceCateById(Long id); + + + public List selectServiceCateCiKaList(); /** * 查询服务分类列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceCateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceCateServiceImpl.java index 8ee97a9..3aa0427 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceCateServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceCateServiceImpl.java @@ -31,6 +31,10 @@ public class ServiceCateServiceImpl implements IServiceCateService return serviceCateMapper.selectServiceCateById(id); } + + public List selectServiceCateCiKaList(){ + return serviceCateMapper.selectServiceCateCiKaList(); + } /** * 查询服务分类列表 * diff --git a/ruoyi-system/src/main/resources/mapper/system/ServiceCateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ServiceCateMapper.xml index 3f3044b..782c340 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ServiceCateMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ServiceCateMapper.xml @@ -27,10 +27,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and title like concat('%',#{title},'%') and status=#{status} and type=#{type} - order by sort ASC + + + + + + - id IN + where id IN #{id} diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMemnerConsumptionLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMemnerConsumptionLogMapper.xml index f56f3b9..a62d7ef 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserMemnerConsumptionLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserMemnerConsumptionLogMapper.xml @@ -15,13 +15,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, uid, consumptiontype, consumptiontime, consumptionmoney, reamk, beformoney, aftermoney, nowmoney, created_at, updated_at, deleted_at, del from user_memner_consumption_log + select id, uid, consumptiontype, consumptiontime, consumptionmoney,type, reamk, beformoney, aftermoney, nowmoney, created_at, updated_at, deleted_at, del from user_memner_consumption_log @@ -36,8 +37,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and showimage = #{showimage} and status = #{status} and creattime = #{creattime} - and created_at = #{createdAt} - and updated_at = #{updatedAt} and type = #{type} and num = #{num} and allnum = #{allnum} @@ -60,11 +59,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" showimage, status, creattime, - created_at, - updated_at, type, num, allnum, + introduction, + created_at, + updated_at + #{orderid}, @@ -75,11 +76,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{showimage}, #{status}, #{creattime}, - #{createdAt}, - #{updatedAt}, #{type}, #{num}, #{allnum}, + #{introduction}, + NOW(), + NOW() + @@ -94,11 +97,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" showimage = #{showimage}, status = #{status}, creattime = #{creattime}, - created_at = #{createdAt}, - updated_at = #{updatedAt}, type = #{type}, num = #{num}, allnum = #{allnum}, + introduction = #{introduction}, + updated_at = NOW(), where id = #{id} diff --git a/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml index cc7b433..30bd7ab 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, uid, carid, goodsids, num, usenum, orderid, transaction_id, paymoney, status, created_at, updated_at from user_use_secondary_card + select id, uid, carid, goodsids, num, usenum, orderid, introduction,transaction_id, paymoney, status, created_at, updated_at from user_use_secondary_card