Merge remote-tracking branch 'origin/master'

sdjk-admin/src/main/java/com/miaxis/app/controller/order/OrderInfoController.java

@@ -0,0 +1,88 @@
+package com.miaxis.app.controller.order;
+
+import com.miaxis.common.annotation.Log;
+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.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.utils.SecurityUtils;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.OrderInfoDto;
+import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.question.domain.QuestionCollection;
+import com.miaxis.question.dto.QuestionCollectionDTO;
+import com.miaxis.question.dto.QuestionCollectionListDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【ad】Controller
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@RestController
+@RequestMapping(Constants.STUDENT_PREFIX+"/order/info")
+@Api(tags={"【APP-订单接口】"})
+public class OrderInfoController extends BaseController{
+    @Autowired
+    private IOrderInfoService orderInfoService;
+
+    /**
+     * 查询ad列表
+     */
+    @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<OrderInfo> list(@ModelAttribute OrderInfoDto orderInfoDto){
+        startPage();
+        orderInfoDto.setReferralUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<OrderInfo> list = orderInfoService.selectOrderInfoList(orderInfoDto);
+        return toResponsePageInfo(list);
+    }
+
+    /**
+     *昨日预估收益
+     */
+    @GetMapping("/yesterdayTotal")
+    @ApiOperation("昨日预估收益")
+    public Response<Integer> yesterdayTotal(OrderInfoDto orderInfoDto) {
+        orderInfoDto.setReferralUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        return Response.success(orderInfoService.selectYesterdayTotal(orderInfoDto));
+    }
+
+
+    /**
+     *今日预估收益
+     */
+    @GetMapping("/todayTotal")
+    @ApiOperation("今日预估收益")
+    public Response<Integer> todayTotal(OrderInfoDto orderInfoDto) {
+        orderInfoDto.setReferralUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        return Response.success(orderInfoService.selectTodayTotal(orderInfoDto));
+    }
+
+
+    /**
+     * 总收益
+     */
+    @GetMapping("/total")
+    @ApiOperation("总收益")
+    public Response<Integer> total(OrderInfoDto orderInfoDto) {
+        orderInfoDto.setReferralUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        return Response.success(orderInfoService.selectTotal(orderInfoDto));
+    }
+
+}

sdjk-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -0,0 +1,68 @@
+package com.miaxis.order.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 java.util.Date;
+
+/**
+ * ad对象 ad_info
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Data
+@TableName("v_wx_order")
+@ApiModel(value = "OrderInfo", description = "订单视图")
+public class OrderInfo extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    @TableField("goods_name")
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    @TableField("out_trade_no")
+    @ApiModelProperty(value = "订单号")
+    private String outTradeNo;
+
+    /** 退款订单号 */
+    @Excel(name = "退款订单号")
+    @TableField("out_refund_no")
+    @ApiModelProperty(value = "退款订单号")
+    private String outRefundNo;
+
+    /** 订单总金额 */
+    @Excel(name = "订单总金额")
+    @TableField("total")
+    @ApiModelProperty(value = "打开类型 1站内打开 2站外打开")
+    private Integer total;
+
+    /** 交易类型 */
+    @Excel(name = "交易类型")
+    @TableField("trade_type")
+    @ApiModelProperty(value = "交易类型")
+    private String tradeType;
+
+
+    /** 交易成功时间 */
+    @Excel(name = "交易成功时间")
+    @TableField("success_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "交易成功时间")
+    private Date successTime;
+
+}

sdjk-service/src/main/java/com/miaxis/order/dto/OrderInfoDto.java

@@ -0,0 +1,51 @@
+package com.miaxis.order.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * ad对象 ad_info
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel(value = "OrderInfo", description = "订单视图")
+public class OrderInfoDto {
+    private static final long serialVersionUID = 1L;
+
+
+    /** 商品名称 */
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+
+    /** 订单号 */
+    @ApiModelProperty(value = "订单号")
+    private String outTradeNo;
+
+    /** 退款订单号 */
+    @ApiModelProperty(value = "退款订单号")
+    private String outRefundNo;
+
+    /** 订单总金额 */
+    @ApiModelProperty(value = "订单总金额")
+    private Integer total;
+
+    /** 交易类型 */
+    @ApiModelProperty(value = "交易类型")
+    private String tradeType;
+
+
+    /** 开始时间 */
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    /** 结束时间 */
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    /** 推荐人id */
+    @ApiModelProperty(value = "推荐人id")
+    private Long referralUserId;
+}

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

@@ -0,0 +1,52 @@
+package com.miaxis.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.OrderInfoDto;
+
+import java.util.List;
+
+/**
+ * adMapper接口
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
+    /**
+     * 查询ad列表
+     *
+     * @param orderInfo orderInfo
+     * @return orderInfo集合
+     */
+    public List<OrderInfo> selectOrderInfoList(OrderInfoDto orderInfo);
+
+    /**
+     * 查询今日收益
+     *
+     * @param orderInfo orderInfo
+     * @return orderInfo集合
+     */
+    public Integer selectTodayTotal(OrderInfoDto orderInfo);
+
+
+    /**
+     * 查询昨日收益
+     *
+     * @param orderInfo orderInfo
+     * @return orderInfo 集合
+     */
+    public Integer selectYesterdayTotal(OrderInfoDto orderInfo);
+
+
+    /**
+     * 总收益
+     *
+     * @param orderInfo orderInfo
+     * @return orderInfo 集合
+     */
+    public Integer selectTotal(OrderInfoDto orderInfo);
+
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.miaxis.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.OrderInfoDto;
+
+import java.util.List;
+
+/**
+ * adService接口
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+public interface IOrderInfoService extends IService<OrderInfo>{
+    /**
+     * 查询ad列表
+     *
+     * @param orderInfoDto orderInfo
+     * @return order集合
+     */
+    public List<OrderInfo> selectOrderInfoList(OrderInfoDto orderInfoDto);
+
+
+
+    public Integer selectTotal(OrderInfoDto orderInfoDto);
+
+
+    public Integer selectYesterdayTotal(OrderInfoDto orderInfoDto);
+
+    public Integer selectTodayTotal(OrderInfoDto orderInfoDto);
+
+}

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

