'1'

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

@@ -3,13 +3,20 @@ 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.domain.entity.SysRole;
+import com.miaxis.common.core.domain.entity.SysUser;
+import com.miaxis.common.core.domain.vo.AgentVO;
 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.SecurityUtils;
 import com.miaxis.common.utils.StringUtils;
+import com.miaxis.system.service.ISysRoleService;
+import com.miaxis.system.service.ISysUserService;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.PcWxOrderListDTO;
+import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.dto.WxNotifyReturnDTO;
 import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxOrderService;
@@ -44,6 +51,12 @@ class PcWxController extends BaseController {
     @Autowired
     private IRefundRecordService refundRecordService;
 
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
 
 
 
@@ -80,6 +93,39 @@ class PcWxController extends BaseController {
     }
 
 
+    @GetMapping("/order/school/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:order:schoolList')")
+    public ResponsePageInfo<WxOrder> schoolList(@ModelAttribute QuerySchoolOrderListDTO dto){
+        startPage();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        dto.setReferralUserId(user.getUserId()==1l? dto.getReferralUserId(): user.getUserId());
+        List<WxOrder> list = wxOrderService.QuerySchoolOrderList(dto);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 查询驾校列表
+     */
+    @PreAuthorize("@ss.hasPermi('activities:order:schoolList')")
+    @GetMapping("/schoolList")
+    @ApiOperation("查询驾校列表")
+    public Response<List<AgentVO>> agentList(String schoolName){
+        SysRole sysRole = new SysRole();
+        sysRole.setRoleKey("school");
+        List<SysRole> sysRoles = roleService.selectRoleList(sysRole);
+        Long roleId = sysRoles.get(0).getRoleId();
+        List<AgentVO> sysUsersList =  userService.getAgentList(roleId,schoolName);
+        return Response.success(sysUsersList);
+    }
+
+
+
 
 
 

jkt-service/src/main/java/com/miaxis/wx/dto/QuerySchoolOrderListDTO.java

@@ -0,0 +1,33 @@
+package com.miaxis.wx.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+
+ */
+@Data
+@ApiModel(value = "QuerySchoolOrderListDTO", description = "驾校订单查询参数对象")
+public class QuerySchoolOrderListDTO extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "开始时间，格式yyyyMMdd")
+//    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private String startTime;
+
+
+    @ApiModelProperty(value = "结束时间，格式yyyyMMdd")
+//    @JsonFormat(pattern="yyyyMMdd",timezone = "GMT+8")
+    private String endTime;
+
+    @ApiModelProperty(value = "推荐驾校id")
+    private Long referralUserId;
+
+
+}

jkt-service/src/main/java/com/miaxis/wx/mapper/WxOrderMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.wx.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.PcWxOrderListDTO;
+import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.dto.WxOrderListDTO;
 
 import java.util.List;
@@ -27,4 +28,6 @@ public interface WxOrderMapper extends BaseMapper<WxOrder> {
     List<WxOrder> selectOrderList(WxOrderListDTO wxOrderListDTO);
 
     List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO);
+
+    List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
 }

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

@@ -22,4 +22,5 @@ public interface IWxOrderService extends IService<WxOrder>{
     List<WxOrder> selectPcOrderList(PcWxOrderListDTO pcWxOrderListDTO);
 
 
+    List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
 }

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

@@ -5,6 +5,7 @@ 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.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.mapper.WxOrderMapper;
 import com.miaxis.wx.service.IRefundRecordService;
 import com.miaxis.wx.service.IWxOrderService;
@@ -56,5 +57,10 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         return wxOrderMapper.selectPcOrderList(pcWxOrderListDTO);
     }
 
+    @Override
+    public List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto) {
+        return wxOrderMapper.QuerySchoolOrderList(dto);
+    }
+
 
 }

jkt-service/src/main/resources/mapper/wx/WxOrderMapper.xml

@@ -112,4 +112,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
+
+    <select id="QuerySchoolOrderList" resultType="com.miaxis.wx.domain.WxOrder">
+        select * from wx_order
+        where trade_state ='SUCCESS'
+        <if test="referralUserId != null  and referralUserId != ''">
+            and  referral_user_id = #{referralUserId}
+        </if>
+        <if test="startTime != null">
+            and DATE_FORMAT(create_time,'%Y-%m-%d')<![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null">
+            and DATE_FORMAT(create_time,'%Y-%m-%d') <![CDATA[ < ]]> #{endTime}
+        </if>
+        order by create_time desc
+    </select>
+
 </mapper>