Merge remote-tracking branch 'origin/master' into wepay-paysign

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamCaomeiBadgeMapper.java

@@ -104,4 +104,7 @@ public interface AdamCaomeiBadgeMapper extends BaseMapper<AdamCaomeiBadge> {
             "values (#{userId}, #{badgeId}, #{source}, now())"
     })
     int insertUserBadge(@Param("userId") String userId, @Param("badgeId") String badgeId, @Param("source") Integer source);
+
+    @Select("select title from kylin_performances where performances_id = #{performanceId}")
+    String selectKylinPerformanceTitleById(@Param("performanceId") String performanceId);
 }

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamCaomeiPassportMapper.xml

@@ -67,7 +67,7 @@
             IFNULL(b.icon, '') AS icon,
             IFNULL(b.share_text, '') AS shareText,
             IFNULL(b.type, 0) AS type,
-            IFNULL(b.performance_id, '') AS performanceId,
+            performance_id AS performanceId,
             ub.created_at AS claimedAt,
             ub.source AS source
         FROM adam_caomei_user_badge ub

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -812,6 +812,11 @@ public class AdamRdmService {
             if (vo != null) {
                 return vo.getTitle();
             }
+            // 从数据库查询
+            String title = adamCaomeiBadgeMapper.selectKylinPerformanceTitleById(performanceId);
+            if (!StringUtils.isEmpty(title)) {
+                return title;
+            }
             return null;
         } catch (Exception e) {
             log.warn("[getPerformanceTitleById] 读取演出缓存失败, performanceId: {}", performanceId, e);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCaomeiBadgeUserServiceImpl.java

@@ -230,6 +230,8 @@ public class AdamCaomeiBadgeUserServiceImpl implements IAdamCaomeiBadgeUserServi
         dto.setType(badge.getType());
         dto.setClaimedAt(now);
         dto.setSource(source);
+        dto.setSubTitle(badge.getSubTitle());
+        dto.setPerformanceId(StringUtils.defaultString(badge.getPerformanceId()));
 
         adamRdmService.addUserCaomeiBadgeDtoByUid(uid, badgeVos, dto);
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCaomeiPassportUserServiceImpl.java

@@ -124,6 +124,7 @@ public class AdamCaomeiPassportUserServiceImpl implements IAdamCaomeiPassportUse
                         dto.setType(b.getType());
                         dto.setClaimedAt(grantAt);
                         dto.setSource(1);
+                        dto.setSubTitle(b.getSubTitle());
                         return dto;
                     })
                     .collect(Collectors.toList());