'1'

jkt-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -77,8 +77,8 @@ public class WxController extends BaseController {
 
 
 
-//
-//
+
+
 //    @GetMapping("/order/list")
 //    @ApiOperation("查询订单列表")
 //    @ApiImplicitParams({

jkt-admin/src/main/java/com/miaxis/pc/controller/wx/PcWxController.java

@@ -0,0 +1,94 @@
+package com.miaxis.pc.controller.wx;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.enums.OrderStatusEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.StringUtils;
+import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.PcWxOrderListDTO;
+import com.miaxis.wx.dto.WxNotifyReturnDTO;
+import com.miaxis.wx.service.IRefundRecordService;
+import com.miaxis.wx.service.IWxOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
+
+/**
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/activities/wx")
+@Api(tags = {"【pc-订单】"})
+@Slf4j
+class PcWxController extends BaseController {
+
+
+
+    @Autowired
+    private IWxOrderService wxOrderService;
+
+    @Autowired
+    private IRefundRecordService refundRecordService;
+
+
+
+
+    @GetMapping("/order/list")
+    @ApiOperation("查询订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    @PreAuthorize("@ss.hasPermi('activities:phoneBill:list')")
+    public ResponsePageInfo<WxOrder> list(@ModelAttribute PcWxOrderListDTO pcWxOrderListDTO){
+        startPage();
+        List<WxOrder> list = wxOrderService.selectPcOrderList(pcWxOrderListDTO);
+        return toResponsePageInfo(list);
+    }
+
+
+
+    /**
+     * 订单退款
+     */
+    @PreAuthorize("@ss.hasPermi('activities:phoneBill:refund')")
+    @Log(title = "订单退款", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("订单退款")
+    public Response refund(String outTradeNo) throws Exception {
+        if (StringUtils.isEmpty(outTradeNo)){
+            throw new CustomException("订单号必传");
+        }
+        WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);
+        String refundCode = getOrderCode(null);
+        refundRecordService.refund(wxOrder, refundCode, "学车会员退款");
+        return Response.success();
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

jkt-service/src/main/java/com/miaxis/wx/service/IWxOrderService.java

@@ -19,5 +19,7 @@ public interface IWxOrderService extends IService<WxOrder>{
 
     WxOrder getByOutTradeNo(String outTradeNo);
 
+    List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO);
+
 
 }

jkt-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -4,13 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.enums.OrderStatusEnum;
 import com.miaxis.system.service.ISysConfigService;
 import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.PcWxOrderListDTO;
 import com.miaxis.wx.mapper.WxOrderMapper;
+import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 电影订单Service业务层处理
@@ -29,6 +32,10 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     private ISysConfigService configService;
 
 
+    @Autowired
+    private IRefundRecordService refundRecordService;
+
+
 
     @Override
     public void createVipOrder(WxOrder wxOrder) {
@@ -43,4 +50,11 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     public WxOrder getByOutTradeNo(String outTradeNo) {
         return wxOrderMapper.getByOutTradeNo(outTradeNo);
     }
+
+    @Override
+    public List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO) {
+        return wxOrderMapper.selectPcOrderList(pcWxOrderListDTO);
+    }
+
+
 }