代码优化

alien-entity/src/main/resources/mapper/LifeUserDynamicsMapper.xml

@@ -90,7 +90,31 @@
 
     <select id="getExpertDynamicsDetail" resultType="shop.alien.entity.store.vo.LifeUserDynamicsVo">
         SELECT
-        dy.*,
+        dy.id,
+        dy.phone_id,
+        dy.title,
+        dy.context,
+        dy.image_path,
+        dy.address,
+        dy.liulan_count,
+        dy.dianzan_count,
+        dy.type,
+        dy.draft,
+        dy.delete_flag,
+        dy.created_time,
+        dy.created_user_id,
+        dy.updated_time,
+        dy.updated_user_id,
+        dy.address_name,
+        dy.address_context,
+        dy.address_province,
+        dy.top_status,
+        dy.top_time,
+        dy.enable_status,
+        dy.business_id,
+        dy.expert_id,
+        dy.transfer_count,
+        dy.reality_count,
         info.score_avg as scoreAvg,
         info.store_name as storeName,
         info.id as storeId,
@@ -99,17 +123,21 @@
         works.id as workId
         FROM
         life_user_dynamics AS dy
-        INNER JOIN life_user_expert_order AS expertOrder
+        INNER JOIN
+        life_user_expert_order AS expertOrder
         ON dy.business_id = expertOrder.id
         AND expertOrder.delete_flag = 0
-        INNER JOIN store_info AS info
+        INNER JOIN
+        store_info AS info
         ON expertOrder.store_id = info.id
         AND info.delete_flag = 0
-        LEFT JOIN store_comment AS comment
+        LEFT JOIN
+        store_comment AS comment
         ON comment.store_id = info.id
         AND comment.delete_flag = 0
         AND comment.business_type in ( 5 )
-        LEFT JOIN life_user_expert_works AS works
+        LEFT JOIN
+        life_user_expert_works AS works
         ON dy.id = works.dynamics_id
         WHERE
         dy.id = #{id}

alien-store/src/main/java/shop/alien/store/controller/LifeUserDynamicsController.java

@@ -125,6 +125,8 @@ public class LifeUserDynamicsController {
                             lifeUserExpertOrder.setStatus(4);
                             lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
                         }
+
+                        //达人作品同步增加一条达人动态记录
                         LifeUserExpertWorks lifeUserExpertWorks = new LifeUserExpertWorks();
                         lifeUserExpertWorks.setExpertId(lifeUserDynamics.getExpertId());
                         lifeUserExpertWorks.setOrderId(lifeUserDynamics.getBusinessId());
