Merge branch 'fix-1021161' into 'master'

fix order

See merge request rays/pcloud-book!478

pcloud-service-book/src/main/java/com/pcloud/book/group/set/GroupSet.java

@@ -832,7 +832,7 @@ public class GroupSet {
                     selfPlanUserDto.setWxUserId(wechatUserId);
                     selfPlanUserDto.setNickName(userDTO.getNickName());
                     selfPlanUserDto.setSex(userDTO.getSex());
-                    if (MapUtils.isEmpty(selfPlanUserDtoMap) && selfPlanUserDtoMap.containsKey(wechatUserId) &&
+                    if (!MapUtils.isEmpty(selfPlanUserDtoMap) && selfPlanUserDtoMap.containsKey(wechatUserId) &&
                             null != selfPlanUserDtoMap.get(wechatUserId)){
                         selfPlanUserDto.setSlefPlanCount(selfPlanUserDtoMap.get(wechatUserId).getSlefPlanCount());
                         selfPlanUserDto.setOrderCount(selfPlanUserDtoMap.get(wechatUserId).getOrderCount());

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlSelfPlanMapper.xml

@@ -120,7 +120,7 @@
     where id = #{planId}
   </update>
 
-  <select id="getSelfPlanUserDtoMap" parameterType="list" resultType="java.util.Map">
+  <select id="getSelfPlanUserDtoMap" parameterType="list" resultType="com.pcloud.book.timecontrol.dto.SelfPlanUserDto">
     SELECT
     wx_id wxUserId,
     count(id) slefPlanCount,
@@ -135,6 +135,7 @@
       </foreach>
     </if>
     </where>
+    group by wx_id
   </select>
 
   <update id="updateServiceState" parameterType="com.pcloud.book.timecontrol.entity.TimeControlSelfPlan">