考场列表包含VIP 接口修改3

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

@@ -9,6 +9,7 @@ import com.miaxis.common.utils.poi.ExcelUtil;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.OrderIncomeVo;
 import com.miaxis.order.vo.QuerySchoolOrderDetailedVo;
 import com.miaxis.order.vo.QuerySchoolOrderListVo;
 import com.miaxis.wx.domain.WxJsOrder;
@@ -92,9 +93,20 @@ public class PcOrderInfoController extends BaseController{
         orderInfoResponsePageInfo.setData(map);
         return orderInfoResponsePageInfo;
 
+    }
 
+    /**
+     * 查询月份总收益
+     */
+    @GetMapping("/school/getIncomeList")
+    @ApiOperation("查询月份总收益")
+    public List<OrderIncomeVo> getIncomeList(@ModelAttribute QuerySchoolOrderListDTO schoolOrderListDTO) {
+        startPage();
+        List<OrderIncomeVo> list = orderInfoService.getIncomeList(schoolOrderListDTO);
+        return list;
     }
 
+
     /**
      * 查询驾校订单明细列表
      */

jsjp-common/src/main/java/com/miaxis/common/utils/PrivateKeyUtil.java

@@ -17,4 +17,9 @@ public class PrivateKeyUtil {
             "D7yOXFAy/Q==";
 
 
+     public static String rsaPublicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCzR04LMmDlwyVRfK+Kgsm/vFMOFyqvGk4QIVCGj" +
+             "2CKKfhycRExm15N3tKOOouIjl/EU79It45oS+ltJkscvYrJn1zz+1bSoBLelZzJrn7K0NpHF8kbCprsFHd60x+YJ4l8C3SDxfFebo4kqve" +
+             "Jzx6JNZKwzFm7LPEO5XB9pEBRwIDAQAB";
+
+
 }

jsjp-service/src/main/java/com/miaxis/order/mapper/OrderInfoMapper.java

@@ -3,6 +3,7 @@ package com.miaxis.order.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
+import com.miaxis.order.vo.OrderIncomeVo;
 import com.miaxis.order.vo.QuerySchoolOrderDetailedVo;
 import com.miaxis.order.vo.QuerySchoolOrderListVo;
 
@@ -36,4 +37,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     List<QuerySchoolOrderListVo> selectSchoolOrderInfoExcel(QuerySchoolOrderListDTO schoolOrderListDTO);
 
     List<QuerySchoolOrderDetailedVo> selectSchoolOrderDetailedExcel(QuerySchoolOrderListDTO schoolOrderListDTO);
+
+    List<OrderIncomeVo> getIncomeList(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/IOrderInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.order.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
+import com.miaxis.order.vo.OrderIncomeVo;
 import com.miaxis.order.vo.QuerySchoolOrderDetailedVo;
 import com.miaxis.order.vo.QuerySchoolOrderListVo;
 import com.miaxis.wx.domain.WxJsOrder;
@@ -45,4 +46,6 @@ public interface IOrderInfoService extends IService<OrderInfo> {
     Integer getCommissionMoney(QuerySchoolOrderListDTO orderInfo);
 
     List<QuerySchoolOrderListVo> selectSchoolOrderInfoExcel(QuerySchoolOrderListDTO schoolOrderListDTO);
+
+    List<OrderIncomeVo> getIncomeList(QuerySchoolOrderListDTO schoolOrderListDTO);
 }

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.QuerySchoolOrderListDTO;
 import com.miaxis.order.mapper.OrderInfoMapper;
 import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.OrderIncomeVo;
 import com.miaxis.order.vo.QuerySchoolOrderDetailedVo;
 import com.miaxis.order.vo.QuerySchoolOrderListVo;
 import com.miaxis.userInfo.domain.UserVip;
@@ -1401,6 +1402,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return orderInfoMapper.selectSchoolOrderInfoExcel(schoolOrderListDTO);
     }
 
+    @Override
+    public List<OrderIncomeVo> getIncomeList(QuerySchoolOrderListDTO schoolOrderListDTO) {
+        return orderInfoMapper.getIncomeList(schoolOrderListDTO);
+    }
+
     /**
      * 退款方法
      * @param order

jsjp-service/src/main/java/com/miaxis/order/vo/OrderIncomeVo.java

@@ -0,0 +1,29 @@
+package com.miaxis.order.vo;
+
+
+import com.miaxis.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+@ApiModel(description = "驾校订单查询返回对象")
+public class OrderIncomeVo {
+    private static final long serialVersionUID = 1L;
+
+
+    @Excel(name = "总金额")
+    @ApiModelProperty(value = "总金额")
+    private Float total;
+
+    @Excel(name = "人头返现提成")
+    @ApiModelProperty(value = "人头返现提成")
+    private Float activationCommission;
+
+
+    @Excel(name = "原始提成")
+    @ApiModelProperty(value = "原始提成")
+    private Float schoolCommission;
+
+}

jsjp-service/src/main/resources/mapper/examvip/VipUserExamMapper.xml

@@ -20,9 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectVipUserExamVo">
         select *,
             (case
-            when now() <![CDATA[<=]]> expiration_time then 1
-            when now()>expiration_time then 0
-            end) as is_vip
+             when now() <![CDATA[<=]]> expiration_time then 1
+             when now() <![CDATA[>]]> expiration_time then 0
+             end) as is_vip
         from vip_user_exam
     </sql>
 

jsjp-service/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -255,6 +255,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="getIncomeList"  resultType="com.miaxis.order.vo.OrderIncomeVo">
+        select
+        (select sum(total) from order_info o where DATE_FORMAT(success_time,'%Y-%m-%d %H:%i:%S') <![CDATA[ >= ]]> #{startTime}
+        and DATE_FORMAT(success_time,'%Y-%m-%d %H:%i:%S') )<![CDATA[ <= ]]> #{endTime}
+        and trade_type = 1) as total,
+        IFNULL(COUNT(DISTINCT logincode),0)*49 as activation_commission,
+        sum(school_commission)/100 from order_info o
+        where DATE_FORMAT(success_time,'%Y-%m-%d %H:%i:%S') <![CDATA[ >= ]]> #{startTime}
+        and DATE_FORMAT(success_time,'%Y-%m-%d %H:%i:%S')<![CDATA[ <= ]]> #{endTime}
+        and is_share = 1
+        and trade_type = 1
+    </select>
+
+
     <select id="getByOutTradeNo" parameterType="string" resultType="com.miaxis.order.domain.OrderInfo">
         select * from order_info where out_trade_no =#{outTradeNo}
     </select>