From b3eeffe6ad3b3b3bbb17d22746a11fed5b206cad Mon Sep 17 00:00:00 2001 From: "925116093-qq.com" <925116093@qq.com> Date: Thu, 3 Jul 2025 15:26:35 +0800 Subject: [PATCH] 202507031526 --- .../system/controller/AppletController.java | 125 ++++- .../controller/ServiceGoodsController.java | 13 + .../UserSecondaryCardController.java | 124 +++++ .../UserUseSecondaryCardController.java | 104 ++++ .../com/ruoyi/system/domain/OrderComment.java | 13 + .../com/ruoyi/system/domain/ServiceGoods.java | 25 + .../system/domain/UserSecondaryCard.java | 249 ++++++++++ .../system/domain/UserUseSecondaryCard.java | 205 ++++++++ .../system/mapper/ServiceGoodsMapper.java | 11 + .../mapper/UserSecondaryCardMapper.java | 61 +++ .../mapper/UserUseSecondaryCardMapper.java | 61 +++ .../system/service/IServiceGoodsService.java | 14 + .../service/IUserSecondaryCardService.java | 61 +++ .../service/IUserUseSecondaryCardService.java | 61 +++ .../service/impl/ServiceGoodsServiceImpl.java | 17 + .../impl/UserSecondaryCardServiceImpl.java | 93 ++++ .../impl/UserUseSecondaryCardServiceImpl.java | 93 ++++ .../mapper/system/OrderCommentMapper.xml | 9 +- .../mapper/system/ServiceGoodsMapper.xml | 38 +- .../mapper/system/UserSecondaryCardMapper.xml | 116 +++++ .../system/UserUseSecondaryCardMapper.xml | 106 ++++ ruoyi-ui/src/api/system/UserSecondaryCard.js | 70 +++ .../src/api/system/UserUseSecondaryCard.js | 44 ++ .../components/ServiceGoodsSelect/index.vue | 159 ++++++ .../src/views/system/GoodsShangPin/index.vue | 258 ++++++++-- .../src/views/system/ServiceGoods/index.vue | 222 ++++++++- .../src/views/system/SiteConfig/index.vue | 296 +++++++++++- .../ServiceGoodsSelectDialog.vue | 162 +++++++ .../views/system/UserSecondaryCard/index.vue | 454 ++++++++++++++++++ .../system/UserUseSecondaryCard/index.vue | 348 ++++++++++++++ 30 files changed, 3542 insertions(+), 70 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/UserSecondaryCardController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/UserUseSecondaryCardController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSecondaryCard.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/UserUseSecondaryCard.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserSecondaryCardMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserUseSecondaryCardMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IUserSecondaryCardService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IUserUseSecondaryCardService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSecondaryCardServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserUseSecondaryCardServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/UserSecondaryCardMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml create mode 100644 ruoyi-ui/src/api/system/UserSecondaryCard.js create mode 100644 ruoyi-ui/src/api/system/UserUseSecondaryCard.js create mode 100644 ruoyi-ui/src/components/ServiceGoodsSelect/index.vue create mode 100644 ruoyi-ui/src/views/system/UserSecondaryCard/ServiceGoodsSelectDialog.vue create mode 100644 ruoyi-ui/src/views/system/UserSecondaryCard/index.vue create mode 100644 ruoyi-ui/src/views/system/UserUseSecondaryCard/index.vue 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 fc01954..8488228 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 @@ -1814,14 +1814,16 @@ public class AppletController extends BaseController { String content = (String) param.get("content"); Integer num = param.get("num") != null ? Integer.parseInt(param.get("num").toString()) : null; Object imagesObj = param.get("images"); + Object labels = param.get("labels"); + if (orderId == null || orderId.isEmpty()) { - return AjaxResult.error("请选择评价的订单"); + return AppletControllerUtil.appletWarning("请选择评价的订单"); } if (content == null || content.isEmpty()) { - return AjaxResult.error("请输入评价内容"); + return AppletControllerUtil.appletWarning("请输入评价内容"); } if (num == null) { - return AjaxResult.error("请打分"); + return AppletControllerUtil.appletWarning("请打分"); } // 获取当前登录用户（假设有token或session，示例用1L） Long uid = 1L; @@ -1832,13 +1834,13 @@ public class AppletController extends BaseController { query.setOrderId(orderId); List orderList = goodsOrderService.selectGoodsOrderList(query); if (orderList == null || orderList.isEmpty()) { - return AjaxResult.error("订单不存在"); + return AppletControllerUtil.appletWarning("订单不存在"); } goodsOrder = orderList.get(0); } int count = orderCommentService.selectCountOrderCommentByOid(goodsOrder.getId()); if (count > 0) { - return AjaxResult.error("请勿重复提交"); + return AppletControllerUtil.appletWarning("请勿重复提交"); } // 评分类型 long numType = num == 1 ? 3 : ((num == 2 || num == 3) ? 2 : 1); @@ -1848,6 +1850,7 @@ public class AppletController extends BaseController { comment.setOrderId(orderId); comment.setProductId(goodsOrder.getProductId()); comment.setContent(content); + comment.setLabels(labels != null ? JSON.toJSONString(labels) : null ); comment.setNum((long) num); comment.setUid(goodsOrder.getUid()); // 或uid comment.setImages(imagesObj != null ? JSON.toJSONString(imagesObj) : null); @@ -1861,7 +1864,7 @@ public class AppletController extends BaseController { goodsOrderService.updateGoodsOrder(goodsOrder); return AjaxResult.success(); } else { - return AjaxResult.error("操作失败"); + return AppletControllerUtil.appletWarning("操作失败"); } } /** @@ -6752,11 +6755,119 @@ public class AppletController extends BaseController { /** - * 验证用户图像和昵称是否为系统默认 + * 服务订单评价 * * @param request HTTP请求对象 * @return 验证结果 */ +@PostMapping("/api/service/order/comment") +public AjaxResult serviceOrderComment(@RequestBody Map params, HttpServletRequest request) { + try { + // 1. 验证用户登录状态 + String token = request.getHeader("token"); + Map userValidation = AppletLoginUtil.validateUserToken(token, usersService); + if (!(Boolean) userValidation.get("valid")) { + return AppletControllerUtil.appletWarning("用户未登录或token无效"); + } + // 2. 获取用户信息 + Users user = (Users) userValidation.get("user"); + if (user == null) { + return AppletControllerUtil.appletWarning("用户信息获取失败"); + } + + + // 参数验证 + if (!params.containsKey("order_id") || !params.containsKey("content") || !params.containsKey("num")) { + return AppletControllerUtil.appletWarning("参数错误"); + } + + String orderId = params.get("order_id").toString(); + String content = params.get("content").toString(); + Integer num = Integer.parseInt(params.get("num").toString()); +// +// // 检查是否已经评价过 +// OrderComment existComment = orderCommentService.selectOrderCommentByOrderIdAndUserId(orderId, user.getId()); +// if (existComment != null) { +// return AjaxResult.error("请勿重复提交"); +// } + + // 获取订单信息 + Order order = orderService.selectOrderByOrderId(orderId); + if (order == null) { + return AppletControllerUtil.appletWarning("订单不存在"); + } + int count = orderCommentService.selectCountOrderCommentByOid(order.getId()); + if (count > 0) { + return AppletControllerUtil.appletWarning("请勿重复提交"); + } + // 计算评分类型 + Integer numType; + if (num == 1) { + numType = 3; // 差评 + } else if (num == 2 || num == 3) { + numType = 2; // 中评 + } else { + numType = 1; // 好评 + } + + // 构建评价数据 + OrderComment comment = new OrderComment(); + comment.setOid(order.getId()); + comment.setOrderId(orderId); + comment.setProductId(order.getProductId()); + comment.setContent(content); + comment.setNum(Long.valueOf(num)); + comment.setNumType(Long.valueOf(numType)); + comment.setUid(user.getId()); + comment.setWorkerId(order.getWorkerId()); + + // 处理图片 + if (params.containsKey("images") && params.get("images") != null) { + String images = JSON.toJSONString(params.get("images")); + comment.setImages(images); + } + // 处理图片 + if (params.containsKey("labels") && params.get("labels") != null) { + String labels = JSON.toJSONString(params.get("labels")); + comment.setLabels(labels); + } + + + try { + // 1. 保存评价 + orderCommentService.insertOrderComment(comment); + + // 2. 添加订单日志 + OrderLog orderLog = new OrderLog(); + orderLog.setOid(order.getId()); + orderLog.setOrderId(orderId); + orderLog.setTitle("订单评价"); + orderLog.setType(BigDecimal.valueOf(8)); + + Map logContent = new HashMap<>(); + logContent.put("text", content); + logContent.put("image", params.get("images")); + logContent.put("num", num); + orderLog.setContent(JSON.toJSONString(logContent)); + + orderLogService.insertOrderLog(orderLog); + + // 3. 更新订单状态 +// Order updateOrder = new Order(); +// order.setOrderId(orderId); + order.setStatus(4L); // 完成状态 + order.setIsComment(1); // 已评价 + orderService.updateOrder(order); + + return AjaxResult.success(); + } catch (Exception e) { + return AjaxResult.error("操作失败：" + e.getMessage()); + } + } catch (Exception e) { + return AjaxResult.error("系统错误：" + e.getMessage()); + } +} + @GetMapping("/api/user/check/default") public AjaxResult checkUserDefault(HttpServletRequest request) { try { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java index 2da4046..0f26ad2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ServiceGoodsController.java @@ -79,6 +79,19 @@ public class ServiceGoodsController extends BaseController { } + /** + * 获取服务内容详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:ServiceGoods:query')") + @GetMapping(value = "/selectList") + public AjaxResult selectList() { + + ServiceGoods serviceGoods = new ServiceGoods(); + serviceGoods.setIsfixed(1); + return success(serviceGoodsService.selectServiceGoodsList(serviceGoods)); + } + + /** * 获取服务内容详细信息 */ 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 new file mode 100644 index 0000000..4bc81cc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserSecondaryCardController.java @@ -0,0 +1,124 @@ +package com.ruoyi.system.controller; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +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.service.IServiceGoodsService; +import org.springframework.security.access.prepost.PreAuthorize; +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.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.UserSecondaryCard; +import com.ruoyi.system.service.IUserSecondaryCardService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 次卡管理Controller + * + * @author ruoyi + * @date 2025-07-02 + */ +@RestController +@RequestMapping("/system/UserSecondaryCard") +public class UserSecondaryCardController extends BaseController +{ + @Autowired + private IUserSecondaryCardService userSecondaryCardService; + + @Autowired + private IServiceGoodsService serviceGoodsService; + + + + /** + * 查询次卡管理列表 + */ + @PreAuthorize("@ss.hasPermi('system:UserSecondaryCard:list')") + @GetMapping("/list") + public TableDataInfo list(UserSecondaryCard userSecondaryCard) + { + startPage(); + List list = userSecondaryCardService.selectUserSecondaryCardList(userSecondaryCard); + JSONArray jsonArray = new JSONArray(); + //JSONArray.parseArray(str); + for(UserSecondaryCard t:list){ + List idsList = com.alibaba.fastjson2.JSONArray.parseArray(t.getGoodsids(), String.class); + t.setGoodsname(serviceGoodsService.selectTitlesJSONArrayByIds(idsList)); + } + return getDataTable(list); + } + + /** + * 导出次卡管理列表 + */ + @PreAuthorize("@ss.hasPermi('system:UserSecondaryCard:export')") + @Log(title = "次卡管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, UserSecondaryCard userSecondaryCard) + { + List list = userSecondaryCardService.selectUserSecondaryCardList(userSecondaryCard); + ExcelUtil util = new ExcelUtil(UserSecondaryCard.class); + util.exportExcel(response, list, "次卡管理数据"); + } + + /** + * 获取次卡管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:UserSecondaryCard:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(userSecondaryCardService.selectUserSecondaryCardById(id)); + } + + /** + * 新增次卡管理 + */ + @PreAuthorize("@ss.hasPermi('system:UserSecondaryCard:add')") + @Log(title = "次卡管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody UserSecondaryCard userSecondaryCard) + { + userSecondaryCard.setOrderid(GenerateCustomCode.generCreateOrder("CIKA")); + userSecondaryCard.setCreattime(new Date()); + return toAjax(userSecondaryCardService.insertUserSecondaryCard(userSecondaryCard)); + } + + /** + * 修改次卡管理 + */ + @PreAuthorize("@ss.hasPermi('system:UserSecondaryCard:edit')") + @Log(title = "次卡管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody UserSecondaryCard userSecondaryCard) + { + return toAjax(userSecondaryCardService.updateUserSecondaryCard(userSecondaryCard)); + } + + /** + * 删除次卡管理 + */ + @PreAuthorize("@ss.hasPermi('system:UserSecondaryCard:remove')") + @Log(title = "次卡管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(userSecondaryCardService.deleteUserSecondaryCardByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserUseSecondaryCardController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserUseSecondaryCardController.java new file mode 100644 index 0000000..b3b9fd5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserUseSecondaryCardController.java @@ -0,0 +1,104 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +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.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.UserUseSecondaryCard; +import com.ruoyi.system.service.IUserUseSecondaryCardService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 次卡使用Controller + * + * @author ruoyi + * @date 2025-07-02 + */ +@RestController +@RequestMapping("/system/UserUseSecondaryCard") +public class UserUseSecondaryCardController extends BaseController +{ + @Autowired + private IUserUseSecondaryCardService userUseSecondaryCardService; + + /** + * 查询次卡使用列表 + */ + @PreAuthorize("@ss.hasPermi('system:UserUseSecondaryCard:list')") + @GetMapping("/list") + public TableDataInfo list(UserUseSecondaryCard userUseSecondaryCard) + { + startPage(); + List list = userUseSecondaryCardService.selectUserUseSecondaryCardList(userUseSecondaryCard); + return getDataTable(list); + } + + /** + * 导出次卡使用列表 + */ + @PreAuthorize("@ss.hasPermi('system:UserUseSecondaryCard:export')") + @Log(title = "次卡使用", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, UserUseSecondaryCard userUseSecondaryCard) + { + List list = userUseSecondaryCardService.selectUserUseSecondaryCardList(userUseSecondaryCard); + ExcelUtil util = new ExcelUtil(UserUseSecondaryCard.class); + util.exportExcel(response, list, "次卡使用数据"); + } + + /** + * 获取次卡使用详细信息 + */ + @PreAuthorize("@ss.hasPermi('system:UserUseSecondaryCard:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(userUseSecondaryCardService.selectUserUseSecondaryCardById(id)); + } + + /** + * 新增次卡使用 + */ + @PreAuthorize("@ss.hasPermi('system:UserUseSecondaryCard:add')") + @Log(title = "次卡使用", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody UserUseSecondaryCard userUseSecondaryCard) + { + return toAjax(userUseSecondaryCardService.insertUserUseSecondaryCard(userUseSecondaryCard)); + } + + /** + * 修改次卡使用 + */ + @PreAuthorize("@ss.hasPermi('system:UserUseSecondaryCard:edit')") + @Log(title = "次卡使用", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody UserUseSecondaryCard userUseSecondaryCard) + { + return toAjax(userUseSecondaryCardService.updateUserUseSecondaryCard(userUseSecondaryCard)); + } + + /** + * 删除次卡使用 + */ + @PreAuthorize("@ss.hasPermi('system:UserUseSecondaryCard:remove')") + @Log(title = "次卡使用", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(userUseSecondaryCardService.deleteUserUseSecondaryCardByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderComment.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderComment.java index f88a208..c0b10c6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderComment.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderComment.java @@ -45,6 +45,10 @@ public class OrderComment extends BaseEntity @Excel(name = "图片") private String images; + /** 图片 */ + @Excel(name = "评价标签") + private String labels; + /** 评价内容 */ @Excel(name = "评价内容") private String content; @@ -212,6 +216,15 @@ public class OrderComment extends BaseEntity this.uname = uname; } + + public String getLabels() { + return labels; + } + + public void setLabels(String labels) { + this.labels = labels; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceGoods.java index 94d4021..7e406aa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceGoods.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ServiceGoods.java @@ -65,6 +65,11 @@ public class ServiceGoods extends BaseEntity @Excel(name = "详情") private String description; + + /** 规格类型 1：单规格 2：多规格 */ + @Excel(name = "下单类型 1：预约下单 2：报价下单") + private Integer servicetype; + /** 规格类型 1：单规格 2：多规格 */ @Excel(name = "规格类型 1：单规格 2：多规格") private Integer skuType; @@ -168,6 +173,10 @@ private String cateName; private Integer groupnum; + /** 指定工人的id集合 */ + @Excel(name = "问答") + private String questions; + /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @@ -597,6 +606,22 @@ private String cateName; this.groupnum = groupnum; } + public Integer getServicetype() { + return servicetype; + } + + public void setServicetype(Integer servicetype) { + this.servicetype = servicetype; + } + + public String getQuestions() { + return questions; + } + + public void setQuestions(String questions) { + this.questions = questions; + } + @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 new file mode 100644 index 0000000..3ce3e2d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserSecondaryCard.java @@ -0,0 +1,249 @@ +package com.ruoyi.system.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 次卡管理对象 user_secondary_card + * + * @author ruoyi + * @date 2025-07-02 + */ +public class UserSecondaryCard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 订单id */ + @Excel(name = "订单id") + private String orderid; + + /** 标题 */ + @Excel(name = "标题") + private String title; + + /** 服务id */ + @Excel(name = "服务id") + private String goodsids; + + /** 服务id */ + @Excel(name = "服务名称") + private String goodsname; + + /** 展示价格 */ + @Excel(name = "展示价格") + private BigDecimal showMoney; + + /** 真实付款价格 */ + @Excel(name = "真实付款价格") + private BigDecimal realMoney; + + /** 展示图片 */ + @Excel(name = "展示图片") + private String showimage; + + /** 状态 1上线 2下线 */ + @Excel(name = "状态 1上线 2下线") + private Long status; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date creattime; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date createdAt; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date updatedAt; + + /** 分类 */ + @Excel(name = "分类") + private Long type; + + /** 可提供服务数 */ + @Excel(name = "可提供服务数") + private Long num; + + /** 总服务数 */ + @Excel(name = "总服务数") + private Long allnum; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setOrderid(String orderid) + { + this.orderid = orderid; + } + + public String getOrderid() + { + return orderid; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getTitle() + { + return title; + } + + public void setGoodsids(String goodsids) + { + this.goodsids = goodsids; + } + + public String getGoodsids() + { + return goodsids; + } + + public void setShowMoney(BigDecimal showMoney) + { + this.showMoney = showMoney; + } + + public BigDecimal getShowMoney() + { + return showMoney; + } + + public void setRealMoney(BigDecimal realMoney) + { + this.realMoney = realMoney; + } + + public BigDecimal getRealMoney() + { + return realMoney; + } + + public void setShowimage(String showimage) + { + this.showimage = showimage; + } + + public String getShowimage() + { + return showimage; + } + + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + + public void setCreattime(Date creattime) + { + this.creattime = creattime; + } + + public Date getCreattime() + { + return creattime; + } + + public void setCreatedAt(Date createdAt) + { + this.createdAt = createdAt; + } + + public Date getCreatedAt() + { + return createdAt; + } + + public void setUpdatedAt(Date updatedAt) + { + this.updatedAt = updatedAt; + } + + public Date getUpdatedAt() + { + return updatedAt; + } + + public void setType(Long type) + { + this.type = type; + } + + public Long getType() + { + return type; + } + + public void setNum(Long num) + { + this.num = num; + } + + public Long getNum() + { + return num; + } + + public void setAllnum(Long allnum) + { + this.allnum = allnum; + } + + public Long getAllnum() + { + return allnum; + } + + + public String getGoodsname() { + return goodsname; + } + + public void setGoodsname(String goodsname) { + this.goodsname = goodsname; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderid", getOrderid()) + .append("title", getTitle()) + .append("goodsids", getGoodsids()) + .append("showMoney", getShowMoney()) + .append("realMoney", getRealMoney()) + .append("showimage", getShowimage()) + .append("status", getStatus()) + .append("creattime", getCreattime()) + .append("createdAt", getCreatedAt()) + .append("updatedAt", getUpdatedAt()) + .append("type", getType()) + .append("num", getNum()) + .append("allnum", getAllnum()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserUseSecondaryCard.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserUseSecondaryCard.java new file mode 100644 index 0000000..e2193e7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserUseSecondaryCard.java @@ -0,0 +1,205 @@ +package com.ruoyi.system.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 次卡使用对象 user_use_secondary_card + * + * @author ruoyi + * @date 2025-07-02 + */ +public class UserUseSecondaryCard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 用户id */ + @Excel(name = "用户id") + private Long uid; + + /** 次卡id */ + @Excel(name = "次卡id") + private String carid; + + /** 服务id */ + @Excel(name = "服务id") + private String goodsids; + + /** 用户可用数量 */ + @Excel(name = "用户可用数量") + private Long num; + + /** 用户已用数量 */ + @Excel(name = "用户已用数量") + private Long usenum; + + /** 订单id */ + @Excel(name = "订单id") + private String orderid; + + /** 支付id */ + @Excel(name = "支付id") + private String transactionId; + + /** 支付金额 */ + @Excel(name = "支付金额") + private BigDecimal paymoney; + + /** 状态 1可用 2已用完 3已退款 */ + @Excel(name = "状态 1可用 2已用完 3已退款") + private Long status; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date createdAt; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Date updatedAt; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setUid(Long uid) + { + this.uid = uid; + } + + public Long getUid() + { + return uid; + } + + public void setCarid(String carid) + { + this.carid = carid; + } + + public String getCarid() + { + return carid; + } + + public void setGoodsids(String goodsids) + { + this.goodsids = goodsids; + } + + public String getGoodsids() + { + return goodsids; + } + + public void setNum(Long num) + { + this.num = num; + } + + public Long getNum() + { + return num; + } + + public void setUsenum(Long usenum) + { + this.usenum = usenum; + } + + public Long getUsenum() + { + return usenum; + } + + public void setOrderid(String orderid) + { + this.orderid = orderid; + } + + public String getOrderid() + { + return orderid; + } + + public void setTransactionId(String transactionId) + { + this.transactionId = transactionId; + } + + public String getTransactionId() + { + return transactionId; + } + + public void setPaymoney(BigDecimal paymoney) + { + this.paymoney = paymoney; + } + + public BigDecimal getPaymoney() + { + return paymoney; + } + + public void setStatus(Long status) + { + this.status = status; + } + + public Long getStatus() + { + return status; + } + + public void setCreatedAt(Date createdAt) + { + this.createdAt = createdAt; + } + + public Date getCreatedAt() + { + return createdAt; + } + + public void setUpdatedAt(Date updatedAt) + { + this.updatedAt = updatedAt; + } + + public Date getUpdatedAt() + { + return updatedAt; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("uid", getUid()) + .append("carid", getCarid()) + .append("goodsids", getGoodsids()) + .append("num", getNum()) + .append("usenum", getUsenum()) + .append("orderid", getOrderid()) + .append("transactionId", getTransactionId()) + .append("paymoney", getPaymoney()) + .append("status", getStatus()) + .append("createdAt", getCreatedAt()) + .append("updatedAt", getUpdatedAt()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceGoodsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceGoodsMapper.java index 0ef2ec4..0c14817 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceGoodsMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ServiceGoodsMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.alibaba.fastjson2.JSONArray; import com.ruoyi.system.domain.ServiceGoods; import org.apache.ibatis.annotations.Param; @@ -22,6 +24,15 @@ public interface ServiceGoodsMapper + public String selectTitlesJSONArrayByIds(@Param("ids") List ids); + + + public List selectServiceGoodsfrocikaList(@Param("ids") List ids); + + + + + public String selectTitlesByIds(@Param("ids") List ids); /** * 查询服务内容列表 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserSecondaryCardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserSecondaryCardMapper.java new file mode 100644 index 0000000..449acf7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserSecondaryCardMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.UserSecondaryCard; + +/** + * 次卡管理Mapper接口 + * + * @author ruoyi + * @date 2025-07-02 + */ +public interface UserSecondaryCardMapper +{ + /** + * 查询次卡管理 + * + * @param id 次卡管理主键 + * @return 次卡管理 + */ + public UserSecondaryCard selectUserSecondaryCardById(Long id); + + /** + * 查询次卡管理列表 + * + * @param userSecondaryCard 次卡管理 + * @return 次卡管理集合 + */ + public List selectUserSecondaryCardList(UserSecondaryCard userSecondaryCard); + + /** + * 新增次卡管理 + * + * @param userSecondaryCard 次卡管理 + * @return 结果 + */ + public int insertUserSecondaryCard(UserSecondaryCard userSecondaryCard); + + /** + * 修改次卡管理 + * + * @param userSecondaryCard 次卡管理 + * @return 结果 + */ + public int updateUserSecondaryCard(UserSecondaryCard userSecondaryCard); + + /** + * 删除次卡管理 + * + * @param id 次卡管理主键 + * @return 结果 + */ + public int deleteUserSecondaryCardById(Long id); + + /** + * 批量删除次卡管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteUserSecondaryCardByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserUseSecondaryCardMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserUseSecondaryCardMapper.java new file mode 100644 index 0000000..e7ca608 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserUseSecondaryCardMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.UserUseSecondaryCard; + +/** + * 次卡使用Mapper接口 + * + * @author ruoyi + * @date 2025-07-02 + */ +public interface UserUseSecondaryCardMapper +{ + /** + * 查询次卡使用 + * + * @param id 次卡使用主键 + * @return 次卡使用 + */ + public UserUseSecondaryCard selectUserUseSecondaryCardById(Long id); + + /** + * 查询次卡使用列表 + * + * @param userUseSecondaryCard 次卡使用 + * @return 次卡使用集合 + */ + public List selectUserUseSecondaryCardList(UserUseSecondaryCard userUseSecondaryCard); + + /** + * 新增次卡使用 + * + * @param userUseSecondaryCard 次卡使用 + * @return 结果 + */ + public int insertUserUseSecondaryCard(UserUseSecondaryCard userUseSecondaryCard); + + /** + * 修改次卡使用 + * + * @param userUseSecondaryCard 次卡使用 + * @return 结果 + */ + public int updateUserUseSecondaryCard(UserUseSecondaryCard userUseSecondaryCard); + + /** + * 删除次卡使用 + * + * @param id 次卡使用主键 + * @return 结果 + */ + public int deleteUserUseSecondaryCardById(Long id); + + /** + * 批量删除次卡使用 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteUserUseSecondaryCardByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceGoodsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceGoodsService.java index b9797bc..75251fe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceGoodsService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IServiceGoodsService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; + +import com.alibaba.fastjson2.JSONArray; import com.ruoyi.system.domain.ServiceGoods; import org.apache.ibatis.annotations.Param; @@ -37,6 +39,18 @@ public interface IServiceGoodsService public String selectTitlesByIds(List ids); + + /** + * 查询服务内容列表 + * + * @param ids 服务内容 + * @return 服务内容集合 + */ + public String selectTitlesJSONArrayByIds(List ids); + + + public List selectServiceGoodsfrocikaList(List ids); + /** * 新增服务内容 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserSecondaryCardService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserSecondaryCardService.java new file mode 100644 index 0000000..5d5248b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserSecondaryCardService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.UserSecondaryCard; + +/** + * 次卡管理Service接口 + * + * @author ruoyi + * @date 2025-07-02 + */ +public interface IUserSecondaryCardService +{ + /** + * 查询次卡管理 + * + * @param id 次卡管理主键 + * @return 次卡管理 + */ + public UserSecondaryCard selectUserSecondaryCardById(Long id); + + /** + * 查询次卡管理列表 + * + * @param userSecondaryCard 次卡管理 + * @return 次卡管理集合 + */ + public List selectUserSecondaryCardList(UserSecondaryCard userSecondaryCard); + + /** + * 新增次卡管理 + * + * @param userSecondaryCard 次卡管理 + * @return 结果 + */ + public int insertUserSecondaryCard(UserSecondaryCard userSecondaryCard); + + /** + * 修改次卡管理 + * + * @param userSecondaryCard 次卡管理 + * @return 结果 + */ + public int updateUserSecondaryCard(UserSecondaryCard userSecondaryCard); + + /** + * 批量删除次卡管理 + * + * @param ids 需要删除的次卡管理主键集合 + * @return 结果 + */ + public int deleteUserSecondaryCardByIds(Long[] ids); + + /** + * 删除次卡管理信息 + * + * @param id 次卡管理主键 + * @return 结果 + */ + public int deleteUserSecondaryCardById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserUseSecondaryCardService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserUseSecondaryCardService.java new file mode 100644 index 0000000..8c07bfa --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserUseSecondaryCardService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.UserUseSecondaryCard; + +/** + * 次卡使用Service接口 + * + * @author ruoyi + * @date 2025-07-02 + */ +public interface IUserUseSecondaryCardService +{ + /** + * 查询次卡使用 + * + * @param id 次卡使用主键 + * @return 次卡使用 + */ + public UserUseSecondaryCard selectUserUseSecondaryCardById(Long id); + + /** + * 查询次卡使用列表 + * + * @param userUseSecondaryCard 次卡使用 + * @return 次卡使用集合 + */ + public List selectUserUseSecondaryCardList(UserUseSecondaryCard userUseSecondaryCard); + + /** + * 新增次卡使用 + * + * @param userUseSecondaryCard 次卡使用 + * @return 结果 + */ + public int insertUserUseSecondaryCard(UserUseSecondaryCard userUseSecondaryCard); + + /** + * 修改次卡使用 + * + * @param userUseSecondaryCard 次卡使用 + * @return 结果 + */ + public int updateUserUseSecondaryCard(UserUseSecondaryCard userUseSecondaryCard); + + /** + * 批量删除次卡使用 + * + * @param ids 需要删除的次卡使用主键集合 + * @return 结果 + */ + public int deleteUserUseSecondaryCardByIds(Long[] ids); + + /** + * 删除次卡使用信息 + * + * @param id 次卡使用主键 + * @return 结果 + */ + public int deleteUserUseSecondaryCardById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceGoodsServiceImpl.java index eb1a646..4e0e6b7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceGoodsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ServiceGoodsServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import java.util.List; +import com.alibaba.fastjson2.JSONArray; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,6 +56,22 @@ public class ServiceGoodsServiceImpl implements IServiceGoodsService return serviceGoodsMapper.selectServiceGoodsList(serviceGoods); } + + /** + * 查询服务内容列表 + * + * @param ids 服务内容 + * @return 服务内容集合 + */ + @Override + public String selectTitlesJSONArrayByIds(List ids){ + return serviceGoodsMapper.selectTitlesJSONArrayByIds(ids); + } + + public List selectServiceGoodsfrocikaList(List ids) { + return serviceGoodsMapper.selectServiceGoodsfrocikaList(ids); + + } /** * 新增服务内容 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSecondaryCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSecondaryCardServiceImpl.java new file mode 100644 index 0000000..e572eca --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserSecondaryCardServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.UserSecondaryCardMapper; +import com.ruoyi.system.domain.UserSecondaryCard; +import com.ruoyi.system.service.IUserSecondaryCardService; + +/** + * 次卡管理Service业务层处理 + * + * @author ruoyi + * @date 2025-07-02 + */ +@Service +public class UserSecondaryCardServiceImpl implements IUserSecondaryCardService +{ + @Autowired + private UserSecondaryCardMapper userSecondaryCardMapper; + + /** + * 查询次卡管理 + * + * @param id 次卡管理主键 + * @return 次卡管理 + */ + @Override + public UserSecondaryCard selectUserSecondaryCardById(Long id) + { + return userSecondaryCardMapper.selectUserSecondaryCardById(id); + } + + /** + * 查询次卡管理列表 + * + * @param userSecondaryCard 次卡管理 + * @return 次卡管理 + */ + @Override + public List selectUserSecondaryCardList(UserSecondaryCard userSecondaryCard) + { + return userSecondaryCardMapper.selectUserSecondaryCardList(userSecondaryCard); + } + + /** + * 新增次卡管理 + * + * @param userSecondaryCard 次卡管理 + * @return 结果 + */ + @Override + public int insertUserSecondaryCard(UserSecondaryCard userSecondaryCard) + { + return userSecondaryCardMapper.insertUserSecondaryCard(userSecondaryCard); + } + + /** + * 修改次卡管理 + * + * @param userSecondaryCard 次卡管理 + * @return 结果 + */ + @Override + public int updateUserSecondaryCard(UserSecondaryCard userSecondaryCard) + { + return userSecondaryCardMapper.updateUserSecondaryCard(userSecondaryCard); + } + + /** + * 批量删除次卡管理 + * + * @param ids 需要删除的次卡管理主键 + * @return 结果 + */ + @Override + public int deleteUserSecondaryCardByIds(Long[] ids) + { + return userSecondaryCardMapper.deleteUserSecondaryCardByIds(ids); + } + + /** + * 删除次卡管理信息 + * + * @param id 次卡管理主键 + * @return 结果 + */ + @Override + public int deleteUserSecondaryCardById(Long id) + { + return userSecondaryCardMapper.deleteUserSecondaryCardById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserUseSecondaryCardServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserUseSecondaryCardServiceImpl.java new file mode 100644 index 0000000..f36cca7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserUseSecondaryCardServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.UserUseSecondaryCardMapper; +import com.ruoyi.system.domain.UserUseSecondaryCard; +import com.ruoyi.system.service.IUserUseSecondaryCardService; + +/** + * 次卡使用Service业务层处理 + * + * @author ruoyi + * @date 2025-07-02 + */ +@Service +public class UserUseSecondaryCardServiceImpl implements IUserUseSecondaryCardService +{ + @Autowired + private UserUseSecondaryCardMapper userUseSecondaryCardMapper; + + /** + * 查询次卡使用 + * + * @param id 次卡使用主键 + * @return 次卡使用 + */ + @Override + public UserUseSecondaryCard selectUserUseSecondaryCardById(Long id) + { + return userUseSecondaryCardMapper.selectUserUseSecondaryCardById(id); + } + + /** + * 查询次卡使用列表 + * + * @param userUseSecondaryCard 次卡使用 + * @return 次卡使用 + */ + @Override + public List selectUserUseSecondaryCardList(UserUseSecondaryCard userUseSecondaryCard) + { + return userUseSecondaryCardMapper.selectUserUseSecondaryCardList(userUseSecondaryCard); + } + + /** + * 新增次卡使用 + * + * @param userUseSecondaryCard 次卡使用 + * @return 结果 + */ + @Override + public int insertUserUseSecondaryCard(UserUseSecondaryCard userUseSecondaryCard) + { + return userUseSecondaryCardMapper.insertUserUseSecondaryCard(userUseSecondaryCard); + } + + /** + * 修改次卡使用 + * + * @param userUseSecondaryCard 次卡使用 + * @return 结果 + */ + @Override + public int updateUserUseSecondaryCard(UserUseSecondaryCard userUseSecondaryCard) + { + return userUseSecondaryCardMapper.updateUserUseSecondaryCard(userUseSecondaryCard); + } + + /** + * 批量删除次卡使用 + * + * @param ids 需要删除的次卡使用主键 + * @return 结果 + */ + @Override + public int deleteUserUseSecondaryCardByIds(Long[] ids) + { + return userUseSecondaryCardMapper.deleteUserUseSecondaryCardByIds(ids); + } + + /** + * 删除次卡使用信息 + * + * @param id 次卡使用主键 + * @return 结果 + */ + @Override + public int deleteUserUseSecondaryCardById(Long id) + { + return userUseSecondaryCardMapper.deleteUserUseSecondaryCardById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/OrderCommentMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OrderCommentMapper.xml index 3e57be3..f5c6332 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OrderCommentMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OrderCommentMapper.xml @@ -16,12 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, oid, order_id, product_id, uid, images, content, num, num_type, status, worker_id, created_at, updated_at from order_comment + select id, oid, order_id, product_id, uid, images, content, num, num_type, status,labels, worker_id, created_at, updated_at from order_comment @@ -69,6 +73,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by id desc + + + + + + + + + + + + + and orderid = #{orderid} + and title = #{title} + and goodsids = #{goodsids} + and show_money = #{showMoney} + and real_money = #{realMoney} + 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} + + + + + + + insert into user_secondary_card + + orderid, + title, + goodsids, + show_money, + real_money, + showimage, + status, + creattime, + created_at, + updated_at, + type, + num, + allnum, + + + #{orderid}, + #{title}, + #{goodsids}, + #{showMoney}, + #{realMoney}, + #{showimage}, + #{status}, + #{creattime}, + #{createdAt}, + #{updatedAt}, + #{type}, + #{num}, + #{allnum}, + + + + + update user_secondary_card + + orderid = #{orderid}, + title = #{title}, + goodsids = #{goodsids}, + show_money = #{showMoney}, + real_money = #{realMoney}, + showimage = #{showimage}, + status = #{status}, + creattime = #{creattime}, + created_at = #{createdAt}, + updated_at = #{updatedAt}, + type = #{type}, + num = #{num}, + allnum = #{allnum}, + + where id = #{id} + + + + delete from user_secondary_card where id = #{id} + + + + delete from user_secondary_card where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml new file mode 100644 index 0000000..cc7b433 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/UserUseSecondaryCardMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + select id, uid, carid, goodsids, num, usenum, orderid, transaction_id, paymoney, status, created_at, updated_at from user_use_secondary_card + + + + + + + + insert into user_use_secondary_card + + uid, + carid, + goodsids, + num, + usenum, + orderid, + transaction_id, + paymoney, + status, + created_at, + updated_at, + + + #{uid}, + #{carid}, + #{goodsids}, + #{num}, + #{usenum}, + #{orderid}, + #{transactionId}, + #{paymoney}, + #{status}, + #{createdAt}, + #{updatedAt}, + + + + + update user_use_secondary_card + + uid = #{uid}, + carid = #{carid}, + goodsids = #{goodsids}, + num = #{num}, + usenum = #{usenum}, + orderid = #{orderid}, + transaction_id = #{transactionId}, + paymoney = #{paymoney}, + status = #{status}, + created_at = #{createdAt}, + updated_at = #{updatedAt}, + + where id = #{id} + + + + delete from user_use_secondary_card where id = #{id} + + + + delete from user_use_secondary_card where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/system/UserSecondaryCard.js b/ruoyi-ui/src/api/system/UserSecondaryCard.js new file mode 100644 index 0000000..98c7660 --- /dev/null +++ b/ruoyi-ui/src/api/system/UserSecondaryCard.js @@ -0,0 +1,70 @@ +import request from '@/utils/request' + +// 查询次卡管理列表 +export function listUserSecondaryCard(query) { + return request({ + url: '/system/UserSecondaryCard/list', + method: 'get', + params: query + }) +} + +// 查询服务内容详细 +export function getServiceGoods(id) { + return request({ + url: '/system/ServiceGoods/' + id, + method: 'get' + }) +} + + +// 查询服务内容详细 +export function selectList() { + return request({ + url: '/system/ServiceGoods/selectList', + method: 'get' + }) +} + + +// 查询服务内容详细 +export function selectServiceCateList() { + return request({ + url: '/system/ServiceGoods/selectServiceCateList', + method: 'get' + }) +} + +// 查询次卡管理详细 +export function getUserSecondaryCard(id) { + return request({ + url: '/system/UserSecondaryCard/' + id, + method: 'get' + }) +} + +// 新增次卡管理 +export function addUserSecondaryCard(data) { + return request({ + url: '/system/UserSecondaryCard', + method: 'post', + data: data + }) +} + +// 修改次卡管理 +export function updateUserSecondaryCard(data) { + return request({ + url: '/system/UserSecondaryCard', + method: 'put', + data: data + }) +} + +// 删除次卡管理 +export function delUserSecondaryCard(id) { + return request({ + url: '/system/UserSecondaryCard/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/system/UserUseSecondaryCard.js b/ruoyi-ui/src/api/system/UserUseSecondaryCard.js new file mode 100644 index 0000000..28127b2 --- /dev/null +++ b/ruoyi-ui/src/api/system/UserUseSecondaryCard.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询次卡使用列表 +export function listUserUseSecondaryCard(query) { + return request({ + url: '/system/UserUseSecondaryCard/list', + method: 'get', + params: query + }) +} + +// 查询次卡使用详细 +export function getUserUseSecondaryCard(id) { + return request({ + url: '/system/UserUseSecondaryCard/' + id, + method: 'get' + }) +} + +// 新增次卡使用 +export function addUserUseSecondaryCard(data) { + return request({ + url: '/system/UserUseSecondaryCard', + method: 'post', + data: data + }) +} + +// 修改次卡使用 +export function updateUserUseSecondaryCard(data) { + return request({ + url: '/system/UserUseSecondaryCard', + method: 'put', + data: data + }) +} + +// 删除次卡使用 +export function delUserUseSecondaryCard(id) { + return request({ + url: '/system/UserUseSecondaryCard/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/components/ServiceGoodsSelect/index.vue b/ruoyi-ui/src/components/ServiceGoodsSelect/index.vue new file mode 100644 index 0000000..9d28278 --- /dev/null +++ b/ruoyi-ui/src/components/ServiceGoodsSelect/index.vue @@ -0,0 +1,159 @@ + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/GoodsShangPin/index.vue b/ruoyi-ui/src/views/system/GoodsShangPin/index.vue index adbc99b..cd3322a 100644 --- a/ruoyi-ui/src/views/system/GoodsShangPin/index.vue +++ b/ruoyi-ui/src/views/system/GoodsShangPin/index.vue @@ -299,6 +299,33 @@ + + +
+
+ 添加问答 +
+
+
+ 问答 #{{index + 1}} + 删除 +
+ + + + + + + + + + + + + +
+
+
@@ -412,6 +439,7 @@ export default { skuList: [ { name: '', value: '' } ], specList: [ { name: '', values: [''] } ], skuTable: [], + saveTimeout: null, // 用于防抖的定时器 } }, created() { @@ -454,10 +482,10 @@ export default { skuValue: null, latitude: null, longitude: null, - type: 2, // 默认为商品类型 + type: 2, cateId: null, project: null, - sort: 50, // 默认排序值 + sort: 50, material: null, postage: null, basic: null, @@ -465,7 +493,9 @@ export default { skillIds: null, createdAt: null, updatedAt: null, - deletedAt: null + deletedAt: null, + questionsArray: [], // 问答数组 + questions: null, // 问答JSON字符串 } // 重置skuType为默认值 this.skuType = 1; @@ -524,6 +554,24 @@ export default { const id = row.id || this.ids getServiceGoods(id).then(response => { this.form = response.data + + // 处理问答数据 + if (this.form.questions) { + try { + const questionsArray = JSON.parse(this.form.questions); + if (Array.isArray(questionsArray)) { + this.$set(this.form, 'questionsArray', questionsArray); + } else { + this.$set(this.form, 'questionsArray', []); + } + } catch (e) { + console.error('问答数据解析失败:', e); + this.$set(this.form, 'questionsArray', []); + } + } else { + this.$set(this.form, 'questionsArray', []); + } + // 设置skuType，如果没有则默认为1 this.skuType = this.form.skuType || 1; // 如果是单规格且sku有数据，尝试解析 @@ -544,44 +592,57 @@ export default { }, /** 提交按钮 */ submitForm() { - // 设置规格类型 - this.form.skuType = this.skuType; - - // 处理规格信息 - if (this.skuType === 2) { - // 多规格模式 - if (this.$refs.skuRef && this.$refs.skuRef.submit) { - const skuData = this.$refs.skuRef.submit(); - if (!skuData) { - this.$modal.msgError("请完善规格信息"); - return; - } - this.form.sku = typeof skuData === 'string' ? skuData : JSON.stringify(skuData); - } else { - this.$modal.msgError("规格信息不能为空"); - return; - } - } else { - // 单规格模式 - if (!this.form.skuName || !this.form.skuValue) { - this.$modal.msgError("请完善单规格信息"); - return; - } - const singleSku = { - name: this.form.skuName, - value: this.form.skuValue - }; - this.form.sku = JSON.stringify(singleSku); - } - - // 验证sku不能为空 - if (!this.form.sku || this.form.sku === '{}') { - this.$modal.msgError("规格信息不能为空"); - return; - } - this.$refs["form"].validate(valid => { if (valid) { + // 处理问答数据 + if (this.form.questionsArray && Array.isArray(this.form.questionsArray)) { + const validQuestions = this.form.questionsArray.filter(qa => + qa && qa.question && qa.question.trim() && qa.answer && qa.answer.trim() + ).map(qa => ({ + question: qa.question.trim(), + answer: qa.answer.trim() + })); + this.form.questions = validQuestions.length > 0 ? JSON.stringify(validQuestions) : null; + } else { + this.form.questions = null; + } + + // 设置规格类型 + this.form.skuType = this.skuType; + + // 处理规格信息 + if (this.skuType === 2) { + // 多规格模式 + if (this.$refs.skuRef && this.$refs.skuRef.submit) { + const skuData = this.$refs.skuRef.submit(); + if (!skuData) { + this.$modal.msgError("请完善规格信息"); + return; + } + this.form.sku = typeof skuData === 'string' ? skuData : JSON.stringify(skuData); + } else { + this.$modal.msgError("规格信息不能为空"); + return; + } + } else { + // 单规格模式 + if (!this.form.skuName || !this.form.skuValue) { + this.$modal.msgError("请完善单规格信息"); + return; + } + const singleSku = { + name: this.form.skuName, + value: this.form.skuValue + }; + this.form.sku = JSON.stringify(singleSku); + } + + // 验证sku不能为空 + if (!this.form.sku || this.form.sku === '{}') { + this.$modal.msgError("规格信息不能为空"); + return; + } + if (this.form.id != null) { updateServiceGoods(this.form).then(response => { this.$modal.msgSuccess("修改成功"); @@ -726,6 +787,125 @@ export default { removeSkuImage(idx) { this.$set(this.skuTable[idx], 'imageUrl', ''); }, + // 添加问答 + addQuestion() { + if (!this.form.questionsArray) { + this.$set(this.form, 'questionsArray', []); + } + this.form.questionsArray.push({ + question: '', + answer: '' + }); + }, + + // 删除问答 + removeQuestion(index) { + this.form.questionsArray.splice(index, 1); + // 删除后延迟触发保存 + this.handleQuestionChange(); + }, + + // 静默保存方法 + async silentSave() { + try { + // 验证是否有有效的问答数据需要保存 + if (!this.form.questionsArray || !Array.isArray(this.form.questionsArray)) { + return; + } + + // 如果是新增状态，不进行静默保存 + if (!this.form.id) { + return; + } + + // 过滤出有效的问答数据（问题和答案都不为空） + const validQuestions = this.form.questionsArray.filter(qa => + qa && qa.question && qa.question.trim() && qa.answer && qa.answer.trim() + ).map(qa => ({ + question: qa.question.trim(), + answer: qa.answer.trim() + })); + + // 准备保存的数据 + const submitData = { + id: this.form.id, + questions: JSON.stringify(validQuestions) + }; + + // 调用更新接口 + await updateServiceGoods(submitData); + } catch (error) { + console.error('问答数据静默保存失败:', error); + } + }, + + // 监听问答数据变化 + handleQuestionChange() { + // 使用防抖进行静默保存 + if (this.saveTimeout) { + clearTimeout(this.saveTimeout); + } + this.saveTimeout = setTimeout(() => { + this.silentSave(); + }, 1000); // 1秒后进行保存 + }, } } + + diff --git a/ruoyi-ui/src/views/system/ServiceGoods/index.vue b/ruoyi-ui/src/views/system/ServiceGoods/index.vue index a17c3b8..4b709e2 100644 --- a/ruoyi-ui/src/views/system/ServiceGoods/index.vue +++ b/ruoyi-ui/src/views/system/ServiceGoods/index.vue @@ -376,6 +376,18 @@ style="width: 200px" /> + + + + + {{dict.label}} + + + + + +
+
+ 添加问答 +
+
+
+ 问答 #{{index + 1}} + 删除 +
+ + + + + + + + + + + + + +
+
+
@@ -524,7 +563,7 @@ import Editor from '@/components/Editor' export default { name: "ServiceGoods", - dicts: ['service_goods_status', 'fixed', 'service_commissiontype', 'service_dispatch'], + dicts: ['service_goods_status', 'fixed', 'service_commissiontype', 'service_dispatch','servicetype'], components: { Editor }, data() { return { @@ -570,7 +609,9 @@ export default { project: null, }, // 表单参数 - form: {}, + form: { + questionsArray: [], // 问答数组 + }, // 表单校验 rules: { title: [ @@ -613,6 +654,7 @@ export default { // 基检现象标签相关 showBasicInput: false, newBasicTag: '', + saveTimeout: null, // 用于防抖的定时器 } }, created() { @@ -686,17 +728,17 @@ export default { skuValue: '', latitude: null, longitude: null, - type: 1, // 默认为服务类型 + type: 1, cateId: null, project: null, - sort: 50, // 默认排序值 + sort: 50, material: null, postage: null, basic: null, - basicArray: [], // 基检现象数组 + basicArray: [], margin: null, skillIds: null, - skillIdsArray: [], // 重置技能数组 + skillIdsArray: [], isgroup: 2, groupprice: null, isonce: null, @@ -705,12 +747,15 @@ export default { commission: null, dispatchtype: 1, workerids: null, + servicetype: 1, groupnum: 0, isfixed: 2, fixedprice: null, createdAt: null, updatedAt: null, - deletedAt: null + deletedAt: null, + questionsArray: [], // 问答数组 + questions: null, // 问答JSON字符串 } // 使用Vue.set确保响应式 this.$set(this.form, 'skillIdsArray', []); @@ -787,6 +832,8 @@ export default { this.newBasicTag = ''; // workerids 处理，新增时为空 this.form.workerids = []; + // 初始化问答数组 + this.$set(this.form, 'questionsArray', []); console.log('新增时初始化form:', this.form); // 验证技能列表是否已加载 @@ -853,8 +900,24 @@ export default { ]).then(([serviceResponse, skillData]) => { this.form = serviceResponse.data console.log('编辑数据:', this.form); - console.log('技能列表数据:', skillData); - console.log('原始基检现象数据:', this.form.basic); + + // 处理问答数据 + if (this.form.questions) { + try { + const questionsArray = JSON.parse(this.form.questions); + if (Array.isArray(questionsArray)) { + this.$set(this.form, 'questionsArray', questionsArray); + } else { + this.$set(this.form, 'questionsArray', []); + } + } catch (e) { + console.error('问答数据解析失败:', e); + this.$set(this.form, 'questionsArray', []); + } + } else { + this.$set(this.form, 'questionsArray', []); + } + // 处理技能ID转换：将JSON字符串或数组转为数组 if (this.form.skillIds) { try { @@ -1024,6 +1087,19 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { + // 处理问答数据 + if (this.form.questionsArray && Array.isArray(this.form.questionsArray)) { + const validQuestions = this.form.questionsArray.filter(qa => + qa && qa.question && qa.question.trim() && qa.answer && qa.answer.trim() + ).map(qa => ({ + question: qa.question.trim(), + answer: qa.answer.trim() + })); + this.form.questions = validQuestions.length > 0 ? JSON.stringify(validQuestions) : null; + } else { + this.form.questions = null; + } + // 设置规格类型 this.form.skuType = this.skuType; @@ -1448,6 +1524,79 @@ export default { return '-' } }, + + // 添加问答 + addQuestion() { + // 先保存现有数据 + this.silentSave().then(() => { + if (!this.form.questionsArray) { + this.$set(this.form, 'questionsArray', []); + } + this.form.questionsArray.push({ + question: '', + answer: '' + }); + }); + }, + + // 删除问答 + removeQuestion(index) { + this.form.questionsArray.splice(index, 1); + // 删除后也进行静默保存 + this.silentSave(); + }, + + // 静默保存方法 + async silentSave() { + try { + // 验证是否有有效的问答数据需要保存 + if (!this.form.questionsArray || !Array.isArray(this.form.questionsArray)) { + return; + } + + // 过滤出有效的问答数据（问题和答案都不为空） + const validQuestions = this.form.questionsArray.filter(qa => + qa && qa.question && qa.question.trim() && qa.answer && qa.answer.trim() + ).map(qa => ({ + question: qa.question.trim(), + answer: qa.answer.trim() + })); + + // 如果没有有效数据，不进行保存 + if (validQuestions.length === 0) { + return; + } + + // 如果是新增状态，不进行静默保存 + if (!this.form.id) { + return; + } + + // 准备保存的数据 + const submitData = { + id: this.form.id, + questions: JSON.stringify(validQuestions) + }; + + // 调用更新接口 + await updateServiceGoods(submitData); + console.log('问答数据静默保存成功'); + } catch (error) { + console.error('问答数据静默保存失败:', error); + // 静默保存失败不提示用户，保持静默 + } + }, + + // 监听问答数据变化 + handleQuestionChange() { + // 使用防抖进行静默保存 + if (this.saveTimeout) { + clearTimeout(this.saveTimeout); + } + this.saveTimeout = setTimeout(() => { + this.silentSave(); + }, 1000); // 1秒后进行保存 + }, } } @@ -1473,4 +1622,59 @@ export default { .basic-tags-container .el-tag:hover { transform: scale(1.05); } + +/* 问答样式 */ +.qa-container { + padding: 5px; +} + +.qa-header { + margin-bottom: 15px; +} + +.qa-item { + margin-bottom: 10px; + padding: 10px; + border: 1px solid #EBEEF5; + border-radius: 4px; + background-color: #fafafa; +} + +.qa-item:hover { + box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); +} + +.qa-item-header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 10px; +} + +.qa-index { + font-size: 14px; + font-weight: bold; + color: #606266; +} + +.qa-item :deep(.el-form-item) { + margin-bottom: 10px; +} + +.qa-item :deep(.el-form-item__label) { + padding: 0 5px 0 0; + line-height: 32px; +} + +.qa-item :deep(.el-form-item__content) { + line-height: 32px; +} + +.qa-item :deep(.el-textarea__inner) { + padding: 5px 8px; +} + +.qa-item :deep(.el-divider--horizontal) { + margin: 10px 0; +} diff --git a/ruoyi-ui/src/views/system/SiteConfig/index.vue b/ruoyi-ui/src/views/system/SiteConfig/index.vue index 757c1e4..6464749 100644 --- a/ruoyi-ui/src/views/system/SiteConfig/index.vue +++ b/ruoyi-ui/src/views/system/SiteConfig/index.vue @@ -177,6 +177,75 @@ + + + + + + + + + + + + + + 提交 + 重置 + + + + + + + + + 保存全部配置
@@ -184,6 +253,7 @@ + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/system/UserSecondaryCard/index.vue b/ruoyi-ui/src/views/system/UserSecondaryCard/index.vue new file mode 100644 index 0000000..ccd9fa4 --- /dev/null +++ b/ruoyi-ui/src/views/system/UserSecondaryCard/index.vue @@ -0,0 +1,454 @@ + + + diff --git a/ruoyi-ui/src/views/system/UserUseSecondaryCard/index.vue b/ruoyi-ui/src/views/system/UserUseSecondaryCard/index.vue new file mode 100644 index 0000000..cf8b19e --- /dev/null +++ b/ruoyi-ui/src/views/system/UserUseSecondaryCard/index.vue @@ -0,0 +1,348 @@ + + +