@@ -0,0 +1,63 @@
+package com.miaxis.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.miaxis.order.domain.OrderInfo;
+import com.miaxis.order.dto.OrderInfoDto;
+import com.miaxis.order.mapper.OrderInfoMapper;
+import com.miaxis.order.service.IOrderInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * adService业务层处理
+ *
+ * @author miaxis
+ * @date 2021-08-19
+ */
+@Service
+@CacheConfig(cacheNames = "OrderInfo")
+public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements IOrderInfoService {
+
+
+
+
+    @Autowired
+    private OrderInfoMapper orderInfoMapper;
+
+    /**
+     * 查询ad列表
+     *
+     * @param orderInfoDto
+     * @return List<OrderInfo>
+     */
+    @Override
+    public List<OrderInfo> selectOrderInfoList(OrderInfoDto orderInfoDto){
+        return orderInfoMapper.selectOrderInfoList(orderInfoDto);
+    }
+
+    @Override
+    public Integer selectTotal(OrderInfoDto orderInfoDto) {
+        return orderInfoMapper.selectTotal(orderInfoDto);
+    }
+
+    @Override
+    public Integer selectYesterdayTotal(OrderInfoDto orderInfoDto) {
+        return orderInfoMapper.selectYesterdayTotal(orderInfoDto);
+    }
+
+    @Override
+    public Integer selectTodayTotal(OrderInfoDto orderInfoDto) {
+        return orderInfoMapper.selectTodayTotal(orderInfoDto);
+    }
+
+
+}
+
+
+
+
+

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

@@ -0,0 +1,77 @@
+<?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.order.mapper.OrderInfoMapper">
+
+    <resultMap type="OrderInfo" id="OrderInfoResult">
+        <result property="id"    column="id"    />
+        <result property="goodsName"    column="goods_name"    />
+        <result property="out_trade_no"    column="outTradeNo"    />
+        <result property="outRefundNo"    column="out_refund_no"    />
+        <result property="total"    column="total"    />
+        <result property="tradeType"    column="trade_type"    />
+        <result property="successTime"    column="success_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectOrderInfoVo">
+        select * from v_wx_order
+    </sql>
+
+    <select id="selectOrderInfoList" parameterType="OrderInfoDto" resultMap="OrderInfoResult">
+        <include refid="selectOrderInfoVo"/>
+        <where>
+            <if test="goodsName != null  and goodsName != ''"> and goods_name = #{goodsName}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
+            <if test="outRefundNo != null and outRefundNo != '' "> and status = #{status}</if>
+            <if test="total != null "> and total = #{total}</if>
+            <if test="tradeType != null and tradeType != ''  "> and trade_type = #{tradeType}</if>
+            <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
+            <if test="startTime != null and startTime != '' ">
+                and DATE_FORMAT(success_time,'%Y-%m-%d') <![CDATA[ >= ]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != '' ">
+                and DATE_FORMAT(success_time, '%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+            </if>
+        </where>
+    </select>
+
+
+    <select id="selectTodayTotal" parameterType="OrderInfoDto" resultType="Integer">
+        select ifnull(sum(total),0) FROM v_wx_order
+        <where>
+            <if test="goodsName != null  and goodsName != ''"> and goods_name = #{goodsName}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
+            <if test="outRefundNo != null and outRefundNo != '' "> and status = #{status}</if>
+            <if test="total != null "> and total = #{total}</if>
+            <if test="tradeType != null and tradeType != ''  "> and trade_type = #{tradeType}</if>
+            <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
+            and TO_DAYS(success_time) = TO_DAYS(NOW())
+        </where>
+    </select>
+
+
+    <select id="selectYesterdayTotal" parameterType="OrderInfoDto" resultType="Integer">
+        select ifnull(sum(total),0) FROM v_wx_order
+        <where>
+            <if test="goodsName != null  and goodsName != ''"> and goods_name = #{goodsName}</if>
+            <if test="outTradeNo != null  and outTradeNo != ''"> and out_trade_no = #{outTradeNo}</if>
+            <if test="outRefundNo != null and outRefundNo != '' "> and status = #{status}</if>
+            <if test="total != null "> and total = #{total}</if>
+            <if test="tradeType != null and tradeType != ''  "> and trade_type = #{tradeType}</if>
+            <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
+            and TO_DAYS(NOW()) - TO_DAYS(success_time) = 1
+        </where>
+    </select>
+
+    <select id="selectTotal" parameterType="OrderInfoDto" resultType="Integer">
+        select ifnull(sum(total),0) FROM v_wx_order
+        <where>
+            <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
+        </where>
+    </select>
+
+
+</mapper>