diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java index b6fa6ff..9667b75 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/CounselorController.java @@ -107,7 +107,7 @@ public class CounselorController extends BaseController { } /** - * 查询心理咨询师列表 + * 查询心理咨询师预约列表 */ @SaCheckPermission("counselor:reservation:list") @GetMapping("/reservation/list") diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java new file mode 100644 index 0000000..a239e58 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ReservationRefundController.java @@ -0,0 +1,68 @@ +package org.dromara.scale.controller; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.ReservationRefundBo; +import org.dromara.scale.domain.vo.ReservationRefundVo; +import org.dromara.scale.service.IReservationRefundService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 预约退款 + * + * @author cjw + * @date 2024-10-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/scale/reservationRefund") +public class ReservationRefundController extends BaseController { + + private final IReservationRefundService reservationRefundService; + + /** + * 查询预约退款列表 + */ + @SaCheckPermission("reservation:refund:list") + @GetMapping("/list") + public TableDataInfo list(ReservationRefundBo bo, PageQuery pageQuery) { + return reservationRefundService.queryPageList(bo, pageQuery); + } + + /** + * 导出预约退款列表 + */ + @SaCheckPermission("reservation:refund:export") + @Log(title = "预约退款", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(ReservationRefundBo bo, HttpServletResponse response) { + List list = reservationRefundService.queryList(bo); + ExcelUtil.exportExcel(list, "预约退款", ReservationRefundVo.class, response); + } + + /** + * 获取预约退款详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("reservation:refund:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(reservationRefundService.queryById(id)); + } + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java index c52a84b..bb45852 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxMyController.java @@ -76,6 +76,7 @@ public class WxMyController extends BaseController { */ @GetMapping("/intervene/pageList") public TableDataInfo list(ReservationOrderBo bo, PageQuery pageQuery) { + bo.setOrderStatus(2); return myService.queryReservationPageList(bo, pageQuery); } @@ -95,6 +96,14 @@ public class WxMyController extends BaseController { return myService.queryPersonalEvaluationRecordPageList(pageQuery); } + /** + * 查询我的咨询 + */ + @GetMapping("/reservation/pageList") + public TableDataInfo reservationList(ReservationOrderBo bo,PageQuery pageQuery) { + return myService.queryReservationPageList(bo, pageQuery); + } + /** * 获取档案静态列表 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java index 42ca3e2..77cd7d7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxOrderController.java @@ -14,10 +14,12 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.scale.domain.bo.ReservationOrderBo; +import org.dromara.scale.domain.bo.ReservationRefundBo; import org.dromara.scale.domain.bo.SysScaleOrderBo; import org.dromara.scale.domain.vo.ReservationOrderVo; import org.dromara.scale.domain.vo.SysScaleOrderVo; import org.dromara.scale.service.IReservationOrderService; +import org.dromara.scale.service.IReservationRefundService; import org.dromara.scale.service.ISysScaleOrderService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,6 +38,7 @@ public class WxOrderController extends BaseController { private final ISysScaleOrderService scaleOrderService; private final IReservationOrderService reservationOrderService; + private final IReservationRefundService reservationRefundService; /** * 查询量表订单列表 @@ -114,4 +117,19 @@ public class WxOrderController extends BaseController { @PathVariable Long id) { return R.ok(reservationOrderService.queryById(id)); } + + /** + * 退款申请 + * + * @param bo + * @return + */ + @Log(title = "退款申请", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/reservation/refund") + public R addRefund(@RequestBody ReservationRefundBo bo) throws Exception { + return toAjax(reservationRefundService.insertByBo(bo)); + } } + + diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java index 5c93819..b17f6aa 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxPayController.java @@ -41,16 +41,14 @@ public class WxPayController { public String parseScaleNotifyResult(@RequestBody String xmlData) throws WxPayException { log.info("---------量表支付回调-----------------"); final WxPayOrderNotifyResult notifyResult = this.payService.parseOrderNotifyResult(xmlData); - String outTradeNo = notifyResult.getOutTradeNo(); - scaleOrderService.processOrder(outTradeNo); + scaleOrderService.processOrder(notifyResult); return WxPayNotifyResponse.success("成功"); } @PostMapping("/notify/order/reservation") public String parseReservationNotifyResult(@RequestBody String xmlData) throws WxPayException { final WxPayOrderNotifyResult notifyResult = this.payService.parseOrderNotifyResult(xmlData); - String outTradeNo = notifyResult.getOutTradeNo(); - reservationOrderService.processOrder(outTradeNo); + reservationOrderService.processOrder(notifyResult); return WxPayNotifyResponse.success("成功"); } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java index 6ac0dbc..34c5057 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationOrder.java @@ -23,7 +23,7 @@ public class ReservationOrder extends BaseEntity { private static final long serialVersionUID = 1L; /** - * + * */ @TableId(value = "id") private Long id; @@ -38,6 +38,8 @@ public class ReservationOrder extends BaseEntity { */ private Long counselorId; + private String transactionId; + /** * 订单价格 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java new file mode 100644 index 0000000..89e9e42 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/ReservationRefund.java @@ -0,0 +1,51 @@ +package org.dromara.scale.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 预约退款对象 m_reservation_refund + * + * @author cjw + * @date 2024-10-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("m_reservation_refund") +public class ReservationRefund extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + + /** + * 订单号 + */ + private Long orderId; + + /** + * 申请人 + */ + private Long userId; + + /** + * 退款原因 + */ + private String refundDesc; + + /** + * 退款状态 + */ + private Integer status; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java index 6973045..91bc2cc 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/SysScaleOrder.java @@ -35,6 +35,8 @@ public class SysScaleOrder extends TenantEntity { private Long recordId; + private String transactionId; + /** * 订单价格 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java new file mode 100644 index 0000000..71e3d47 --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/ReservationRefundBo.java @@ -0,0 +1,54 @@ +package org.dromara.scale.domain.bo; + +import org.dromara.scale.domain.ReservationRefund; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 预约退款业务对象 m_reservation_refund + * + * @author cjw + * @date 2024-10-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ReservationRefund.class, reverseConvertGenerate = false) +public class ReservationRefundBo extends BaseEntity { + + /** + * + */ + @NotNull(message = "不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 订单号 + */ + @NotNull(message = "订单号不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long orderId; + + /** + * 申请人 + */ + @NotNull(message = "申请人不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long userId; + + /** + * 退款原因 + */ + @NotBlank(message = "退款原因不能为空", groups = { AddGroup.class, EditGroup.class }) + private String refundDesc; + + /** + * 退款状态 + */ + @NotNull(message = "退款状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java index ccf672b..b84b4df 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationOrderVo.java @@ -45,6 +45,8 @@ public class ReservationOrderVo implements Serializable { @AutoMapping(target = "counselorId") private Long counselorName; + private String transactionId; + /** * 订单价格 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationRefundVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationRefundVo.java new file mode 100644 index 0000000..6bf926e --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/ReservationRefundVo.java @@ -0,0 +1,58 @@ +package org.dromara.scale.domain.vo; + +import org.dromara.scale.domain.ReservationRefund; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * 预约退款视图对象 m_reservation_refund + * + * @author cjw + * @date 2024-10-15 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = ReservationRefund.class) +public class ReservationRefundVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * + */ + @ExcelProperty(value = "") + private Long id; + + /** + * 订单号 + */ + @ExcelProperty(value = "订单号") + private Long orderId; + + /** + * 申请人 + */ + @ExcelProperty(value = "申请人") + private Long userId; + + /** + * 退款原因 + */ + @ExcelProperty(value = "退款原因") + private String refundDesc; + + /** + * 退款状态 + */ + @ExcelProperty(value = "退款状态") + private Integer status; + + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationRefundMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationRefundMapper.java new file mode 100644 index 0000000..f8ac6cc --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/ReservationRefundMapper.java @@ -0,0 +1,17 @@ +package org.dromara.scale.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.dromara.scale.domain.ReservationRefund; +import org.dromara.scale.domain.vo.ReservationRefundVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 预约退款Mapper接口 + * + * @author cjw + * @date 2024-10-15 + */ +@Mapper +public interface ReservationRefundMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java index d7563e4..d6af4d9 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationOrderService.java @@ -1,5 +1,6 @@ package org.dromara.scale.service; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -49,6 +50,7 @@ public interface IReservationOrderService { */ WxPayMpOrderResult insertByBo(ReservationOrderBo bo) throws Exception; - Boolean processOrder(String orderId); + Boolean processOrder(WxPayOrderNotifyResult notifyResult); + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationRefundService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationRefundService.java new file mode 100644 index 0000000..556c2bd --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IReservationRefundService.java @@ -0,0 +1,59 @@ +package org.dromara.scale.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.scale.domain.bo.ReservationRefundBo; +import org.dromara.scale.domain.vo.ReservationRefundVo; + +import java.util.List; + +/** + * 预约退款Service接口 + * + * @author cjw + * @date 2024-10-15 + */ +public interface IReservationRefundService { + + /** + * 查询预约退款 + * + * @param id 主键 + * @return 预约退款 + */ + ReservationRefundVo queryById(Long id); + + /** + * 分页查询预约退款列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 预约退款分页列表 + */ + TableDataInfo queryPageList(ReservationRefundBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的预约退款列表 + * + * @param bo 查询条件 + * @return 预约退款列表 + */ + List queryList(ReservationRefundBo bo); + + /** + * 新增预约退款 + * + * @param bo 预约退款 + * @return 是否新增成功 + */ + Boolean insertByBo(ReservationRefundBo bo); + + /** + * 修改预约退款 + * + * @param bo 预约退款 + * @return 是否修改成功 + */ + Boolean updateByBo(ReservationRefundBo bo); + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java index 0647cea..48bf73d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/ISysScaleOrderService.java @@ -1,5 +1,6 @@ package org.dromara.scale.service; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -50,7 +51,7 @@ public interface ISysScaleOrderService { WxPayMpOrderResult insertByBo(SysScaleOrderBo bo) throws Exception; - Boolean processOrder(String orderId); + Boolean processOrder(WxPayOrderNotifyResult notifyResult); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java index 194f04a..ebfb49d 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/MyServiceImpl.java @@ -123,7 +123,9 @@ public class MyServiceImpl implements IMyService { public TableDataInfo queryReservationPageList(ReservationOrderBo bo, PageQuery pageQuery) { Long userId = LoginHelper.getUserId(); IPage page = reservationOrderMapper.selectVoPage(pageQuery.build(), - new LambdaQueryWrapper().eq(ReservationOrder::getCreateBy, userId)); + new LambdaQueryWrapper() + .eq(ReservationOrder::getCreateBy, userId) + .eq(bo.getOrderStatus() != null, ReservationOrder::getOrderStatus, bo.getOrderStatus())); return TableDataInfo.build(page); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java index 10577ef..9179a09 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationOrderServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.scale.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.service.WxPayService; @@ -130,7 +131,9 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { } @Override - public Boolean processOrder(String orderId) { + public Boolean processOrder(WxPayOrderNotifyResult notifyResult) { + String orderId = notifyResult.getOutTradeNo(); + String transactionId = notifyResult.getTransactionId(); long id = Long.parseLong(orderId); ReservationOrder reservationOrder = baseMapper.selectById(id); Long timeId = reservationOrder.getTimeId(); @@ -145,8 +148,10 @@ public class ReservationOrderServiceImpl implements IReservationOrderService { ReservationOrder order = new ReservationOrder(); order.setId(id); order.setOrderStatus(1); + order.setTransactionId(transactionId); order.setUpdateBy(userId); boolean orderFlag = baseMapper.updateById(order) > 0; return timeFlag && orderFlag; } + } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationRefundServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationRefundServiceImpl.java new file mode 100644 index 0000000..8ce12cf --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationRefundServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.scale.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.exception.ServiceException; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.scale.domain.ReservationOrder; +import org.dromara.scale.domain.ReservationRefund; +import org.dromara.scale.domain.bo.ReservationRefundBo; +import org.dromara.scale.domain.vo.ReservationRefundVo; +import org.dromara.scale.mapper.ReservationOrderMapper; +import org.dromara.scale.mapper.ReservationRefundMapper; +import org.dromara.scale.service.IReservationRefundService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 预约退款Service业务层处理 + * + * @author cjw + * @date 2024-10-15 + */ +@RequiredArgsConstructor +@Service +public class ReservationRefundServiceImpl implements IReservationRefundService { + + private final ReservationRefundMapper baseMapper; + private final ReservationOrderMapper orderMapper; + + /** + * 查询预约退款 + * + * @param id 主键 + * @return 预约退款 + */ + @Override + public ReservationRefundVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询预约退款列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 预约退款分页列表 + */ + @Override + public TableDataInfo queryPageList(ReservationRefundBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的预约退款列表 + * + * @param bo 查询条件 + * @return 预约退款列表 + */ + @Override + public List queryList(ReservationRefundBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(ReservationRefundBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getOrderId() != null, ReservationRefund::getOrderId, bo.getOrderId()); + lqw.eq(bo.getUserId() != null, ReservationRefund::getUserId, bo.getUserId()); + lqw.eq(StringUtils.isNotBlank(bo.getRefundDesc()), ReservationRefund::getRefundDesc, bo.getRefundDesc()); + lqw.eq(bo.getStatus() != null, ReservationRefund::getStatus, bo.getStatus()); + return lqw; + } + + /** + * 新增预约退款 + * + * @param bo 预约退款 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(ReservationRefundBo bo) { + Long userId = LoginHelper.getUserId(); + ReservationRefund add = MapstructUtils.convert(bo, ReservationRefund.class); + add.setUserId(userId); + validEntityBeforeSave(add); + add.setStatus(0); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改预约退款 + * + * @param bo 预约退款 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(ReservationRefundBo bo) { + ReservationRefund update = MapstructUtils.convert(bo, ReservationRefund.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(ReservationRefund entity){ + Long orderId = entity.getOrderId(); + Long userId = entity.getUserId(); + ReservationOrder order = orderMapper.selectById(orderId); + if(order == null){ + throw new ServiceException("查无订单，请确认后重试"); + } + Long createBy = order.getCreateBy(); + if(!createBy.equals(userId)){ + throw new ServiceException("订单数据异常，请确认后重试"); + } + Integer orderStatus = order.getOrderStatus(); + if (orderStatus != 1) { + throw new ServiceException("订单数据异常，请确认后重试"); + } + } + +} diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java index 77d1ddb..316f811 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScaleOrderServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.scale.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest; import com.github.binarywang.wxpay.service.WxPayService; @@ -143,7 +144,9 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService { } @Override - public Boolean processOrder(String orderId) { + public Boolean processOrder(WxPayOrderNotifyResult notifyResult) { + String orderId = notifyResult.getOutTradeNo(); + String transactionId = notifyResult.getTransactionId(); long id = Long.parseLong(orderId); SysScaleOrder scaleOrder = baseMapper.selectById(id); Long userId = scaleOrder.getCreateBy(); @@ -161,6 +164,7 @@ public class SysScaleOrderServiceImpl implements ISysScaleOrderService { order.setId(id); order.setOrderStatus(1); order.setUpdateBy(userId); + order.setTransactionId(transactionId); boolean orderFlag = baseMapper.updateById(order) > 0; return recordFlag && orderFlag; } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationRefundMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationRefundMapper.xml new file mode 100644 index 0000000..d36b8ea --- /dev/null +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationRefundMapper.xml @@ -0,0 +1,7 @@ + + + + +