liweifan vor 3 Jahren
Ursprung
Commit
d3ceeba206

+ 3 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserFirstTime.java

@@ -44,6 +44,9 @@ public class UserFirstTime implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
 
+    public UserFirstTime() {
+    }
+
     public UserFirstTime(Long userId, ClientEnum userType, UserFirstTimeTypeEnum timeType, Date time) {
         this.userId = userId;
         this.userType = userType;

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityPlanMapper.xml

@@ -92,7 +92,7 @@
                 and t.activity_type_ = #{param.activityType}
             </if>
         </where>
-        order by t.id_ desc
+        order by t.update_time_ desc
 	</select>
 
 	<select id="selectActivityPlanEvaluation" resultType="java.lang.String">

+ 1 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRegistrationMapper.xml

@@ -94,5 +94,6 @@
                 and a.num > 0
             </if>
         </where>
+        order by t.create_time_ desc
 	</select>
 </mapper>

+ 1 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardChangeStockMapper.xml

@@ -55,5 +55,6 @@
                 and t.create_time_ &lt;= #{param.endTime}
             </if>
         </where>
+        order by t.create_time_ desc
     </select>
 </mapper>

+ 6 - 6
cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityUserRewardMapper.xml

@@ -35,12 +35,12 @@
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserRewardVo">
         SELECT
-        su.id_ as userId,
-        su.real_name_ as realName,
-        su.username_ as username,
-        su.phone_ as phone,
-        t.create_time_ as createTime,
-        group_concat(if(t.grant_flag_ = 1,ar.reward_name_,null)) as rewardNames
+            su.id_ as userId,
+            su.real_name_ as realName,
+            su.username_ as username,
+            su.phone_ as phone,
+            t.create_time_ as createTime,
+            group_concat(if(t.grant_flag_ = 1,ar.reward_name_,null)) as rewardNames
         FROM activity_user_reward t
         left join activity_reward ar on ar.id_ = t.reward_id_
         left join sys_user su on t.user_id_ = su.id_