exit:修改列表读取顺序

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -179,7 +179,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 //计算总营收
                 BigDecimal userTotalPrice = smileRedisUtils.getUserTotalPrice(smilePriceParam.getUid());
                 smileRedisUtils.setUserTotalPrice(smilePriceParam.getUid(), price.add(userTotalPrice));
-            }else {
+            } else {
                 return AjaxResult.warn("打款失败,请刷新重试。");
             }
             /*smilePriceMapper.insert(smilePrice);
@@ -325,26 +325,22 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         Map<String, List<ShowBaseVoDto>> stringListMap = showBaseVoList.stream().collect(Collectors.groupingBy(ShowBaseVoDto::getAgentId));
         //创建list长度定位分组数量
         List<UserData> userDataList = new ArrayList<>(stringListMap.size());
-        //遍历分组
-        for (Map.Entry<String, List<ShowBaseVoDto>> showMap : stringListMap.entrySet()) {
-            String uid = showMap.getKey();
-            //判断uid是否已打款
-            Integer status = smileRedisUtils.getShowPriceUid(performancesId, showMap.getKey());
-            if (status != null) {
+
         //已打款跳出循环,去打款表中获取打款记录
         LambdaQueryWrapper<SmilePrice> lambdaQueryWrapper = Wrappers.lambdaQuery(SmilePrice.class);
         lambdaQueryWrapper.eq(SmilePrice::getPerformancesId, performancesId);
         lambdaQueryWrapper.eq(SmilePrice::getDelTag, 0);
-                lambdaQueryWrapper.eq(SmilePrice::getUid, showMap.getKey());
-                SmilePrice smilePrice = smilePriceMapper.selectOne(lambdaQueryWrapper);
-                if (smilePrice.getRecord()!=null&&!smilePrice.getRecord().equals("")){
+        List<SmilePrice> smilePrices = smilePriceMapper.selectList(lambdaQueryWrapper);
+        for (SmilePrice smilePrice : smilePrices) {
+            if (smilePrice.getRecord() != null && !smilePrice.getRecord().equals("")) {
                 UserData userData = JSON.parseObject(smilePrice.getRecord(), UserData.class);
                 userData.setPriceStatus(0);
                 userDataList.add(userData);
-                    continue;
             }
         }
 
+        //遍历分组
+        for (Map.Entry<String, List<ShowBaseVoDto>> showMap : stringListMap.entrySet()) {
             UserData userData = UserData.getNew();
             List<ShowBaseVoDto> showBaseVoDtoList = showMap.getValue();
             List<UserDataAgentVo> userDataAgentVos = new ArrayList<>();

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -143,6 +143,7 @@
                         WHERE
                             kotr.performance_id = #{performancesId}
                           AND kotr.agent_id != 0
+                          AND COALESCE ( kotr.agent_id, kotr.agent_id_master ) NOT IN ( SELECT sp.uid FROM smile_price AS sp WHERE sp.performanceS_id = #{performancesId} AND sp.record != '')
                         GROUP BY
                             uid
                     )