'1'

twzd-admin/src/main/java/com/miaxis/app/controller/extension/WxExtensionIncomeController.java

@@ -4,13 +4,11 @@ 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.domain.entity.UserInfo;
-import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.extension.vo.ExtensionIncomeVo;
-import com.miaxis.extension.vo.WxGzhExtensionIncomeVo;
+import com.miaxis.user.service.IUserInfoService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,29 +30,43 @@ public class WxExtensionIncomeController extends BaseController {
 
     private final IWxExtensionIncomeService extensionIncomeService;
 
-    /**
-     * 查询收益列表
-     */
-    @GetMapping(value = "/extensionIncomeList")
-    @ApiOperation("查询收益列表")
-    @ApiImplicitParam(name = "nickName", value = "微信昵称", dataType = "string", required = false)
-    public ResponsePageInfo<WxGzhExtensionIncomeVo> extensionIncomeList(String nickName) {
-        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        startPage();
-        List<WxGzhExtensionIncomeVo> incomeDtos = extensionIncomeService.extensionIncomeList(userInfo.getOpenid(),nickName);
-        return toResponsePageInfo(incomeDtos);
-    }
+    private final IUserInfoService userInfoService;
+
+//    /**
+//     * 查询收益列表
+//     */
+//    @GetMapping(value = "/extensionIncomeList")
+//    @ApiOperation("查询收益列表")
+//    @ApiImplicitParam(name = "nickName", value = "微信昵称", dataType = "string", required = false)
+//    public ResponsePageInfo<WxGzhExtensionIncomeVo> extensionIncomeList(String nickName) {
+//        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+//        startPage();
+//        List<WxGzhExtensionIncomeVo> incomeDtos = extensionIncomeService.extensionIncomeList(userInfo.getOpenid(),nickName);
+//        return toResponsePageInfo(incomeDtos);
+//    }
+
+
+//    /**
+//     * 查询收益金额（总金额、已提现金额、未提现金额）
+//     */
+//    @GetMapping(value = "/extensionIncomePrice")
+//    @ApiOperation("查询收益金额（总金额、已提现金额、未提现金额）")
+//    public Response<ExtensionIncomeVo> extensionIncomePrice() {
+//        UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
+//        ExtensionIncomeVo incomePrice = extensionIncomeService.extensionIncomePrice(userInfo.getOpenid());
+//        return Response.success(incomePrice);
+//    }
 
 
     /**
-     * 查询收益金额（总金额、已提现金额、未提现金额）
+     * 查询下级推广积分
      */
-    @GetMapping(value = "/extensionIncomePrice")
-    @ApiOperation("查询收益金额（总金额、已提现金额、未提现金额）")
-    public Response<ExtensionIncomeVo> extensionIncomePrice() {
+    @GetMapping(value = "/extensionPoints")
+    @ApiOperation("查询下级推广积分")
+    public Response<List<ExtensionIncomeVo>> getDownLevelPoints() {
         UserInfo userInfo = SecurityUtils.getLoginUser().getStudent();
-        ExtensionIncomeVo incomePrice = extensionIncomeService.extensionIncomePrice(userInfo.getOpenid());
-        return Response.success(incomePrice);
+        List<ExtensionIncomeVo> list = userInfoService.getDownLevelPoints(userInfo.getOpenid());
+        return Response.success(list);
     }
 
 

twzd-admin/src/main/java/com/miaxis/app/controller/wx/WxExtractController.java

@@ -0,0 +1,52 @@
+package com.miaxis.app.controller.wx;
+
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.wx.domain.WxExtract;
+import com.miaxis.wx.service.IWxExtractService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 【微信提现】Controller
+ *
+ * @author miaxis
+ * @date 2022-01-24
+ */
+@RestController
+@RequestMapping("/wx/extract")
+@Api(tags={"【H5-微信提现】"})
+public class WxExtractController extends BaseController{
+    @Autowired
+    private IWxExtractService wxExtractService;
+
+    /**
+     * 查询微信提现列表
+     */
+    @GetMapping("/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<WxExtract> list(){
+        WxExtract wxExtract = new WxExtract();
+        wxExtract.setOpenid(SecurityUtils.getLoginUser().getStudent().getOpenid());
+        startPage();
+        List<WxExtract> list = wxExtractService.selectWxExtractList(wxExtract);
+        return toResponsePageInfo(list);
+    }
+
+
+
+
+}

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

@@ -0,0 +1,119 @@
+package com.miaxis.pc.controller.wx;
+
+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.page.ResponsePageInfo;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.system.service.ISysRoleService;
+import com.miaxis.system.service.ISysUserService;
+import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
+import com.miaxis.wx.service.IRefundRecordService;
+import com.miaxis.wx.service.IWxOrderService;
+import com.miaxis.common.core.domain.vo.AgentVO;
+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.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;
+
+/**
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/activities/wx")
+@Api(tags = {"【pc-驾校订单】"})
+@Slf4j
+class PcWxController extends BaseController {
+
+
+
+    @Autowired
+    private IWxOrderService wxOrderService;
+
+    @Autowired
+    private IRefundRecordService refundRecordService;
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysRoleService roleService;
+
+
+
+//
+//    @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:order:list')")
+//    public ResponsePageInfo<WxOrder> list(@ModelAttribute PcWxOrderListDTO pcWxOrderListDTO){
+//        startPage();
+//        List<WxOrder> list = wxOrderService.selectPcOrderList(pcWxOrderListDTO);
+//        return toResponsePageInfo(list);
+//    }
+
+
+
+
+
+
+    @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('wx:order:list')")
+    public ResponsePageInfo<WxOrder> schoolList(@ModelAttribute QuerySchoolOrderListDTO dto){
+        startPage();
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        dto.setSchoolName(user.getUserId()==1l? dto.getSchoolName(): user.getNickName());
+        List<WxOrder> list = wxOrderService.QuerySchoolOrderList(dto);
+        return toResponsePageInfo(list);
+    }
+
+
+    /**
+     * 查询驾校列表
+     */
+    @PreAuthorize("@ss.hasPermi('wx:order:list')")
+    @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);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

twzd-common/src/main/java/com/miaxis/common/core/domain/vo/AgentVO.java

@@ -0,0 +1,28 @@
+package com.miaxis.common.core.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class AgentVO {
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(value = "user_id")
+    @ApiModelProperty(value = "主键")
+    private Long userId;
+
+
+
+    @TableField("user_name")
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+
+
+
+
+}

twzd-service/src/main/java/com/miaxis/extension/vo/ExtensionExtractVo.java

@@ -0,0 +1,29 @@
+package com.miaxis.extension.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 分成收益对象返回参
+ * @author wwl
+ * @version 1.0
+ * @date 2021/11/26 10:33
+ */
+@Data
+@ApiModel(value = "ExtensionIncomeVo", description = "分成收益对象返回参")
+public class ExtensionExtractVo {
+
+    @TableField("nick_name")
+    @ApiModelProperty(value = "微信昵称")
+    private String nickName;
+
+    @TableField("head_image")
+    @ApiModelProperty(value = "微信头像地址")
+    private String headImage;
+
+    @ApiModelProperty(value = "推广积分")
+    private Integer achievement;
+
+}

twzd-service/src/main/java/com/miaxis/extension/vo/ExtensionIncomeVo.java

@@ -23,17 +23,7 @@ public class ExtensionIncomeVo {
     @ApiModelProperty(value = "微信头像地址")
     private String headImage;
 
-    @TableField("beneficiary_openid")
-    @ApiModelProperty(value = "受益人----用户唯一标识(微信)")
-    private String beneficiaryOpenid;
-
-    @ApiModelProperty(value = "总收益金额(分)")
-    private Integer totalPrice;
-
-    @ApiModelProperty(value = "已提现金额(分)")
-    private Integer extractPrice;
-
-    @ApiModelProperty(value = "剩余金额(分)")
-    private Integer remainderPrice;
+    @ApiModelProperty(value = "推广积分")
+    private Integer achievement;
 
 }

twzd-service/src/main/java/com/miaxis/user/mapper/UserInfoMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.user.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.vo.ExtensionIncomeVo;
 
 import java.util.List;
 
@@ -26,4 +27,6 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
     List<UserInfo> selectUserByList(List<String> collect);
 
     UserInfo getUpUserInfo(String fromUserName);
+
+    List<ExtensionIncomeVo> getDownLevelPoints(String openid);
 }

