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

分佣优化

See merge request quanshu/mp-server!1006

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

@@ -628,7 +628,7 @@ public class UserTicketOrderServiceImpl extends
             // 经销商账户余额增加
             changeMoney(channel, siteCommission);
 
-            int sumCommAmt = siteCommission.getCommAmt();
+            int sumCommAmt = siteCommission.getCommAmt() + promoterCommAmt;
             // 渠道分润
             while (channel.getParentId() > 0) {
                 channel = channelService.getById(channel.getParentId());