推送优化

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MessageTypeEnum.java

@@ -102,7 +102,7 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     PIANO_ROOM_ADJUST("琴房课调整"),
     PRACTICE_ADJUST("陪练课调整"),
-    ACTIVITY_WIN("获奖推送"),
+    ACTIVITY_WIN("获奖消息"),
 
     ;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -18,6 +18,7 @@ import com.yonge.cooleshow.common.enums.CacheNameEnum;
 import com.yonge.cooleshow.common.enums.RewardTypeEnum;
 import com.yonge.cooleshow.common.enums.UnitEnum;
 import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.payment.util.DistributedLock;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.redisson.RedissonMultiLock;
@@ -190,7 +191,9 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 activityRewardName.append(activityReward.getRewardName());
             }
             // 发送活动获奖推送
-            sendActivityMessage(userId, activityPlan.getActivityName(), activityRewardName.toString(), activityPlan.getActivityClient());
+            if (!StringUtil.isEmpty(activityRewardName)) {
+                sendActivityMessage(userId, activityPlan.getActivityName(), activityRewardName.toString(), activityPlan.getActivityClient());
+            }
         } finally {
             if (lock.getHoldCount() >0)
                 lock.unlock();

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -237,7 +237,8 @@
                 (st.first_video_time_ is null and od.good_type_ = 'VIDEO') or
                 (st.first_live_time_ is null and od.good_type_ = 'LIVE') or
                 (st.first_activity_time_ is null and od.good_type_ = 'ACTI_REGIST') or
-                (st.first_music_time_ is null and od.good_type_ = 'MUSIC')
+                (st.first_music_time_ is null and od.good_type_ = 'MUSIC')  or
+                (st.first_pay_time_ is null and t.actual_price_ > 0)
             )
         )
         <if test="param.startTime !=null">