twzd-service/src/main/java/com/miaxis/user/service/IUserInfoService.java

@@ -2,6 +2,7 @@ package com.miaxis.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.extension.vo.ExtensionIncomeVo;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@ public interface IUserInfoService extends IService<UserInfo>{
     public List<UserInfo> selectUserInfoList(UserInfo userInfo);
 
     UserInfo getUpUserInfo(String fromUserName);
+
+    List<ExtensionIncomeVo> getDownLevelPoints(String openid);
 }

twzd-service/src/main/java/com/miaxis/user/service/impl/UserInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.extension.vo.ExtensionIncomeVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -39,4 +40,9 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     public UserInfo getUpUserInfo(String fromUserName) {
         return userInfoMapper.getUpUserInfo(fromUserName);
     }
+
+    @Override
+    public List<ExtensionIncomeVo> getDownLevelPoints(String openid) {
+        return userInfoMapper.getDownLevelPoints(openid);
+    }
 }

twzd-service/src/main/java/com/miaxis/wx/domain/WxExtract.java

@@ -0,0 +1,95 @@
+package com.miaxis.wx.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+/**
+ * 微信提现对象 wx_extract
+ *
+ * @author miaxis
+ * @date 2022-01-24
+ */
+@Data
+@TableName("wx_extract")
+@ApiModel(value = "WxExtract", description = "微信提现对象 wx_extract")
+public class WxExtract extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 用户唯一标识(微信) */
+    @Excel(name = "用户唯一标识(微信)")
+    @TableField("openid")
+    @ApiModelProperty(value = "用户唯一标识(微信)")
+    private String openid;
+
+    /** 用户唯一标识(微信) */
+    @Excel(name = "备注")
+    @TableField("remark")
+    @ApiModelProperty(value = "备注)")
+    private String remark;
+
+    /** 提现金额(分) */
+    @Excel(name = "提现金额(分)")
+    @TableField("extract_price")
+    @ApiModelProperty(value = "提现金额(分)")
+    private Long extractPrice;
+
+    /** 状态  1：提现成功、2：提现失败 */
+    @Excel(name = "状态  1：提现成功、2：提现失败")
+    @TableField("status")
+    @ApiModelProperty(value = "状态  1：提现成功、2：提现失败")
+    private String status;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setOpenid(String openid){
+        this.openid = openid;
+    }
+
+    public String getOpenid(){
+        return openid;
+    }
+    public void setExtractPrice(Long extractPrice){
+        this.extractPrice = extractPrice;
+    }
+
+    public Long getExtractPrice(){
+        return extractPrice;
+    }
+    public void setStatus(String status){
+        this.status = status;
+    }
+
+    public String getStatus(){
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("openid", getOpenid())
+            .append("extractPrice", getExtractPrice())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("status", getStatus())
+            .toString();
+    }
+}

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

