退款管理和驾校报表

jsjp-admin/src/main/java/com/miaxis/app/controller/order/OrderInfoController.java

@@ -2,23 +2,21 @@ package com.miaxis.app.controller.order;
 
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
-import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.order.domain.OrderInfo;
-import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.service.IOrderInfoService;
-import com.miaxis.order.vo.QuerySchoolOrderListVo;
-import com.miaxis.wx.domain.WxJsOrder;
-import com.miaxis.wx.service.IRefundRecordService;
-import com.miaxis.wx.service.IWxJsOrderService;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
-
 /**
  * 【订单信息】Controller
  *
@@ -31,11 +29,7 @@ import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 public class OrderInfoController extends BaseController{
     @Autowired
     private IOrderInfoService orderInfoService;
-    @Autowired
-    private IWxJsOrderService wxJsOrderService;
 
-    @Autowired
-    private IRefundRecordService refundRecordService;
 
     /**
      * 查询订单信息列表
@@ -53,55 +47,10 @@ public class OrderInfoController extends BaseController{
     }
 
 
-    /**
-     * 查询驾校订单
-     */
-    @GetMapping("/school/list")
-    @ApiOperation("查询驾校报表信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuerySchoolOrderListVo> list(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO) {
-        startPage();
-        List<QuerySchoolOrderListVo> list = orderInfoService.selectSchoolOrderInfoList(schoolOrderListDTO);
-        return toResponsePageInfo(list);
-
 
-    }
 
-        /**
-         * 发起退款
-         */
-    @PutMapping(value = "/refund/{outTradeNo}")
-    @ApiOperation("发起退款")
-    public Response<OrderInfo> refund(
-            @ApiParam(name = "outTradeNo", value = "订单信息参数", required = true)
-            @PathVariable("outTradeNo") String outTradeNo
-    ) throws Exception {
-        String refundCode = getOrderCode(null);
-        WxJsOrder order = wxJsOrderService.getByOutTradeNo(outTradeNo);
-        refundRecordService.refund(order,refundCode,"极速驾培退款");
-        //todo 取消会员
-        return Response.success();
-    }
 
 
-    /**
-     * 驾校报表
-     */
-    @PutMapping(value = "/school/report")
-    @ApiOperation("发起退款")
-    public Response<OrderInfo> report(
-            @ApiParam(name = "outTradeNo", value = "订单信息参数", required = true)
-            @PathVariable("outTradeNo") String outTradeNo
-    ) throws Exception {
-        String refundCode = getOrderCode(null);
-        WxJsOrder order = wxJsOrderService.getByOutTradeNo(outTradeNo);
-        refundRecordService.refund(order,refundCode,"极速驾培退款");
-        //todo 取消会员
-        return Response.success();
-    }
 
 
 

jsjp-admin/src/main/java/com/miaxis/pc/PcOrderInfoController.java

@@ -4,13 +4,20 @@ import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.QuerySchoolOrderListVo;
+import com.miaxis.wx.domain.WxJsOrder;
+import com.miaxis.wx.service.IRefundRecordService;
+import com.miaxis.wx.service.IWxJsOrderService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
 /**
  * 【订单信息】Controller
  *
@@ -23,6 +30,11 @@ import java.util.List;
 public class PcOrderInfoController extends BaseController{
     @Autowired
     private IOrderInfoService orderInfoService;
+    @Autowired
+    private IWxJsOrderService wxJsOrderService;
+
+    @Autowired
+    private IRefundRecordService refundRecordService;
 
     /**
      * 查询订单信息列表
@@ -52,6 +64,39 @@ public class PcOrderInfoController extends BaseController{
         return Response.success(orderInfoService.getById(id));
     }
 
+    /**
+     * 查询驾校订单
+     */
+    @GetMapping("/school/list")
+    @ApiOperation("查询驾校报表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<QuerySchoolOrderListVo> list(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO) {
+        startPage();
+        List<QuerySchoolOrderListVo> list = orderInfoService.selectSchoolOrderInfoList(schoolOrderListDTO);
+        return toResponsePageInfo(list);
+
+
+    }
+
+    /**
+     * 发起退款
+     */
+    @PutMapping(value = "/refund/{outTradeNo}")
+    @ApiOperation("发起退款")
+    public Response<OrderInfo> refund(
+            @ApiParam(name = "outTradeNo", value = "订单信息参数", required = true)
+            @PathVariable("outTradeNo") String outTradeNo
+    ) throws Exception {
+        String refundCode = getOrderCode(null);
+        WxJsOrder order = wxJsOrderService.getByOutTradeNo(outTradeNo);
+        refundRecordService.refund(order,refundCode,"极速驾培退款");
+        //todo 取消会员
+        return Response.success();
+    }
+
 
 
 }