达人动态

alien-entity/src/main/java/shop/alien/entity/store/LifeBrowseRecord.java

@@ -62,4 +62,8 @@ public class LifeBrowseRecord {
     @ApiModelProperty(value = "修改人ID")
     @TableField("updated_user_id")
     private Integer updatedUserId;
+
+    @ApiModelProperty(value = "达人动态类型正常浏览动态 0 浏览动态停留三秒 1 ")
+    @TableField("dynamics_type")
+    private Integer dynamicsType;
 }

alien-entity/src/main/java/shop/alien/entity/store/LifeUserDynamics.java

@@ -114,10 +114,6 @@ public class LifeUserDynamics {
     @TableField("enable_status")
     private Integer enableStatus;
 
-    @ApiModelProperty(value = "订单GMV (达人发布动态使用的)")
-    @TableField("order_gmv")
-    private BigDecimal orderGmv;
-
     @ApiModelProperty(value = "达人id")
     @TableField("expert_id")
     private Integer expertId;
@@ -129,4 +125,8 @@ public class LifeUserDynamics {
     @ApiModelProperty(value = "转发量")
     @TableField("transfer_count")
     private Integer transferCount;
+
+    @ApiModelProperty(value = "达人动态实际浏览数")
+    @TableField("reality_count")
+    private Integer realityCount;
 }

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserDynamicsVo.java

@@ -77,4 +77,7 @@ public class LifeUserDynamicsVo extends LifeUserDynamics {
 
     @ApiModelProperty(value = "门店经营板块")
     private String businessSection;
+
+    @ApiModelProperty(value = "达人作品id")
+    private Integer workId;
 }

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -188,4 +188,8 @@ public class LifeUserOrderVo {
     @ApiModelProperty(value = "用户GMV")
     @TableField("orderGmv")
     private Integer orderGmv;
+
+    @ApiModelProperty(value = "用户GMV")
+    @TableField("expert_order_id")
+    private Integer expertOrderId;
 }

alien-entity/src/main/java/shop/alien/mapper/LifeUserOrderMapper.java

@@ -42,7 +42,7 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
             "\tselect id coupon_id,1 coupon_type,lc.name coupon_name, SUBSTRING_INDEX(image_path, ',', 1) AS image_id,0 effective_date_type,expiration_date effective_date_value \n" +
             "from life_coupon lc where lc.delete_flag = 0\n" +
             ")\n" +
-            "select luo.id,luo.buy_time,luo.status,luo.price,luo.final_price,luo.user_id,luo.store_id,luo.order_no,luo.pay_time,luo.cancel_time,luo.finish_time,luo.order_str,\n" +
+            "select luo.id,luo.buy_time,luo.status,luo.price,luo.final_price,luo.user_id,luo.store_id,luo.order_no,luo.pay_time,luo.cancel_time,luo.finish_time,luo.order_str,luo.expert_order_id,\n" +
             "si.store_name,si.commission_rate,si.business_section store_type,si.store_status,si.business_status,\n" +
             "count(ocm.coupon_code) coupon_count,\n" +
             "simg.img_url,\n" +

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

@@ -95,7 +95,8 @@
         info.store_name as storeName,
         info.id as storeId,
         info.business_section as businessSection,
-        COUNT(comment.id) AS commentCount
+        COUNT(comment.id) AS commentCount,
+        works.id as workId
         FROM
         life_user_dynamics AS dy
         INNER JOIN life_user_expert_order AS expertOrder
@@ -108,6 +109,8 @@
         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
+        ON dy.id = works.dynamics_id
         WHERE
         dy.id = #{id}
         AND dy.delete_flag = 0

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

@@ -55,6 +55,7 @@
         <result column="original_price" property="originalPrice"/>
         <result column="order_str" property="orderStr"/>
         <result column="store_user_tel" property="storeUserTel"/>
+        <result column="expert_order_id" property="expertOrderId"/>
 
         <collection property="orderCouponMiddleList" ofType="shop.alien.entity.store.vo.OrderCouponMiddleVo">
             <id column="ocmId" property="id" />
@@ -86,7 +87,7 @@
         ELSE '0.00'
         END as final_price,
         luo.order_str,
-        luo.pay_method,luo.buy_time,luo.cancel_time,luo.pay_time,luo.finish_time,luo.status order_status,luo.quan_id,luo.refund_time total_refund_time,
+        luo.pay_method,luo.buy_time,luo.cancel_time,luo.pay_time,luo.finish_time,luo.status order_status,luo.quan_id,luo.refund_time total_refund_time,luo.expert_order_id,
         tc.*,
         ldc.nominal_value,ldc.type,
         lu.user_phone,lu.user_name,lu.id user_id,

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

@@ -152,8 +152,18 @@ public class LifeUserDynamicsController {
     public R<Boolean> deleteDynamicsById(Integer id) {
         log.info("LifeUserDynamicsController.deleteDynamicsById?id={}", id);
         try {
-            lifeUserDynamicsService.deleteDynamicsById(id);
-            return R.success("删除成功");
+            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()));
+                }
+                return R.success("删除成功");
+            }else{
+                lifeUserDynamicsService.deleteDynamicsById(id);
+                return R.success("删除成功");
+            }
         } catch (Exception e) {
             log.error("LifeUserDynamicsController.deleteDynamicsById ERROR Msg={}", e.getMessage());
             return R.fail("删除失败");
@@ -290,10 +300,10 @@ public class LifeUserDynamicsController {
     @GetMapping("/getOrderGmvUser")
     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.countGvm(dynamicsId, finalPrice, orderId, expertId, expertOrderId));
+        return R.data(lifeUserDynamicsService.countGmv(dynamicsId, finalPrice, orderId, expertId, expertOrderId));
     }
 