@@ -0,0 +1,31 @@
+package com.miaxis.wx.dto;
+
+
+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 = "驾校名称")
+    private String schoolName;
+
+
+}

twzd-service/src/main/java/com/miaxis/wx/mapper/WxExtractMapper.java

@@ -0,0 +1,23 @@
+package com.miaxis.wx.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.wx.domain.WxExtract;
+
+import java.util.List;
+
+/**
+ * 微信提现Mapper接口
+ *
+ * @author miaxis
+ * @date 2022-01-24
+ */
+public interface WxExtractMapper extends BaseMapper<WxExtract> {
+    /**
+     * 查询微信提现列表
+     *
+     * @param wxExtract 微信提现
+     * @return 微信提现集合
+     */
+    public List<WxExtract> selectWxExtractList(WxExtract wxExtract);
+
+}

twzd-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);
 }

twzd-service/src/main/java/com/miaxis/wx/service/IWxExtractService.java

@@ -0,0 +1,22 @@
+package com.miaxis.wx.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.wx.domain.WxExtract;
+
+import java.util.List;
+
+/**
+ * 微信提现Service接口
+ *
+ * @author miaxis
+ * @date 2022-01-24
+ */
+public interface IWxExtractService extends IService<WxExtract>{
+    /**
+     * 查询微信提现列表
+     *
+     * @param wxExtract 微信提现
+     * @return 微信提现集合
+     */
+    public List<WxExtract> selectWxExtractList(WxExtract wxExtract);
+}

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

@@ -2,6 +2,9 @@ package com.miaxis.wx.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
+
+import java.util.List;
 
 /**
  */
@@ -14,4 +17,5 @@ public interface IWxOrderService extends IService<WxOrder>{
     WxOrder getByOutTradeNo(String outTradeNo);
 
 
+    List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto);
 }

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxExtractServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.wx.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.wx.mapper.WxExtractMapper;
+import com.miaxis.wx.domain.WxExtract;
+import com.miaxis.wx.service.IWxExtractService;
+
+/**
+ * 微信提现Service业务层处理
+ *
+ * @author miaxis
+ * @date 2022-01-24
+ */
+@Service
+public class WxExtractServiceImpl extends ServiceImpl<WxExtractMapper, WxExtract> implements IWxExtractService {
+    @Autowired
+    private WxExtractMapper wxExtractMapper;
+
+    /**
+     * 查询微信提现列表
+     *
+     * @param wxExtract 微信提现
+     * @return 微信提现
+     */
+    @Override
+    public List<WxExtract> selectWxExtractList(WxExtract wxExtract){
+        return wxExtractMapper.selectWxExtractList(wxExtract);
+    }
+}

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

