bug:exit

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

@@ -468,6 +468,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     }
                     //不是特邀代理  //在原有的数据上新增加该用户下所有普代的提成
                     BigDecimal decimal = agentIdMasterMap.get(smileUser.getUid());
+                    if (decimal!=null){
                         userData.setTotalCommission(new BigDecimal(decimal.stripTrailingZeros().toPlainString()));
                         userData.setUid(smileUser.getUid());
                         userData.setUsername(smileUser.getName());
@@ -492,6 +493,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         smileRedisUtils.setUserDataByUid(userData, performancesId);
                         userDataList.add(userData);
                     }
+                }
             });
         }
         saleDataVo.setUserDataList(userDataList);

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

@@ -182,8 +182,9 @@
         FROM smile_user AS su
                  INNER JOIN (SELECT kotr.agent_id, kotr.agent_id_master
                              FROM kylin_order_ticket_relations AS kotr
+                                      INNER JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
                              WHERE kotr.performance_id = #{performancesId}
-                               AND kotr.agent_id != 0) kk ON su.uid = kk.agent_id_master
+                               AND kotr.agent_id != 0 AND kots.status IN (1,6,3)) kk ON su.uid = kk.agent_id_master
         GROUP BY su.uid
     </select>