-    @ApiOperation("用户通过达人推广进入店铺浏览数")
+    @ApiOperation("添加达人动态浏览数")
     @ApiOperationSupport(order = 8)
     @PostMapping("/addUserStoreBrowseNumber")
     public R addUserStoreBrowseNumber(@RequestBody LifeBrowseRecord lifeBrowseRecord) {

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

@@ -36,22 +36,22 @@ public class LifeUserExpertWorksController {
 
     private final LifeUserExpertWorksService lifeUserExpertWorksService;
 
-    @ApiOperation("用户对作品进行播放点赞评论分享埋点")
+    @ApiOperation("用户对作品进行浏览点赞评论分享埋点")
     @ApiOperationSupport(order = 1)
     @PostMapping("/updateWorksCount")
-    public Integer updateWorksCount(
+    public R updateWorksCount(
             @RequestBody LifeUserExpertWorks lifeUserExpertWorks) {
         // 输入验证
         if (Objects.isNull(lifeUserExpertWorks) || Objects.isNull(lifeUserExpertWorks.getId())) {
             log.error("传入的 LifeUserExpertWorks 对象或其 id 为空，无法进行更新操作");
-            return 0;
+            return R.fail("传入的 LifeUserExpertWorks 对象或其 id 为空，无法进行更新操作");
         }
         log.info("LifeUserExpertWorksController.updateWorksCount?updateWorksCount={}", lifeUserExpertWorks);
 
         String countColumn = getCountColumn(lifeUserExpertWorks);
         if (countColumn == null) {
             log.error("未找到有效的计数类型，无法进行更新操作，传入的对象：{}", lifeUserExpertWorks);
-            return 0;
+            return R.fail("未找到有效的计数类型，无法进行更新操作");
         }
 
         LambdaUpdateWrapper<LifeUserExpertWorks> wrapper = Wrappers.lambdaUpdate();
@@ -65,10 +65,10 @@ public class LifeUserExpertWorksController {
             } else {
                 log.warn("作品 ID 为 {} 的 {} 计数更新失败", lifeUserExpertWorks.getId(), countColumn);
             }
-            return result;
+            return R.data(result);
         } catch (Exception e) {
             log.error("更新作品计数时发生异常，作品 ID：{}，计数类型：{}", lifeUserExpertWorks.getId(), countColumn, e);
-            return 0;
+            return R.fail("更新作品计数时发生异常");
         }
     }
 

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

@@ -131,6 +131,10 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         return this.removeById(id);
     }
 
+    public LifeUserDynamics getDynamicsById(int id){
+        return this.getById(id);
+    }
+
     public Map<String, List<LifePinglunVo>> getUserDynamicsCommentById(String id) {
         LambdaUpdateWrapper<LifeComment> wrapper = new LambdaUpdateWrapper<>();
         wrapper.orderByDesc(LifeComment::getPinglunTime);
@@ -517,8 +521,8 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
             targetPhone = myStoreUser.getPhone();
         }
 
-        Integer myType ;
-        Integer myId ;
+        Integer myType;
+        Integer myId;
         if (myLifeUser != null && myLifeUser.getId() != null) {
             // 我是用户（类型1）
             myType = 1;
@@ -545,14 +549,14 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                         blacklist.getBlockerPhoneId()
                 ).filter(Objects::nonNull)) // 过滤null
                 .collect(Collectors.toSet());
