From d319bdbdb86167bc3e9f277f18e08503f7bf1275 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@CI6BUF61FT24H5M>
Date: 星期日, 25 八月 2019 16:44:49 +0800
Subject: [PATCH] 邀请赚，分享赚到账bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 9942704..033ec71 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -574,7 +574,16 @@
List<Integer> types = new ArrayList<>();
types.add(HongBaoV2.TYPE_YIJI);
types.add(HongBaoV2.TYPE_ERJI);
- List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 1000);
+ long count= hongBaoV2Mapper.countCanBalanceHongBaoByTypeAndUid(types, uid);
+ List<HongBaoV2> hongBaoList =new ArrayList<>();
+ //1000鏉℃暟鎹负1椤�
+ int page=(int) (count%1000==0?count/1000:count/1000+1);
+ for(int i=0;i<page;i++)
+ {
+ List<HongBaoV2> tempHongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, i*1000,1000);
+ if(tempHongBaoList!=null&&tempHongBaoList.size()>0)
+ hongBaoList.addAll(tempHongBaoList);
+ }
// 鐏板害娴嬭瘯涓紝浜笢/鎷煎澶氳鍗曞垎浜�/閭�璇疯鍗曚笉杩斿埄
for (int i = 0; i < hongBaoList.size(); i++) {
HongBaoV2 item = hongBaoList.get(i);
@@ -591,7 +600,7 @@
hongBaoList.remove(i);
i--;
} else {// 涓婄骇鐢ㄦ埛涓嶆槸姝ｅ父鐢ㄦ埛锛岃鍗曞潎涓嶈兘鍒拌处
- UserInfo userInfo = userInfoMapper.selectByPrimaryKey(item.getUserInfo().getId());
+ UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());
if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {
hongBaoList.remove(i);
i--;
@@ -651,7 +660,8 @@
types.clear();
types.add(HongBaoV2.TYPE_SHARE_YIJI);
types.add(HongBaoV2.TYPE_SHARE_ERJI);
- List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);
+ //TODO 闇�瑕佸鐞嗚秴杩�1w鏉℃暟鎹殑璁㈠崟
+ List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid,0, 10000);
if (hbList != null && hbList.size() > 0)
totalHongBaoList.addAll(hbList);
@@ -735,7 +745,8 @@
// 鏌ヨUID鐨勫垎浜禋璁㈠崟
types.clear();
types.add(HongBaoV2.TYPE_SHARE_GOODS);
- List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);
+ //TODO 闇�瑕佸鐞嗚秴杩�10000鏉℃暟鎹殑璁㈠崟
+ List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid,0, 10000);
for (HongBaoV2 hongBao : hongBaoShareList) {
hongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBao.getId());
hongBao = filterWeiQuanINGHongBao(hongBao);
--
Gitblit v1.8.0