Merge branch 'dev_180508_联盟红人推广' into test6.6.1

@@ -325,6 +325,6 @@
       AND status IN (91,92,93)
       AND status IN (91,92,93)
     </if>
     </if>
     order by order_time desc
     order by order_time desc
-    limit 0,10
+    limit #{start,jdbcType=INTEGER}, #{size,jdbcType=INTEGER}
   </select>
   </select>
 </mapper>
 </mapper>

@@ -327,7 +327,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         }
         }
         //数据库获取
         //数据库获取
         List<UnionShareSettlement> unionShareSettlementList = unionShareSettlementMapper.selectSettlementRecordByUid(unionShareOrderReqBO.getUid(),
         List<UnionShareSettlement> unionShareSettlementList = unionShareSettlementMapper.selectSettlementRecordByUid(unionShareOrderReqBO.getUid(),
-                unionShareOrderReqBO.getPage()*unionShareOrderReqBO.getSize(), unionShareOrderReqBO.getSize());
+                (unionShareOrderReqBO.getPage()-1)*unionShareOrderReqBO.getSize(), unionShareOrderReqBO.getSize());
         if (CollectionUtils.isNotEmpty(unionShareSettlementList)){
         if (CollectionUtils.isNotEmpty(unionShareSettlementList)){
             DecimalFormat df1 = new DecimalFormat("0.00");
             DecimalFormat df1 = new DecimalFormat("0.00");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
@@ -354,6 +354,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         }
         }
         //数据库获取
         //数据库获取
         //tab1表示1、全部订单；2、有效订单；3、无效订单  tab2表示1、已付款；2、待结算；3、结算中
         //tab1表示1、全部订单；2、有效订单；3、无效订单  tab2表示1、已付款；2、待结算；3、结算中
+        unionShareOrderReqBO.setStart((unionShareOrderReqBO.getPage()-1)*unionShareOrderReqBO.getSize());
         List<UnionShareOrders> unionShareOrdersList = unionShareOrdersMapper.selectOrderList(unionShareOrderReqBO);
         List<UnionShareOrders> unionShareOrdersList = unionShareOrdersMapper.selectOrderList(unionShareOrderReqBO);
         //处理订单列表数据
         //处理订单列表数据
         dealShareOrderList(unionShareOrdersList);
         dealShareOrderList(unionShareOrdersList);