-        if (!CollectionUtils.isEmpty(lifeUserDynamicsVos)){
+        if (!CollectionUtils.isEmpty(lifeUserDynamicsVos)) {
             for (LifeUserDynamicsVo lifeUserDynamicsVo : lifeUserDynamicsVos) {
-                if(combinedSet.contains(lifeUserDynamicsVo.getPhoneId())){
+                if (combinedSet.contains(lifeUserDynamicsVo.getPhoneId())) {
                     continue;
                 }
-                if (lifeUserDynamicsVo.getType().equals("2")){
+                if (lifeUserDynamicsVo.getType().equals("2")) {
                     String phoneIdNew = lifeUserDynamicsVo.getPhoneId().substring(6);
-                     StoreInfo storeInfo=storeInfoMapper.getStoreNameByPhone(phoneIdNew);
+                    StoreInfo storeInfo = storeInfoMapper.getStoreNameByPhone(phoneIdNew);
                     lifeUserDynamicsVo.setStoreName(storeInfo.getStoreName());
                 } else if (lifeUserDynamicsVo.getType().equals("1")) {
                     String phoneIdNew = lifeUserDynamicsVo.getPhoneId().substring(5);
@@ -562,7 +566,7 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
                 }
             }
         }
-        return  lifeUserDynamicsVos;
+        return lifeUserDynamicsVos;
     }
 
     public List<LifeUserDynamicsVo> getDynamicsList(Integer page, Integer size, String nickName, String userType, Integer dynamicsType, String releaseStartTime, String releaseEndTime) {
@@ -574,10 +578,10 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         // 查询动态数据并按类型过滤
         LifeUserDynamicsVo lifeUserDynamicsVo = new LifeUserDynamicsVo();
         List<LifeUserDynamicsVo> lifeUserDynamicsVoList = lifeUserDynamicsMapper.getDynamicsDetail(id);
-        if(!CollectionUtils.isEmpty(lifeUserDynamicsVoList)){
+        if (!CollectionUtils.isEmpty(lifeUserDynamicsVoList)) {
             lifeUserDynamicsVo = lifeUserDynamicsVoList.get(0);
             String imagePath = lifeUserDynamicsVo.getImagePath();
-            if(!StringUtils.isEmpty(imagePath)){
+            if (!StringUtils.isEmpty(imagePath)) {
                 List<String> imagePathList = Arrays.asList(imagePath.split(","));
                 lifeUserDynamicsVo.setImagePathList(imagePathList);
             }
@@ -600,34 +604,45 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
         return lifeUserDynamicsVo;
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    public R countGvm(Integer dynamicsId, String finalPrice, Integer orderId, Integer expertId, Integer expertOrderId) {
-            LambdaQueryWrapper<LifeUserExpertWorks> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(LifeUserExpertWorks :: getExpertId, expertId);
-            lambdaQueryWrapper.eq(LifeUserExpertWorks :: getOrderId, expertOrderId);
-            lambdaQueryWrapper.eq(LifeUserExpertWorks :: getDynamicsId, dynamicsId);
-            LifeUserExpertWorks lifeUserExpertWorks = lifeUserExpertWorksMapper.selectOne(lambdaQueryWrapper);
-            if(lifeUserExpertWorks != null){
-                BigDecimal price = new BigDecimal(finalPrice);
-                lifeUserExpertWorks.setOrderGmv(lifeUserExpertWorks.getOrderGmv().add(price));
-                lifeUserExpertWorksMapper.updateById(lifeUserExpertWorks);
-            }
+
+    public R countGmv(Integer dynamicsId, String finalPrice, Integer orderId, Integer expertId, Integer expertOrderId) {
+        LambdaQueryWrapper<LifeUserExpertWorks> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(LifeUserExpertWorks::getExpertId, expertId);
+        lambdaQueryWrapper.eq(LifeUserExpertWorks::getOrderId, expertOrderId);
+        lambdaQueryWrapper.eq(LifeUserExpertWorks::getDynamicsId, dynamicsId);
+        lambdaQueryWrapper.eq(LifeUserExpertWorks::getDeleteFlag, 0);
+        LifeUserExpertWorks lifeUserExpertWorks = lifeUserExpertWorksMapper.selectOne(lambdaQueryWrapper);
+        //用户购买订单 订单金额加入达人gmv中
+        if (lifeUserExpertWorks != null) {
+            BigDecimal price = new BigDecimal(finalPrice);
+            lifeUserExpertWorks.setOrderGmv(lifeUserExpertWorks.getOrderGmv().add(price));
+            lifeUserExpertWorksMapper.updateById(lifeUserExpertWorks);
+        }
 
         LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>()
-                .eq(LifeUserExpertOrder::getId, expertOrderId));
+                .eq(LifeUserExpertOrder::getId, expertOrderId)
+                .eq(LifeUserExpertOrder::getDeleteFlag,0));
+        //查询达人购买商户订单状态不是已完成
+        //判断达人动态浏览数和gmv 是否达到达人设置的限定值
         if (lifeUserExpertOrder != null && lifeUserExpertOrder.getStatus() != 5) {
             LifeUserExpertWorks lifeUserExpertWorks1 = lifeUserExpertWorksMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertWorks>()
-                    .eq(LifeUserExpertWorks :: getOrderId, expertOrderId)
-                    .eq(LifeUserExpertWorks :: getExpertId, expertId));
-            int liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>()
-                    .eq(LifeBrowseRecord :: getDynamicsId, dynamicsId).eq(LifeBrowseRecord :: getOrderId, expertOrderId));
-            if (lifeUserExpertWorks1.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && liulanNum >= lifeUserExpertOrder.getOrderPlayCount()) {
-                lifeUserExpertOrder.setStatus(5);
-                lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+                    .eq(LifeUserExpertWorks::getOrderId, expertOrderId)
+                    .eq(LifeUserExpertWorks::getExpertId, expertId)
+                    .eq(LifeUserExpertWorks::getDynamicsId, dynamicsId)
+                    .eq(LifeUserExpertWorks::getDeleteFlag, 0));
+            LifeUserDynamics lifeUserDynamics = lifeUserDynamicsMapper.selectOne(new LambdaQueryWrapper<LifeUserDynamics>()
+                    .eq(LifeUserDynamics::getId, dynamicsId)
+                    .eq(LifeUserDynamics::getDeleteFlag, 0));
+            if (lifeUserDynamics != null) {
+                if (lifeUserExpertWorks1.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && lifeUserDynamics.getLiulanCount() >= lifeUserExpertOrder.getOrderPlayCount()) {
+                    lifeUserExpertOrder.setStatus(5);
+                    lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+                }
             }
         }
+        //用户订单字段设置达人订单id 标识 该用户是从达人gmv链接进入购买订单的
         LambdaQueryWrapper<LifeUserOrder> userOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        userOrderLambdaQueryWrapper.eq(LifeUserOrder :: getId, orderId);
+        userOrderLambdaQueryWrapper.eq(LifeUserOrder::getId, orderId);
         LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectOne(userOrderLambdaQueryWrapper);
         lifeUserOrder.setExpertOrderId(expertOrderId);
         lifeUserOrderMapper.updateById(lifeUserOrder);
@@ -635,39 +650,59 @@ public class LifeUserDynamicsService extends ServiceImpl<LifeUserDynamicsMapper,
     }
 
     public boolean addUserStoreBrowseNumber(LifeBrowseRecord lifeBrowseRecord) {
+        int liulanNum = 0;
+        int threeSecondsNum = 0;
         // 获取当天开始时间（00:00:00）
         LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         // 获取当天结束时间（23:59:59.999）
         LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
         LifeBrowseRecord selectOne = lifeBrowseRecordMapper.selectOne(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord::getUserId, lifeBrowseRecord.getUserId())
                 .between(LifeBrowseRecord::getLiulanTime, todayStart, todayEnd).in(LifeBrowseRecord::getDeleteFlag, 0, 1).eq(LifeBrowseRecord::getDynamicsId, lifeBrowseRecord.getDynamicsId())
-                .eq(LifeBrowseRecord::getOrderId, lifeBrowseRecord.getOrderId()));
+                .eq(LifeBrowseRecord::getOrderId, lifeBrowseRecord.getOrderId())
+                .eq(LifeBrowseRecord::getDynamicsType, lifeBrowseRecord.getDynamicsType()));
         if (selectOne == 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);
-            //查询当前达人动态进入店铺详情浏记录数
-            int liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord :: getDynamicsId, lifeBrowseRecord.getDynamicsId())
-                    .eq(LifeBrowseRecord :: getOrderId, lifeBrowseRecord.getOrderId()).in(LifeBrowseRecord :: getDeleteFlag, 0, 1));
-            LambdaUpdateWrapper<LifeUserExpertWorks> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-            lambdaUpdateWrapper.eq(LifeUserExpertWorks :: getId, lifeBrowseRecord.getDynamicsId());
-            lambdaUpdateWrapper.set(LifeUserExpertWorks :: getPlayCount, liulanNum);
-            lifeUserExpertWorksMapper.update(null,lambdaUpdateWrapper);
         }
