bugfix:点赞列表添加是否关注对方，对是否关注我字段

删除无用代码

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

@@ -43,11 +43,34 @@ public interface LifeUserDynamicsMapper extends BaseMapper<LifeUserDynamics> {
             "${ew.customSqlSegment}")
     List<LifeUserDynamicsVo> getStoreDynamicslist(@Param("userId") String userId, @Param(Constants.WRAPPER) QueryWrapper<LifeUserDynamics> dynamicsWrapper);
 
-    @Select("select lud.*,'1' isLike\n" +
-            "from life_user_dynamics lud \n" +
-            "where lud.delete_flag = 0 \n" +
-            "and lud.id in (select llr.huifu_id from life_like_record llr where llr.dianzan_id = #{phoneId} and llr.delete_flag = 0) \n"+
-            "and lud.phone_id not in (select lb.blocked_phone_id  from life_blacklist lb where lb.blocker_phone_id = #{phoneId} and lb.delete_flag = 0)")
+    @Select("with middle_lud as (\n" +
+            "  select distinct  \n" +
+            "    lud.*,\n" +
+            "    '1' as isLike  \n" +
+            "  from life_user_dynamics lud\n" +
+            "  inner join (\n" +
+            "    select distinct huifu_id  \n" +
+            "    from life_like_record llr\n" +
+            "    where llr.dianzan_id = #{phoneId}\n" +
+            "      and llr.delete_flag = 0\n" +
+            "  ) llr_sub on lud.id = llr_sub.huifu_id\n" +
+            "  where lud.delete_flag = 0\n" +
+            "    and not exists (  -- 替代NOT IN，避免NULL问题\n" +
+            "      select 1 from life_blacklist lb\n" +
+            "      where lb.blocker_phone_id = #{phoneId}\n" +
+            "        and lb.delete_flag = 0\n" +
+            "        and lb.blocked_phone_id = lud.phone_id\n" +
+            "    )\n" +
+            ")\n" +
+            "select middle_lud.*,\n" +
+            "  CASE \n" +
+            "    WHEN lf.id is not null THEN 1\n" +
+            "    ELSE 0                        \n" +
+            "  END AS isFollowThis  \n" +
+            "from middle_lud\n" +
+            "left join life_fans lf on lf.fans_id = #{phoneId} \n" +
+            "                      and lf.followed_id = middle_lud.phone_id\n" +
+            "                      and lf.delete_flag = '0'")
     List<LifeUserDynamicsVo> selectDianZanList(String phoneId);
 
     List<LifeUserDynamicsVo> getDynamicsList(@Param("nickName") String nickName, @Param("userType") String userType, @Param("dynamicsType") Integer dynamicsType, @Param("releaseStartTime") String releaseStartTime, @Param("releaseEndTime") String releaseEndTime);

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
@@ -13,8 +12,6 @@ import shop.alien.entity.store.LifeRefundOrder;
 import shop.alien.entity.store.dto.LifeUserOrderDto;
 import shop.alien.entity.store.vo.LifeUserOrderVo;
 import shop.alien.store.service.LifeUserOrderService;
-import shop.alien.util.common.AlipayTradeAppPay;
-import shop.alien.util.common.UniqueRandomNumGenerator;
 
 import java.util.Map;
 
@@ -28,26 +25,6 @@ public class LifeUserOrderController {
 
     private final LifeUserOrderService lifeUserOrderService;
 
-    @ApiOperation("获取支付信息")
-    @ApiOperationSupport(order = 1)
-    @ApiImplicitParams({@ApiImplicitParam(name = "payPrice", value = "payPrice", dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "quanName", value = "quanName", dataType = "String", paramType = "query")})
-    @GetMapping("/getOrderStrForPay")
-    public R<Map<String, Object>> getOrderStrForPay(@RequestParam("payPrice") String payPrice,
-                                                    @RequestParam("quanName") String quanName) {
-        log.info("LifeUserStoreController.getOrderStrForPay?payPrice={},quanName={}", payPrice, quanName);
-        String orderNo = UniqueRandomNumGenerator.generateUniqueCode(19);
-        String orderStr = AlipayTradeAppPay.executeAlipayPayment(orderNo, payPrice, quanName);
-        if (!orderStr.equals("调用失败") && !orderStr.isEmpty()) {
-            Map<String, Object> returnMap = new HashedMap<>();
-            returnMap.put("orderStr", orderStr);
-            returnMap.put("orderNo", orderNo);
-            return R.data(returnMap);
-        } else {
-            return R.fail("支付失败");
-        }
-    }
-
 
     @ApiOperation("创建订单")
     @ApiOperationSupport(order = 2)