ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTicketOrderController.java
@@ -3,7 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.model.*; import com.ruoyi.system.query.TTicketOrderQuery; import com.ruoyi.system.service.*; @@ -86,5 +88,40 @@ return R.ok(tTicketOrderDetailVo); } @ApiOperation(value = "门票退款订单分页列表") @PostMapping(value = "/refundPageList") public R<Page<TTicketOrderVo>> refundPageList(@RequestBody TTicketOrderQuery query) { Page<TTicketOrderVo> page = new Page<>(query.getPageNum(), query.getPageSize()); Page<TTicketOrderVo> pageInfo = tTicketOrderService.refundPageList(page, query); return R.ok(pageInfo); } @ApiOperation(value = "订单退款审核") @PostMapping(value = "/refundAudit") @Log(title = "订单退款审核", businessType = BusinessType.UPDATE) public R<String> refundAudit(@RequestBody TTicketOrder tTicketOrder) { TTicketOrder ticketOrder = tTicketOrderService.getById(tTicketOrder.getId()); if(ticketOrder.getStatus()!=3){ return R.fail("订单状态异常"); } if(tTicketOrder.getStatus()==null ){ return R.fail("订单状态异常"); } if(tTicketOrder.getStatus()<4 || tTicketOrder.getStatus()>5){ return R.fail("订单状态异常"); } ticketOrder.setStatus(tTicketOrder.getStatus()); ticketOrder.setRefundMoney(tTicketOrder.getRefundMoney()); ticketOrder.setHandlingFee(tTicketOrder.getHandlingFee()); ticketOrder.setAuditContent(tTicketOrder.getAuditContent()); tTicketOrderService.updateById(ticketOrder); return R.ok("操作成功"); } } ruoyi-admin/src/main/resources/application-test.yml
@@ -17,7 +17,7 @@ # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 port: 9908 port: 9918 servlet: # 应用的访问路径 context-path: / ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ICBCPayNotifyController.java
@@ -41,6 +41,7 @@ icbcNotifyService.bigGiftPayNotify(request, response); } /** * 大礼包商品尾款支付回调 * @@ -54,6 +55,7 @@ icbcNotifyService.bigGiftFinalPayNotify(request, response); } /** * 实物商品订单支付回调 * ruoyi-common/src/main/java/com/ruoyi/common/core/controller/FileController.java
@@ -40,7 +40,8 @@ } String TimeDir =new SimpleDateFormat("yyyy-MM-dd").format(new Date()); // String realPath = fileUploadConfig.getLocation() + TimeDir; String realPath = "/mnt/file/" + TimeDir; // String realPath = "/mnt/file/" + TimeDir; String realPath = "F:\\file\\ticket\\" + TimeDir; File file = new File(realPath); // 没有目录就创建 if (!file.exists()) { ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTicketOrderMapper.java
@@ -23,4 +23,7 @@ List<TTicketOrderVo> pageList(@Param("page") Page<TTicketOrderVo> page, @Param("query") TTicketOrderQuery query); List<TTicketOrderVo> getOrderList(@Param("page") Page<TTicketOrderVo> page, @Param("query") AppletOrderListQuery query, @Param("userId") Integer userId); List<TTicketOrderVo> refundPageList(@Param("page") Page<TTicketOrderVo> page, @Param("query") TTicketOrderQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/TTicketOrderService.java
@@ -22,4 +22,6 @@ Page<TTicketOrderVo> getOrderList(AppletOrderListQuery query, Integer userId); Page<TTicketOrderVo> refundPageList(Page<TTicketOrderVo> page, TTicketOrderQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTicketOrderServiceImpl.java
@@ -37,4 +37,11 @@ page.setRecords(list); return page; } @Override public Page<TTicketOrderVo> refundPageList(Page<TTicketOrderVo> page, TTicketOrderQuery query) { List<TTicketOrderVo> list = this.baseMapper.refundPageList(page,query); page.setRecords( list); return page; } } ruoyi-system/src/main/resources/mapper/system/TTicketOrderMapper.xml
@@ -53,5 +53,21 @@ </if> order by t1.create_time desc </select> <select id="refundPageList" resultType="com.ruoyi.system.vo.TTicketOrderVo"> select t1.id, t1.order_no, t1.create_time, t2.name userName, t2.phone, t1.order_price, t1.ticket_info, t1.status from t_ticket_order t1 left join t_app_user t2 on t1.app_user_id = t2.id where t1.disabled = 0 and t1.status in (3,4,5) <if test="query.phone != null and query.phone != ''"> and t2.phone like concat('%',#{query.phone},'%') </if> <if test="query.ticket != null and query.ticket != ''"> and t1.ticket_info like concat('%',#{query.ticket},'%') </if> <if test="query.status != null"> and t1.status = #{query.status} </if> order by t1.create_time desc </select> </mapper>