+        LifeUserDynamics lifeUserDynamics = lifeUserDynamicsMapper.selectById(lifeBrowseRecord.getDynamicsId());
+        if(lifeUserDynamics != null){
+            //查询达人动态正常浏览数
+            liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord::getDynamicsId, lifeBrowseRecord.getDynamicsId())
+                    .eq(LifeBrowseRecord::getOrderId, lifeBrowseRecord.getOrderId()).in(LifeBrowseRecord::getDeleteFlag, 0, 1)
+                    .eq(LifeBrowseRecord::getDynamicsType, 0));
+            if (liulanNum > lifeUserDynamics.getLiulanCount()) {
+                LambdaUpdateWrapper<LifeUserDynamics> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lambdaUpdateWrapper.eq(LifeUserDynamics::getId, lifeBrowseRecord.getDynamicsId());
+                lambdaUpdateWrapper.set(LifeUserDynamics::getLiulanCount, liulanNum);
+                lifeUserDynamicsMapper.update(null, lambdaUpdateWrapper);
+            }
+            //查询达人动态停留三秒浏览数
+            threeSecondsNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord::getDynamicsId, lifeBrowseRecord.getDynamicsId())
+                    .eq(LifeBrowseRecord::getOrderId, lifeBrowseRecord.getOrderId()).in(LifeBrowseRecord::getDeleteFlag, 0, 1)
+                    .eq(LifeBrowseRecord::getDynamicsType, 1));
+            if (threeSecondsNum > lifeUserDynamics.getRealityCount()) {
+                LambdaUpdateWrapper<LifeUserDynamics> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+                lambdaUpdateWrapper.eq(LifeUserDynamics::getId, lifeBrowseRecord.getDynamicsId());
+                lambdaUpdateWrapper.set(LifeUserDynamics::getRealityCount, threeSecondsNum);
+                lifeUserDynamicsMapper.update(null, lambdaUpdateWrapper);
+            }
 
