exit:解除查询提成关联smile_user表

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

@@ -48,9 +48,10 @@ public class SmileOrganizationController {
     @ResponseBody
     public AjaxResult updateOrg(@RequestBody SmileOrganization smileOrganization){
         return smileOrganizationService.update(smileOrganization);
-
     }
 
+
+
     @PostMapping("/getOrgById")
     @ApiOperation("根据组织id获取信息")
     @ResponseBody

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

@@ -447,7 +447,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 //缓存用户redis记录 计算
                 smileRedisUtils.setUserDataByUid(userData, performancesId);
             }
-            //查询所有代理uid
+            //查询这场演出所有总代理uid
             List<SmileUser> smileUsers = smileUserMapper.selectUidByPerId(performancesId);
             smileUsers.forEach(smileUser -> {
                 if (!ids.contains(smileUser.getUid())) {

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

@@ -76,7 +76,7 @@
                     kylin_order_ticket_relations AS kotr
                         LEFT JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
                 WHERE
-                    kotr.agent_id IN ( SELECT uid FROM smile_user WHERE agent_id = #{uid} )
+                    kotr.agent_id_master = #{uid}
                   AND kots.status IN (1,6,3)
             ) AND kotr.performance_id = #{performancesId}  AND kotr.ticket_id = #{ticketId}
     </select>

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

@@ -176,8 +176,7 @@
             su.city
         FROM
             smile_user AS su
-                INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id
-                OR su.uid = kk.agent_id_master
+                INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id_master
         WHERE su.type = 1
         GROUP BY su.uid
     </select>