Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

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

@@ -218,15 +218,17 @@ public class UserTicketOrderServiceImpl extends
                         userTicketOrder.setShareInfo(JSONObject.toJSONString(userShareVO));
                     }
                 }
-            } else {
-                // 野生用户绑定固定的经销商
-                UserShareVO tempUserShareVO = new UserShareVO();
-                tempUserShareVO.setSuid(bindChannelId);
-                tempUserShareVO.setType(UserShareVO.SHARE_TYPE_SITE);
-                userTicketOrder.setChannelId(bindChannelId);
-                userTicketOrder.setShareInfo(JSONObject.toJSONString(tempUserShareVO));
             }
         }
+        // 野生用户绑定固定的经销商
+        if (userTicketOrder.getChannelId() == null || userTicketOrder.getChannelId() == 0) {
+            UserShareVO tempUserShareVO = new UserShareVO();
+            tempUserShareVO.setSuid(bindChannelId);
+            tempUserShareVO.setType(UserShareVO.SHARE_TYPE_SITE);
+            userTicketOrder.setChannelId(bindChannelId);
+            userTicketOrder.setShareInfo(JSONObject.toJSONString(tempUserShareVO));
+        }
+
         save(userTicketOrder);
 
         for (int i = 0; i < orderSettleVO.getOrderNum(); i++) {