@@ -155,6 +157,7 @@ public class LifeUserDynamicsController {
             LifeUserDynamics lifeUserDynamics = lifeUserDynamicsService.getDynamicsById(id);
             if(lifeUserDynamics !=null && lifeUserDynamics.getExpertId() !=null){
                 boolean flag = lifeUserDynamicsService.deleteDynamicsById(id);
+                //同步删除达人作品表关联记录
                 if(flag){
                     lifeUserExpertWorksMapper.delete(new LambdaQueryWrapper<LifeUserExpertWorks>()
                             .eq(LifeUserExpertWorks :: getDynamicsId, lifeUserDynamics.getId()));
@@ -288,7 +291,7 @@ public class LifeUserDynamicsController {
     }
 
 
-    @ApiOperation("GMV用户购买推荐店铺订单")
+    @ApiOperation("GMV链接用户购买推荐店铺订单")
     @ApiOperationSupport(order = 7)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "dynamicsId", value = "达人动态Id", dataType = "Integer", paramType = "query", required = true),
@@ -298,7 +301,11 @@ public class LifeUserDynamicsController {
             @ApiImplicitParam(name = "expertOrderId", value = "达人订单id", dataType = "Integer", paramType = "query", required = true)
     })
     @GetMapping("/getOrderGmvUser")
-    public R getOrderGmvUser(@RequestParam() Integer dynamicsId, @RequestParam() String finalPrice, @RequestParam() Integer orderId, @RequestParam() Integer expertId, @RequestParam() Integer expertOrderId) {
+    public R getOrderGmvUser(@RequestParam() Integer dynamicsId,
+                             @RequestParam() String finalPrice,
+                             @RequestParam() Integer orderId,
+                             @RequestParam() Integer expertId,
+                             @RequestParam() Integer expertOrderId) {
         log.info("LifeUserDynamicsController.getOrderGmvUser?dynamicsId={}&finalPrice={}&userId={}&expertId={}expertOrderId", dynamicsId, finalPrice, orderId, expertId, expertOrderId);
         return R.data(lifeUserDynamicsService.countGmv(dynamicsId, finalPrice, orderId, expertId, expertOrderId));
     }

alien-store/src/main/java/shop/alien/store/service/LifeUserDynamicsService.java

@@ -619,9 +619,11 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
             lifeUserExpertWorksMapper.updateById(lifeUserExpertWorks);
         }
 
-        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>()
-                .eq(LifeUserExpertOrder::getId, expertOrderId)
-                .eq(LifeUserExpertOrder::getDeleteFlag, 0));
+        LambdaQueryWrapper<LifeUserExpertOrder> lifeUserExpertOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lifeUserExpertOrderLambdaQueryWrapper.eq(LifeUserExpertOrder::getId, expertOrderId);
+        lifeUserExpertOrderLambdaQueryWrapper.eq(LifeUserExpertOrder::getDeleteFlag, 0);
+        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(lifeUserExpertOrderLambdaQueryWrapper);
+
         //查询达人购买商户订单状态不是已完成
         //判断达人动态浏览数和gmv 是否达到达人设置的限定值
         if (lifeUserExpertOrder != null && lifeUserExpertOrder.getStatus() != 5) {
@@ -634,7 +636,8 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                     .eq(LifeUserDynamics::getId, dynamicsId)
                     .eq(LifeUserDynamics::getDeleteFlag, 0));
             if (lifeUserDynamics != null) {
-                if (lifeUserExpertWorks1.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && lifeUserDynamics.getLiulanCount() >= lifeUserExpertOrder.getOrderPlayCount()) {
+                if (lifeUserExpertWorks1.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0
+                        && lifeUserDynamics.getLiulanCount() >= lifeUserExpertOrder.getOrderPlayCount()) {
                     lifeUserExpertOrder.setStatus(5);
                     lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
                 }
@@ -650,12 +653,15 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
     }
 
     public boolean addUserStoreBrowseNumber(LifeBrowseRecord lifeBrowseRecord) {
+        // 浏览数
         int liulanNum = 0;
+
         // 1.处理当天浏览记录（去重插入）
         handleTodayBrowseRecord(lifeBrowseRecord);
 
         // 2.更新动态浏览统计数据并获取浏览数
         LifeUserDynamics lifeUserDynamics = lifeUserDynamicsMapper.selectById(lifeBrowseRecord.getDynamicsId());
+
         if (lifeUserDynamics == null) {
             return false;
         }
@@ -667,11 +673,14 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                 .eq(LifeUserExpertOrder::getId, lifeBrowseRecord.getOrderId())
                 .eq(LifeUserExpertOrder::getDeleteFlag, 0));
         if (lifeUserExpertOrder != null && lifeUserExpertOrder.getStatus() != 5) {
-            LifeUserExpertWorks lifeUserExpertWorks = lifeUserExpertWorksMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertWorks>().eq(LifeUserExpertWorks::getDynamicsId, lifeBrowseRecord.getDynamicsId())
+            LifeUserExpertWorks lifeUserExpertWorks = lifeUserExpertWorksMapper.selectOne(
+                    new LambdaQueryWrapper<LifeUserExpertWorks>()
+                    .eq(LifeUserExpertWorks::getDynamicsId, lifeBrowseRecord.getDynamicsId())
                     .eq(LifeUserExpertWorks::getOrderId, lifeBrowseRecord.getOrderId())
                     .eq(LifeUserExpertWorks::getDeleteFlag, 0));
             if (lifeUserExpertWorks != null) {
-                if (lifeUserExpertWorks.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && liulanNum >= lifeUserExpertOrder.getOrderPlayCount()) {
+                if (lifeUserExpertWorks.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0
+                        && liulanNum >= lifeUserExpertOrder.getOrderPlayCount()) {
                     lifeUserExpertOrder.setStatus(5);
                     lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
                 }
@@ -686,9 +695,11 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
     private void handleTodayBrowseRecord(LifeBrowseRecord lifeBrowseRecord) {
         // 获取当天开始时间（00:00:00）
         LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+
         // 获取当天结束时间（23:59:59.999）
         LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
 
+        //封装查询当天浏览记录参数
         LifeBrowseRecord existingRecord = lifeBrowseRecordMapper.selectOne(
                 new LambdaQueryWrapper<LifeBrowseRecord>()
                         .eq(LifeBrowseRecord::getUserId, lifeBrowseRecord.getUserId())
@@ -699,9 +710,11 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                         .eq(LifeBrowseRecord::getDynamicsType, lifeBrowseRecord.getDynamicsType())
         );
 
+        //当天没有记录则插入一条
         if (existingRecord == null) {
             lifeBrowseRecord.setCreatedTime(new DateTime());
             lifeBrowseRecord.setLiulanTime(new DateTime());
+            //浏览数日为年月日
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             lifeBrowseRecord.setLiulanDate(sdf.format(new Date()));
             lifeBrowseRecordMapper.insert(lifeBrowseRecord);
@@ -714,11 +727,15 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
      * @return 正常浏览数，用于后续订单状态判断
      */
     private int updateDynamicsBrowseCount(LifeBrowseRecord lifeBrowseRecord, LifeUserDynamics lifeUserDynamics) {
+        //动态id
         String dynamicsId = lifeBrowseRecord.getDynamicsId();
+
+        //达人订单id
         String orderId = lifeBrowseRecord.getOrderId();
 
         // 更新正常浏览数
         int liulanNum = lifeBrowseRecordMapper.getCountBrowseNum(dynamicsId, orderId, 0);
+        //浏览记录表浏览数 > 动态浏览数 更新动态浏览数
         if (liulanNum > lifeUserDynamics.getLiulanCount()) {
             LambdaUpdateWrapper<LifeUserDynamics> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(LifeUserDynamics::getId, dynamicsId)
@@ -728,6 +745,7 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
 
         // 更新停留三秒浏览数
         int threeSecondsNum = lifeBrowseRecordMapper.getCountBrowseNum(dynamicsId, orderId, 1);
+        //浏览记录表停留三秒浏览数 > 动态浏览数 更新动态停留三秒浏览数
         if (threeSecondsNum > lifeUserDynamics.getRealityCount()) {
             LambdaUpdateWrapper<LifeUserDynamics> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(LifeUserDynamics::getId, dynamicsId)