-        //查询gmv和进店详情浏览数数是否满足当前达人订单规定值 都满足修改订单状态为已完成
-        LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>().eq(LifeUserExpertOrder::getId, lifeBrowseRecord.getOrderId()));
-        if (lifeUserExpertOrder != null && lifeUserExpertOrder.getStatus() != 5) {
-            int liulanNum = lifeBrowseRecordMapper.selectCount(new LambdaQueryWrapper<LifeBrowseRecord>().eq(LifeBrowseRecord :: getDynamicsId, lifeBrowseRecord.getDynamicsId())
-                    .eq(LifeBrowseRecord :: getOrderId, lifeBrowseRecord.getOrderId()));
-            LifeUserExpertWorks lifeUserExpertWorks = lifeUserExpertWorksMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertWorks>().eq(LifeUserExpertWorks :: getDynamicsId, lifeBrowseRecord.getDynamicsId())
-                    .eq(LifeUserExpertWorks :: getOrderId, lifeBrowseRecord.getOrderId()));
-            if(lifeUserExpertWorks != null){
-                if (lifeUserExpertWorks.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && liulanNum >= lifeUserExpertOrder.getOrderPlayCount()) {
-                    lifeUserExpertOrder.setStatus(5);
-                    lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+            //查询gmv和动态浏览数是否满足当前达人订单规定值 都满足修改订单状态为已完成
+            LifeUserExpertOrder lifeUserExpertOrder = lifeUserExpertOrderMapper.selectOne(new LambdaQueryWrapper<LifeUserExpertOrder>()
+                    .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())
+                        .eq(LifeUserExpertWorks::getOrderId, lifeBrowseRecord.getOrderId())
+                        .eq(LifeUserExpertWorks::getDeleteFlag, 0));
+                if (lifeUserExpertWorks != null) {
+                    if (lifeUserExpertWorks.getOrderGmv().compareTo(lifeUserExpertOrder.getOrderGmv()) >= 0 && liulanNum >= lifeUserExpertOrder.getOrderPlayCount()) {
+                        lifeUserExpertOrder.setStatus(5);
+                        lifeUserExpertOrderMapper.updateById(lifeUserExpertOrder);
+                    }
                 }
             }
         }