Merge remote-tracking branch 'origin/master'

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

@@ -7,7 +7,9 @@ import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.OrderInfoDto;
+import com.miaxis.order.dto.OrderInfoMonthDto;
 import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.OrderInfoMonthVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -81,4 +83,13 @@ public class OrderInfoController extends BaseController{
         return Response.success(orderInfoService.selectTotal(orderInfoDto));
     }
 
+
+    @GetMapping("/selectMonthIncone")
+    @ApiOperation("按年查询每月收入")
+    public ResponsePageInfo<OrderInfoMonthVo> selectMonthIncone(@ModelAttribute OrderInfoMonthDto orderInfoMonthDto){
+        orderInfoMonthDto.setReferralUserId(SecurityUtils.getLoginUser().getStudent().getId());
+        List<OrderInfoMonthVo> list = orderInfoService.selectMonthIncome(orderInfoMonthDto);
+        return toResponsePageInfo(list);
+    }
+
 }

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

@@ -46,6 +46,6 @@ public class OrderInfoDto {
     private String endTime;
 
     /** 推荐人id */
-    @ApiModelProperty(value = "推荐人id")
+    @ApiModelProperty(hidden=true)
     private Long referralUserId;
 }

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

@@ -0,0 +1,26 @@
+package com.miaxis.order.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ *
+ * @author zhangbin
+ * @date 2022-10-24
+ */
+@Data
+public class OrderInfoMonthDto {
+    private static final long serialVersionUID = 1L;
+
+
+    /** 年份 */
+    @ApiModelProperty(value = "年份")
+    private String year;
+
+
+    /** 推荐人id */
+    @ApiModelProperty(hidden=true)
+    private Long referralUserId;
+}

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

@@ -3,6 +3,8 @@ 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 com.miaxis.order.dto.OrderInfoMonthDto;
+import com.miaxis.order.vo.OrderInfoMonthVo;
 
 import java.util.List;
 
@@ -38,7 +40,6 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
      */
     public Integer selectYesterdayTotal(OrderInfoDto orderInfo);
 
-
     /**
      * 总收益
      *
@@ -48,5 +49,10 @@ public interface OrderInfoMapper extends BaseMapper<OrderInfo> {
     public Integer selectTotal(OrderInfoDto orderInfo);
 
 
-
+    /**
+     * 按年查询每月收益
+     * @param orderInfoMonthDto
+     * @return
+     */
+    List<OrderInfoMonthVo> selectMonthIncome(OrderInfoMonthDto orderInfoMonthDto);
 }

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

@@ -3,6 +3,8 @@ 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 com.miaxis.order.dto.OrderInfoMonthDto;
+import com.miaxis.order.vo.OrderInfoMonthVo;
 
 import java.util.List;
 
@@ -21,8 +23,6 @@ public interface IOrderInfoService extends IService<OrderInfo>{
      */
     public List<OrderInfo> selectOrderInfoList(OrderInfoDto orderInfoDto);
 
-
-
     public Integer selectTotal(OrderInfoDto orderInfoDto);
 
 
@@ -30,4 +30,6 @@ public interface IOrderInfoService extends IService<OrderInfo>{
 
     public Integer selectTodayTotal(OrderInfoDto orderInfoDto);
 
+
+    List<OrderInfoMonthVo> selectMonthIncome(OrderInfoMonthDto orderInfoMonthDto);
 }

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

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.OrderInfoDto;
+import com.miaxis.order.dto.OrderInfoMonthDto;
 import com.miaxis.order.mapper.OrderInfoMapper;
 import com.miaxis.order.service.IOrderInfoService;
+import com.miaxis.order.vo.OrderInfoMonthVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.stereotype.Service;
@@ -54,6 +56,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return orderInfoMapper.selectTodayTotal(orderInfoDto);
     }
 
+    @Override
+    public List<OrderInfoMonthVo> selectMonthIncome(OrderInfoMonthDto orderInfoMonthDto) {
+        return orderInfoMapper.selectMonthIncome(orderInfoMonthDto);
+    }
+
 
 }
 

sdjk-service/src/main/java/com/miaxis/order/vo/OrderInfoMonthVo.java

@@ -0,0 +1,25 @@
+package com.miaxis.order.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ *
+ * @author zhangbin
+ * @date 2022-10-24
+ */
+@Data
+public class OrderInfoMonthVo {
+    private static final long serialVersionUID = 1L;
+
+
+    /** 年月 */
+    @ApiModelProperty(value = "年月")
+    private String yearMonth;
+
+
+    /** 月收入 */
+    @ApiModelProperty(value = "收入")
+    private Integer income;
+}

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

@@ -39,6 +39,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="selectMonthIncome" parameterType="com.miaxis.order.dto.OrderInfoMonthDto" resultType="com.miaxis.order.vo.OrderInfoMonthVo">
+        select ifnull(sum(commission_price),0) as income,DATE_FORMAT(success_time,'%Y-%m') as yearMonth from v_wx_order
+        <where>
+            <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
+            <if test="year != null and year != '' ">
+                and DATE_FORMAT(success_time,'%Y') <![CDATA[ = ]]> #{year}
+            </if>
+            GROUP BY DATE_FORMAT(success_time,'%Y-%m')
+        </where>
+    </select>
+
+
+
     <select id="selectTodayTotal" parameterType="OrderInfoDto" resultType="Integer">
         select ifnull(sum(total),0) FROM v_wx_order
         <where>
@@ -72,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="referralUserId != null and referralUserId != ''  "> and referral_user_id = #{referralUserId}</if>
         </where>
     </select>
+    <select id="selectMonthIncone" resultType="com.miaxis.order.vo.OrderInfoMonthVo"></select>
 
 
 </mapper>