Merge branch 'dev_180508_联盟红人推广' of http://git.yoho.cn/yoho30/yohobuy-union into dev_180508_联盟红人推广

@@ -51,7 +51,7 @@
       and channel_type=#{channelType}
     </if>
   </select>
-  <select id="selectByNameAndUnionType" resultType="Long">
+  <select id="selectByNameAndUnionType" resultType="java.lang.Long">
     select union_type from mkt_marketing_url where 1=1
      <if test="unionType!=null">
        and union_type=#{unionType}

@@ -105,6 +105,12 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
     @Override
     public PageUnionShareOrderRspBO queryUnionShareOrders(UnionShareOrderSearchReqBO reqBO){
         logger.info("queryUnionShareOrders param is {}", reqBO);
+        /*
+         * 由于不能连表查所以解决方案有二：
+         * 1.牺牲内存，临时数据先查出存到内存中（比如这里 uids),缺点是数据太多的话内存放不下
+         * 2.数据库添加冗余外表字段（比如A表连接B表查，可把B表中用的字段在A表也添加上去，缺点是业务复杂度提高）
+         *
+         */
         UnionShareOrderSearchBo bo=initUnionShareOrderSearchBo(reqBO);
         List<Integer> uids=null;
         if(bo.getUnionType()!=null || bo.getUnionName()!=null || bo.getChannelType()!=null){