老师视频浏览量，老师主页浏览量

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserAccountRecordController.java

@@ -6,16 +6,12 @@ import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 import com.yonge.cooleshow.biz.dal.vo.UserAccountRecordVo;
 import com.yonge.cooleshow.biz.dal.dto.search.UserAccountRecordSearch;
-import com.yonge.cooleshow.biz.dal.entity.UserAccountRecord;
 import com.yonge.cooleshow.biz.dal.service.UserAccountRecordService;
 
 @RestController
@@ -44,4 +40,5 @@ public class UserAccountRecordController extends BaseController {
 		IPage<UserAccountRecordVo> pages = userAccountRecordService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
 	}
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherDao.java

@@ -59,4 +59,12 @@ public interface TeacherDao extends BaseMapper<Teacher> {
      * @return: java.lang.Integer
      */
     Integer setSubject(@Param("id") Long id, @Param("subjectIds") String subjectIds);
+    /***
+     * 增加主页浏览量
+     * @author liweifan
+     * @param: userId
+     * @updateTime 2022/4/24 17:46
+     * @return: java.lang.Integer
+     */
+    Integer addHomeBrowse(@Param("userId")Long userId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherStyleVideoDao.java

@@ -11,7 +11,7 @@ import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherStyleVideoVo;
 import org.apache.ibatis.annotations.Param;
 
-public interface TeacherStyleVideoDao extends BaseMapper<TeacherStyleVideo>{
+public interface TeacherStyleVideoDao extends BaseMapper<TeacherStyleVideo> {
     /***
      * 查询老师风采视频
      * @author liweifan
@@ -20,6 +20,7 @@ public interface TeacherStyleVideoDao extends BaseMapper<TeacherStyleVideo>{
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo>
      */
     List<TeacherStyleVideo> selectListByUserId(@Param("userId") Long userId);
+
     /***
      * 删除老师风采视频，留下oldIds
      * @author liweifan
@@ -28,7 +29,8 @@ public interface TeacherStyleVideoDao extends BaseMapper<TeacherStyleVideo>{
      * @updateTime 2022/4/8 15:09
      * @return: java.lang.Integer
      */
-    Integer removeByUserIdAndOldIds(@Param("userId")Long userId,@Param("oldIds") List<Long> oldIds);
+    Integer removeByUserIdAndOldIds(@Param("userId") Long userId, @Param("oldIds") List<Long> oldIds);
+
     /***
      * 老师风采查询分页
      * @author liweifan
@@ -37,5 +39,14 @@ public interface TeacherStyleVideoDao extends BaseMapper<TeacherStyleVideo>{
      * @updateTime 2022/4/11 15:24
      * @return: java.util.List<com.yonge.cooleshow.biz.dal.vo.TeacherStyleVideoVo>
      */
-    List<TeacherStyleVideoVo> stylePage(@Param("page") IPage page,@Param("param") TeacherStyleSearch query);
+    List<TeacherStyleVideoVo> stylePage(@Param("page") IPage page, @Param("param") TeacherStyleSearch query);
+
+    /***
+     * 增加视频浏览量
+     * @author liweifan
+     * @param: videoId
+     * @updateTime 2022/4/24 17:40
+     * @return: java.lang.Integer
+     */
+    Integer addVideoBrowse(@Param("videoId") Long videoId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/UserOrderDao.java

@@ -33,7 +33,7 @@ public interface UserOrderDao extends BaseMapper<UserOrder>{
 	 * @updateTime 2022/4/20 15:57
 	 * @return: com.yonge.cooleshow.biz.dal.vo.UserOrderVo
 	 */
-	UserOrderVo detailApp(@Param("id")Long id);
+	UserOrderVo detailApp(@Param("param") UserOrder param);
 	/**
 	 * 分页查询
      * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherService.java

@@ -98,4 +98,12 @@ public interface TeacherService extends IService<Teacher>  {
      * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<com.yonge.cooleshow.biz.dal.vo.TeacherVo>
      */
     HttpResponseResult<TeacherVo> saveTeacherStyle(TeacherDto teacherDto);
+    /***
+     * 增加主页浏览量
+     * @author liweifan
+     * @param: userId
+     * @updateTime 2022/4/24 17:45
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
+     */
+    HttpResponseResult<Boolean> addHomeBrowse(Long userId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherStyleVideoService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherStyleSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherStyleVideoVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -49,4 +51,14 @@ public interface TeacherStyleVideoService extends IService<TeacherStyleVideo>  {
      * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yonge.cooleshow.biz.dal.vo.TeacherStyleVideoVo>
      */
     IPage<TeacherStyleVideoVo> stylePage(IPage<TeacherStyleVideoVo> page, TeacherStyleSearch query);
+
+    /***
+     * 增加视频浏览量
+     * @author liweifan
+     * @param: videoId
+     * @updateTime 2022/4/24 17:37
+     * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<com.yonge.cooleshow.biz.dal.vo.TeacherVo>
+     */
+    HttpResponseResult<Boolean> addVideoBrowse(Long videoId);
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UserOrderService.java

@@ -83,9 +83,14 @@ public interface UserOrderService extends IService<UserOrder>  {
 	 * @updateTime 2022/4/13 16:27
 	 */
     void pollingOrder();
-
-	UserOrderVo detailApp(Long id);
-
+	/***
+	 * app查询订单详情
+	 * @author liweifan
+	 * @param: orderNo
+	 * @updateTime 2022/4/24 17:49
+	 * @return: com.yonge.cooleshow.biz.dal.vo.UserOrderVo
+	 */
+	UserOrderVo detailApp(UserOrder param);
 	/***
 	 * 取消订单
 	 * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/HomeServiceImpl.java

@@ -39,7 +39,7 @@ public class HomeServiceImpl implements HomeService {
         Calendar calendar = Calendar.getInstance();
         if (TimeTypeEnum.MONTH.equals(totalReq.getTimeType())) {
             String[] classDateSp = totalReq.getDateTime().split("-");
-            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1])-1, 1, 0, 0, 0);
             totalReq.setStartTime(calendar.getTime());
             totalReq.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } else if (TimeTypeEnum.YEAR.equals(totalReq.getTimeType())) {
@@ -84,7 +84,7 @@ public class HomeServiceImpl implements HomeService {
         Calendar calendar = Calendar.getInstance();
         if (TimeTypeEnum.MONTH.equals(totalReq.getTimeType())) {
             String[] classDateSp = totalReq.getDateTime().split("-");
-            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1])-1, 1, 0, 0, 0);
             totalReq.setStartTime(calendar.getTime());
             totalReq.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } else if (TimeTypeEnum.YEAR.equals(totalReq.getTimeType())) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -60,7 +60,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
             teacher.setSubject(StringUtil.isEmpty(teacher.getSubject()) ? build.getSubject() : teacher.getSubject());
             teacher.setGradCertificate(StringUtil.isEmpty(teacher.getGradCertificate()) ? build.getGradCertificate() : teacher.getGradCertificate());
             teacher.setDegreeCertificate(StringUtil.isEmpty(teacher.getDegreeCertificate()) ? build.getDegreeCertificate() : teacher.getDegreeCertificate());
-            teacher.setTeacherCertificate(StringUtil.isEmpty(teacher.getTeacherCertificate())? build.getTeacherCertificate():teacher.getTeacherCertificate());
+            teacher.setTeacherCertificate(StringUtil.isEmpty(teacher.getTeacherCertificate()) ? build.getTeacherCertificate() : teacher.getTeacherCertificate());
         }
         teacher.setEntryFlag(authOperaReq.getPass() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         teacher.setEntryAuthDate(new Date());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -313,4 +313,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         teacherStyleVideoService.batchAddStyleVideo(createList);
         return HttpResponseResult.succeed(detail(teacherDto.getUserId()));
     }
+
+    @Override
+    public HttpResponseResult<Boolean> addHomeBrowse(Long userId) {
+        Integer num = baseMapper.addHomeBrowse(userId);
+        return HttpResponseResult.succeed(num > 0);
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherStyleVideoServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherStyleSearch;
 import com.yonge.cooleshow.biz.dal.vo.TeacherStyleVideoVo;
+import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.stereotype.Service;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.dao.TeacherStyleVideoDao;
@@ -34,4 +36,10 @@ public class TeacherStyleVideoServiceImpl extends ServiceImpl<TeacherStyleVideoD
     public IPage<TeacherStyleVideoVo> stylePage(IPage<TeacherStyleVideoVo> page, TeacherStyleSearch query) {
         return page.setRecords(baseMapper.stylePage(page, query));
     }
+
+    @Override
+    public HttpResponseResult<Boolean> addVideoBrowse(Long videoId) {
+        Integer num = baseMapper.addVideoBrowse(videoId);
+        return HttpResponseResult.succeed(num > 0);
+    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -62,7 +62,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private static final Map<GoodTypeEnum, Function<OrderReq.OrderReqInfo, HttpResponseResult<OrderCreateRes>>> orderCreate = new HashMap<>();
     //插入订单后执行
     private static final Map<GoodTypeEnum, Consumer<UserOrderDetailVo>> orderAfter = new HashMap<>();
-
     //订单完成后执行
     private static final Map<GoodTypeEnum, Consumer<UserOrderDetailVo>> orderSuccess = new HashMap<>();
     //订单取消后执行
@@ -113,8 +112,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     }
 
     @Override
-    public UserOrderVo detailApp(Long id) {
-        UserOrderVo userOrderVo = baseMapper.detailApp(id);
+    public UserOrderVo detailApp(UserOrder param) {
+        UserOrderVo userOrderVo = baseMapper.detailApp(param);
         if (null != userOrderVo) {
             List<UserOrderDetailVo> orderDetilList = orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo());
             orderDetilList.forEach(o -> {

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -136,4 +136,8 @@
     <update id="setSubject">
         update teacher set subject_id_ = #{subjectIds} where user_id_ = #{id}
     </update>
+
+    <update id="addHomeBrowse">
+        update teacher set browse_ = browse_ + 1 where user_id_ = #{userId}
+    </update>
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherStyleVideoMapper.xml

@@ -22,7 +22,7 @@
         , t.update_time_ as "updateTime"
         </sql>
 
-	<!-- 根据老师id查询 -->
+    <!-- 根据老师id查询 -->
     <select id="selectListByUserId" resultType="com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo">
 		SELECT
 			<include refid="baseColumns"/>
@@ -61,4 +61,9 @@
 		</where>
 		order by ta.live_flag_ desc,(ta.fans_num_ * 0.3 + t.browse_ * 0.3 + ta.exp_time_) desc
 	</select>
+
+	<update id="addVideoBrowse">
+		update teacher_style_video set browse_ = browse_ +1 where id_ = #{videoId}
+	</update>
+
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -72,7 +72,14 @@
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_
         left join sys_user u on t.user_id_ = u.id_
-        where t.id_ = #{id}
+        <where>
+            <if test="param.id != null">
+                and t.id_ = #{param.id}
+            </if>
+            <if test="param.orderNo != null and param.orderNo != ''">
+                and t.order_no_ = #{param.orderNo}
+            </if>
+        </where>
     </select>
 
     <select id="detailByOrderNo" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/TeacherController.java

@@ -16,6 +16,8 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -45,11 +47,28 @@ public class TeacherController extends BaseController {
 
     @ApiOperation(value = "个人风采-详情")
     @GetMapping("/queryTeacherStyle")
-    public HttpResponseResult<TeacherVo> queryTeacherStyle(@RequestParam("userId") Long userId) {
+    public HttpResponseResult<TeacherVo> queryTeacherStyle(@ApiParam(value = "用户ID", required = true) @RequestParam("userId") Long userId) {
         if(null == userId){
             return failed("缺少userId");
         }
         return teacherService.queryTeacherStyle(userId);
     }
 
+    @ApiOperation(value = "增加视频浏览量")
+    @GetMapping("/queryTeacherStyle")
+    public HttpResponseResult<Boolean> addVideoBrowse(@ApiParam(value = "视频ID", required = true) @RequestParam("videoId") Long videoId) {
+        if(null == videoId){
+            return failed("缺少videoId");
+        }
+        return styleVideoService.addVideoBrowse(videoId);
+    }
+
+    @ApiOperation(value = "增加主页浏览量")
+    @GetMapping("/addHomeBrowse")
+    public HttpResponseResult<Boolean> addHomeBrowse(@ApiParam(value = "老师ID", required = true) @RequestParam("userId") Long userId) {
+        if(null == userId){
+            return failed("缺少userId");
+        }
+        return teacherService.addHomeBrowse(userId);
+    }
 }

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -20,10 +20,7 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.date.DateUtil;
 import com.yonge.toolset.utils.string.StringUtil;
 import com.yonge.toolset.utils.web.WebUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -167,7 +164,7 @@ public class UserOrderController extends BaseController {
         try {
             Calendar calendar = Calendar.getInstance();
             String[] classDateSp = query.getSearchDate().split("-");
-            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1])-1, 1, 0, 0, 0);
             query.setStartTime(calendar.getTime());
             query.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } catch (Exception e) {
@@ -181,9 +178,23 @@ public class UserOrderController extends BaseController {
      * 查询单条
      */
     @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入id")
+    @ApiOperation(value = "通过id查询详情", notes = "传入id")
     public HttpResponseResult<UserOrderVo> detail(@PathVariable("id") Long id) {
-        UserOrderVo detail = userOrderService.detailApp(id);
-        return succeed();
+        UserOrder param = new UserOrder();
+        param.setId(id);
+        UserOrderVo detail = userOrderService.detailApp(param);
+        return succeed(detail);
+    }
+
+    /**
+     * 查询单条
+     */
+    @GetMapping("/detailByOrderNo/{orderNo}")
+    @ApiOperation(value = "通过订单号查询详情", notes = "传入orderNo")
+    public HttpResponseResult<UserOrderVo> detailByOrderNo(@PathVariable("orderNo")String orderNo) {
+        UserOrder param = new UserOrder();
+        param.setOrderNo(orderNo);
+        UserOrderVo detail = userOrderService.detailApp(param);
+        return succeed(detail);
     }
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -73,7 +73,7 @@ public class UserAccountController extends BaseController {
         try {
             Calendar calendar = Calendar.getInstance();
             String[] classDateSp = query.getSearchDate().split("-");
-            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1])-1, 1, 0, 0, 0);
             query.setStartTime(calendar.getTime());
             query.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } catch (Exception e) {
@@ -95,7 +95,7 @@ public class UserAccountController extends BaseController {
         Calendar calendar = Calendar.getInstance();
         if (TimeTypeEnum.MONTH.equals(totalReq.getTimeType())) {
             String[] classDateSp = totalReq.getDateTime().split("-");
-            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1])-1, 1, 0, 0, 0);
             totalReq.setStartTime(calendar.getTime());
             totalReq.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } else if (TimeTypeEnum.YEAR.equals(totalReq.getTimeType())) {
@@ -109,5 +109,4 @@ public class UserAccountController extends BaseController {
         }
         return userAccountService.accountTotal(totalReq);
     }
-
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserWithdrawalController.java

@@ -7,7 +7,6 @@ import com.yonge.cooleshow.biz.dal.dto.req.WithdrawalReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherWithdrawalSearch;
 import com.yonge.cooleshow.biz.dal.service.UserWithdrawalService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.biz.dal.vo.UserWithdrawalVo;
 import com.yonge.cooleshow.biz.dal.vo.res.WithdrawalInfoRes;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -23,8 +22,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.time.LocalDate;
-import java.time.temporal.TemporalAdjusters;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -71,7 +68,7 @@ public class UserWithdrawalController extends BaseController {
         try {
             Calendar calendar = Calendar.getInstance();
             String[] classDateSp = withdrawalSearch.getSearchDate().split("-");
-            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]), 1, 0, 0, 0);
+            calendar.set(Integer.parseInt(classDateSp[0]), Integer.parseInt(classDateSp[1]) - 1, 1, 0, 0, 0);
             withdrawalSearch.setStartTime(calendar.getTime());
             withdrawalSearch.setEndTime(DateUtil.dayEnd(DateUtil.getLastDayOfMonth(calendar.getTime())));
         } catch (Exception e) {