Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!991

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -612,6 +612,9 @@ public class UserTicketOrderServiceImpl extends
             Channel channel = new Channel();
             if (channelCommParam.getPromoterId() != null && channelCommParam.getPromoterId() > 0) {
                 channel = channelService.getById(channelCommParam.getPromoterId());
+                if (channel == null) {
+                    channel = channelService.getById(channelCommParam.getChannelId());
+                }
             } else {
                 channel = channelService.getById(channelCommParam.getChannelId());
             }