fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/UserOrderDailyStatisticDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/UserOrderDailyStatisticMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
@@ -202,4 +202,7 @@ Long countOrderBySourceAndNearDay(@Param("uid") Long uid, @Param("source") int source, @Param("day") int day); } fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/UserOrderDailyStatisticDTO.java
New file @@ -0,0 +1,13 @@ package com.yeshi.fanli.dao.mybatis.order; import java.math.BigDecimal; public class UserOrderDailyStatisticDTO { private Long uid; private String type; private String day; private int orderCount; private BigDecimal money; } fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/UserOrderDailyStatisticMapper.java
New file @@ -0,0 +1,37 @@ package com.yeshi.fanli.dao.mybatis.order; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; public interface UserOrderDailyStatisticMapper { /** * 根据下单时间统计(自购或分享订单) * @Title: listByPlaceOrderTime * @Description: * @param minTime * @param maxTime * @return * List<UserOrderDailyStatisticDTO> 返回类型 * @throws */ List<UserOrderDailyStatisticDTO> listFanLiAndShareByPlaceOrderTime(@Param("minTime") Date minTime, @Param("maxTime") Date maxTime); /** * * @Title: listTeamByPlaceOrderTime * @Description: * @param minTime * @param maxTime * @return * List<UserOrderDailyStatisticDTO> 返回类型 * @throws */ List<UserOrderDailyStatisticDTO> listTeamByPlaceOrderTime(@Param("minTime") Date minTime, @Param("maxTime") Date maxTime); } fanli/src/main/java/com/yeshi/fanli/mapping/order/UserOrderDailyStatisticMapper.xml
New file @@ -0,0 +1,40 @@ <?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.yeshi.fanli.dao.mybatis.order.UserOrderDailyStatisticMapper"> <resultMap id="BaseResultMap" type="com.yeshi.fanli.dao.mybatis.order.UserOrderDailyStatisticDTO"> <result column="uid" property="uid" jdbcType="BIGINT" /> <result column="type" property="type" jdbcType="VARCHAR" /> <result column="day" property="day" jdbcType="VARCHAR" /> <result column="orderCount" property="orderCount" jdbcType="INTEGER" /> <result column="money" property="money" jdbcType="DECIMAL" /> </resultMap> <select id="listByPlaceOrderTime" resultMap="BaseResultMap"> SELECT co.`co_uid` as uid,co.`co_child_source_type` AS `type`, SUM(v.`hb_money`) AS money,DATE(co.`co_third_create_time`) AS `day`,COUNT(DISTINCT(CONCAT( co.co_order_no,'#',co.co_source_type))) AS orderCount FROM yeshi_ec_hongbao_v2 v LEFT JOIN yeshi_ec_hongbao_order ho ON ho.`ho_hongbao_id`=v.`hb_id` LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id` WHERE co.`co_id`>0 AND co.`co_third_create_time`>=#{minTime} and #{maxTime}>co.`co_third_create_time` AND v.`hb_state`!=4 GROUP BY co_uid,DATE(co.`co_third_create_time`),co.`co_child_source_type` </select> </mapper> fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -100,7 +100,7 @@ throw new UserVIPPreInfoException(1, "信息不完整"); for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 禁止不能升级的用户升级 if (info.getUid().longValue() == fuid) return; throw new UserVIPPreInfoException(100, "禁止升级"); } UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(info.getUid(), info.getProcess());