Merge remote-tracking branch 'origin/dev' into dev

mp-service/src/main/java/com/qs/mp/user/service/IUserAddrService.java

@@ -12,11 +12,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-03-02
  */
 public interface IUserAddrService extends IService<UserAddr> {
-  UserAddr getDefaultChannelAddr(Long channelId);
+  UserAddr getDefaultChannelAddr(Long userId);
 
-  boolean updateDefaultChannelAddr(Long addrId, Long channelId);
+  boolean updateDefaultChannelAddr(Long addrId, Long userId);
 
-  boolean removeChannelAddrByUserId(Long addrId, Long channelId);
+  boolean removeChannelAddrByUserId(Long addrId, Long userId);
 
-  UserAddr getChannelAddrByUserId(Long addrId, Long channelId);
+  UserAddr getChannelAddrByUserId(Long addrId, Long userId);
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserAddrServiceImpl.java

@@ -6,8 +6,10 @@ import com.qs.mp.user.domain.UserAddr;
 import com.qs.mp.user.mapper.UserAddrMapper;
 import com.qs.mp.user.service.IUserAddrService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 /**
  * <p>
@@ -22,29 +24,34 @@ public class UserAddrServiceImpl extends ServiceImpl<UserAddrMapper, UserAddr> i
     IUserAddrService {
 
   @Override
-  public UserAddr getDefaultChannelAddr(Long channelId) {
-    return getOne(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, channelId)
+  public UserAddr getDefaultChannelAddr(Long userId) {
+    List<UserAddr> userAddrList = list(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId,
+            userId)
         .eq(UserAddr::getCommonAddr, 1));
+    if (CollectionUtils.isEmpty(userAddrList)) {
+      return null;
+    }
+    return userAddrList.get(0);
   }
 
   @Override
   @Transactional
-  public boolean updateDefaultChannelAddr(Long addrId, Long channelId) {
+  public boolean updateDefaultChannelAddr(Long addrId, Long userId) {
     update(new LambdaUpdateWrapper<UserAddr>().set(UserAddr::getCommonAddr, 0)
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getCommonAddr, 1));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getCommonAddr, 1));
     return update(new LambdaUpdateWrapper<UserAddr>().set(UserAddr::getCommonAddr, 1)
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getAddrId, addrId));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getAddrId, addrId));
   }
 
   @Override
-  public boolean removeChannelAddrByUserId(Long addrId, Long channelId) {
+  public boolean removeChannelAddrByUserId(Long addrId, Long userId) {
     return remove(new LambdaQueryWrapper<UserAddr>()
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getAddrId, addrId));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getAddrId, addrId));
   }
 
   @Override
-  public UserAddr getChannelAddrByUserId(Long addrId, Long channelId) {
+  public UserAddr getChannelAddrByUserId(Long addrId, Long userId) {
     return getOne(new LambdaQueryWrapper<UserAddr>()
-        .eq(UserAddr::getUserId, channelId).eq(UserAddr::getAddrId, addrId));
+        .eq(UserAddr::getUserId, userId).eq(UserAddr::getAddrId, addrId));
   }
 }

mp-service/src/main/resources/mapper/user/UserTicketOrderItemMapper.xml

@@ -31,8 +31,8 @@
          left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
          left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
          left join mp_ticket_box t4 on t3.box_id = t4.box_id
-         left join mp_user_hit_prize t5 on t2.order_id = t5.order_id
-         left join mp_ticket_awards_prize t6 on t5.prize_id = t6.prize_id
+         left join mp_user_hit_prize t5 on t5.ticket_id = t1.ticket_id
+         left join mp_ticket_awards_prize t6 on t6.prize_id = t5.prize_id
             ${ew.customSqlSegment}
     </select>