@@ -3,6 +3,7 @@ package com.miaxis.wx.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.system.service.ISysConfigService;
 import com.miaxis.wx.domain.WxOrder;
+import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.mapper.WxOrderMapper;
 import com.miaxis.wx.service.IWxOrderService;
 import lombok.extern.slf4j.Slf4j;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 电影订单Service业务层处理
@@ -42,4 +44,9 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     public WxOrder getByOutTradeNo(String outTradeNo) {
         return wxOrderMapper.getByOutTradeNo(outTradeNo);
     }
+
+    @Override
+    public List<WxOrder> QuerySchoolOrderList(QuerySchoolOrderListDTO dto) {
+        return wxOrderMapper.QuerySchoolOrderList(dto);
+    }
 }

twzd-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -70,5 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from user_info
         where openid = (select parent_openid from wx_spread_relation where openid = #{fromUserName})
     </select>
+    <select id="getDownLevelPoints"  resultType="com.miaxis.extension.vo.ExtensionIncomeVo">
+        select nick_name,head_image,achievement from user_info
+        where openid = (select openid from wx_spread_relation where parent_openid = #{openid})
+    </select>
 
 </mapper>

twzd-service/src/main/resources/mapper/wx/WxExtractMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.wx.mapper.WxExtractMapper">
+
+    <resultMap type="WxExtract" id="WxExtractResult">
+        <result property="id"    column="id"    />
+        <result property="openid"    column="openid"    />
+        <result property="extractPrice"    column="extract_price"    />
+        <result property="remark"    column="remark"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectWxExtractVo">
+        select * from wx_extract
+    </sql>
+
+    <select id="selectWxExtractList" parameterType="WxExtract" resultMap="WxExtractResult">
+        <include refid="selectWxExtractVo"/>
+        <where>
+            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
+            <if test="extractPrice != null "> and extract_price = #{extractPrice}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -112,4 +112,19 @@ 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="schoolName != null  and schoolName != ''">
+            and  openid in (select openid from user_info where school_name = #{schoolName})
+        </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>

twzd-system/src/main/java/com/miaxis/system/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.system.mapper;
 
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.domain.vo.AgentVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -118,4 +119,6 @@ public interface SysUserMapper
     void saveUserInfo(UserInfo userInfo);
 
     void updateStudent(UserInfo userInfo);
+
+    List<AgentVO> getAgentList(@Param("roleId")Long roleId, @Param("userName")String userName);
 }

twzd-system/src/main/java/com/miaxis/system/service/ISysUserService.java

@@ -2,6 +2,7 @@ package com.miaxis.system.service;
 
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.domain.vo.AgentVO;
 
 import java.util.List;
 
@@ -178,4 +179,7 @@ public interface ISysUserService
     void saveUserInfo(UserInfo userInfo);
 
     void updateStudent(UserInfo userInfo);
+
+
+    List<AgentVO> getAgentList(Long roleId, String schoolName);
 }

twzd-system/src/main/java/com/miaxis/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.miaxis.common.constant.UserConstants;
 import com.miaxis.common.core.domain.entity.SysRole;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.core.domain.vo.AgentVO;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.StringUtils;
@@ -467,4 +468,9 @@ public class SysUserServiceImpl implements ISysUserService
     public void updateStudent(UserInfo userInfo) {
         userMapper.updateStudent(userInfo);
     }
+
+    @Override
+    public List<AgentVO> getAgentList(Long roleId, String agentName) {
+        return userMapper.getAgentList(roleId,agentName);
+    }
 }

twzd-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -200,4 +200,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
  	</delete>
 
+	<select id="getAgentList" resultType="com.miaxis.common.core.domain.vo.AgentVO">
+		select t.user_id,t.user_name from sys_user t where
+		1 =1
+		<if test="userName != null and userName != ''">
+			AND user_name like concat('%', #{userName}, '%')
+		</if>
+		and exists (select 1 from sys_user_role where role_id =#{roleId} and user_id = t.user_id)
+
+	</select>
+
 </mapper>