fix 控制台

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ConsoleController.java

@@ -4,6 +4,8 @@ import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.domain.ApplyAreas;
+import com.zhongzheng.modules.base.service.IConsoleService;
+import com.zhongzheng.modules.user.service.IUserExamRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -27,14 +29,13 @@ import java.util.Map;
 @RequestMapping("/base/console")
 public class ConsoleController extends BaseController {
 
-    /**
-     * 查询报考市地区列表
-     */
+    private final IConsoleService iConsoleService;
+
     @ApiOperation("控制台学员数据")
     @PreAuthorize("@ss.hasPermi('system:areas:city_list')")
     @GetMapping("/studentData")
     public AjaxResult<Map<String,Object>> studentData(ConsoleQueryBo bo) {
-        Map<String,Object> numMap = new HashMap<>();
+        Map<String,Object> numMap = iConsoleService.getStudentData(bo);
         return AjaxResult.success(numMap);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/ConsoleQueryBo.java

@@ -16,14 +16,18 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ConsoleQueryBo extends BaseEntity {
 
-	/** 教育类型id */
-	@Excel(name = "教育类型id")
-	@ApiModelProperty("教育类型id")
-	private Long educationTypeId;
-
+	/** 业务层次id */
+	@Excel(name = "业务层次id")
+	@ApiModelProperty("业务层次id")
+	private Long businessId;
 
 	/** 用户ID */
 	@ApiModelProperty("用户ID")
 	private Long userId;
 
+	@ApiModelProperty("订单开始时间")
+	private Long startTime;
+	@ApiModelProperty("订单结束时间")
+	private Long endTime;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ConsoleServiceImpl.java

@@ -1,20 +1,40 @@
 package com.zhongzheng.modules.base.service.impl;
 
 
+import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IConsoleService;
+import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.user.service.IUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
+import java.util.HashMap;
 import java.util.Map;
 
 
 @Service
-public class ConsoleServiceImpl  implements IConsoleService {
+public class ConsoleServiceImpl implements IConsoleService {
 
+    @Autowired
+    private IOrderService iOrderService;
 
     @Override
     public Map<String, Object> getStudentData(ConsoleQueryBo bo) {
-        
-        return null;
+        Integer allNum = iOrderService.getConsoleStudentNum(bo);
+        Calendar cal = Calendar.getInstance();
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        bo.setEndTime(cal.getTimeInMillis() / 1000);
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)-1, 0, 0, 0);
+        bo.setStartTime(cal.getTimeInMillis() / 1000);
+
+        Integer yesNum = iOrderService.getConsoleStudentNum(bo); //昨天人数
+        System.out.println(Calendar.DAY_OF_MONTH);
+        System.out.println(bo);
+        Map<String, Object> map = new HashMap<>();
+        map.put("allStudent",allNum);
+        map.put("ytdStudent",yesNum);
+        return map;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderMapper.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.order.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
 import com.zhongzheng.modules.order.domain.Order;
@@ -27,4 +28,6 @@ public interface OrderMapper extends BaseMapper<Order> {
     Integer queryByOrderSn(String orderSn);
 
     List<OrderListVo> selectRebuyList(OrderQueryBo bo);
+
+    Integer getConsoleStudentNum(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.order.bo.OrderAddBo;
 import com.zhongzheng.modules.order.bo.OrderEditBo;
 import com.zhongzheng.modules.order.bo.OrderQueryBo;
@@ -83,4 +84,6 @@ public interface IOrderService extends IService<Order> {
 	Integer queryByOrderSn(String orderSn);
 
 	Map<String, String> resumePcOrder(OrderAddBo bo);
+
+	Integer getConsoleStudentNum(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -11,6 +11,7 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.bank.domain.QuestionChapterExam;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IProfileTpService;
 import com.zhongzheng.modules.base.service.IShoppingCartService;
 import com.zhongzheng.modules.course.service.ICourseBusinessService;
@@ -1027,6 +1028,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return payResult;
     }
 
+    @Override
+    public Integer getConsoleStudentNum(ConsoleQueryBo bo) {
+        return baseMapper.getConsoleStudentNum(bo);
+    }
+
     //判断视频商品是否购买过且服务期是否过期
     public Long getHaveBuyGoods(Long goodsId, Long userId) {
         OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -348,4 +348,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryByOrderSn" parameterType="String" resultType="Integer">
         SELECT order_status from `order` where order_sn = #{orderSn}
     </select>
+
+    <select id="getConsoleStudentNum" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultType="Integer">
+        SELECT
+            count( DISTINCT o.user_id )
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+        WHERE
+
+           og.pay_status IN ( 2, 3, 4 )
+          AND og.refund_status != 2
+        <if test="businessId != null">
+            AND g.business_id = #{businessId}
+        </if>
+        <if test="startTime != null">
+	        AND og.create_time >= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND #{endTime} >= og.create_time
+        </if>
+    </select>
 </mapper>