Showing
1 changed file
with
0 additions
and
43 deletions
@@ -3,7 +3,6 @@ package com.yohoufo.order.service.impl; | @@ -3,7 +3,6 @@ package com.yohoufo.order.service.impl; | ||
3 | import com.google.common.cache.Cache; | 3 | import com.google.common.cache.Cache; |
4 | import com.google.common.cache.CacheBuilder; | 4 | import com.google.common.cache.CacheBuilder; |
5 | import com.yohoufo.dal.order.BuyerOrderGoodsMapper; | 5 | import com.yohoufo.dal.order.BuyerOrderGoodsMapper; |
6 | -import com.yohoufo.dal.order.EntrySellerRechargeOrderMapper; | ||
7 | import com.yohoufo.dal.order.SellerOrderGoodsMapper; | 6 | import com.yohoufo.dal.order.SellerOrderGoodsMapper; |
8 | import com.yohoufo.dal.order.TradeBillsMapper; | 7 | import com.yohoufo.dal.order.TradeBillsMapper; |
9 | import com.yohoufo.dal.order.model.BuyerOrderGoods; | 8 | import com.yohoufo.dal.order.model.BuyerOrderGoods; |
@@ -27,7 +26,6 @@ import java.util.concurrent.Callable; | @@ -27,7 +26,6 @@ import java.util.concurrent.Callable; | ||
27 | import java.util.concurrent.ExecutionException; | 26 | import java.util.concurrent.ExecutionException; |
28 | import java.util.concurrent.TimeUnit; | 27 | import java.util.concurrent.TimeUnit; |
29 | import java.util.function.Function; | 28 | import java.util.function.Function; |
30 | -import java.util.stream.Collector; | ||
31 | import java.util.stream.Collectors; | 29 | import java.util.stream.Collectors; |
32 | 30 | ||
33 | /**资产 | 31 | /**资产 |
@@ -37,7 +35,6 @@ import java.util.stream.Collectors; | @@ -37,7 +35,6 @@ import java.util.stream.Collectors; | ||
37 | public class AssetsService { | 35 | public class AssetsService { |
38 | final Logger logger = LoggerFactory.getLogger(getClass()); | 36 | final Logger logger = LoggerFactory.getLogger(getClass()); |
39 | 37 | ||
40 | - private Cache<String,List<TradeBillsBo>> localContentCache = CacheBuilder.newBuilder().maximumSize(1000).expireAfterAccess(5, TimeUnit.MINUTES).build(); | ||
41 | private Cache<Integer,TradeBillsSummaryBo> localTradeBillsSummaryBoCache = CacheBuilder.newBuilder().maximumSize(1000).expireAfterAccess(1, TimeUnit.MINUTES).build(); | 38 | private Cache<Integer,TradeBillsSummaryBo> localTradeBillsSummaryBoCache = CacheBuilder.newBuilder().maximumSize(1000).expireAfterAccess(1, TimeUnit.MINUTES).build(); |
42 | 39 | ||
43 | @Autowired | 40 | @Autowired |
@@ -49,9 +46,6 @@ public class AssetsService { | @@ -49,9 +46,6 @@ public class AssetsService { | ||
49 | @Autowired | 46 | @Autowired |
50 | private SellerOrderGoodsMapper sellerOrderGoodsMapper; | 47 | private SellerOrderGoodsMapper sellerOrderGoodsMapper; |
51 | 48 | ||
52 | - @Autowired | ||
53 | - private EntrySellerRechargeOrderMapper entrySellerRechargeOrderMapper; | ||
54 | - | ||
55 | public AssetsResp getAssetsDetails(int uid, int page, int pageSize){ | 49 | public AssetsResp getAssetsDetails(int uid, int page, int pageSize){ |
56 | 50 | ||
57 | //TODO get count | 51 | //TODO get count |
@@ -89,24 +83,6 @@ public class AssetsService { | @@ -89,24 +83,6 @@ public class AssetsService { | ||
89 | List<TradeBillsBo> buildTradeBills(int uid,int page, int pageSize){ | 83 | List<TradeBillsBo> buildTradeBills(int uid,int page, int pageSize){ |
90 | //现在是降序排列,不再缓存第一页 | 84 | //现在是降序排列,不再缓存第一页 |
91 | return loadTradeBillFromDb(uid,page,pageSize); | 85 | return loadTradeBillFromDb(uid,page,pageSize); |
92 | - | ||
93 | - //把第一页缓存 | ||
94 | - /*String key=uid+"-"+page+"-"+pageSize; | ||
95 | - if(page==1){ | ||
96 | - try{ | ||
97 | - return localContentCache.get(key, new Callable<List<TradeBillsBo>>() { | ||
98 | - @Override | ||
99 | - public List<TradeBillsBo> call() throws Exception { | ||
100 | - | ||
101 | - return loadTradeBillFromDb(uid,page,pageSize); | ||
102 | - } | ||
103 | - }); | ||
104 | - }catch (ExecutionException e){ | ||
105 | - throw new RuntimeException(e); | ||
106 | - } | ||
107 | - }else{ | ||
108 | - return loadTradeBillFromDb(uid,page,pageSize); | ||
109 | - }*/ | ||
110 | } | 86 | } |
111 | 87 | ||
112 | private List<TradeBillsBo> loadTradeBillFromDb(int uid,int page, int pageSize){ | 88 | private List<TradeBillsBo> loadTradeBillFromDb(int uid,int page, int pageSize){ |
@@ -186,25 +162,6 @@ public class AssetsService { | @@ -186,25 +162,6 @@ public class AssetsService { | ||
186 | } | 162 | } |
187 | } | 163 | } |
188 | 164 | ||
189 | - //计算支出 | ||
190 | - /*List<Map<String, Object>> spendList=tradeBillsMapper.selectSpendAmountByUid(uid); | ||
191 | - if(CollectionUtils.isNotEmpty(spendList)){ | ||
192 | - for(Map<String, Object> tmpMap:spendList){ | ||
193 | - if(tmpMap.get("tradeType")==null||tmpMap.get("allAmount")==null){ | ||
194 | - continue; | ||
195 | - } | ||
196 | - Integer key = (Integer)tmpMap.get("tradeType"); | ||
197 | - if(TradeType.goods_income.getCode()==key.intValue()){ | ||
198 | - goods_income = goods_income.subtract((BigDecimal)tmpMap.get("allAmount")); | ||
199 | - } | ||
200 | - | ||
201 | - if(TradeType.compensateIncome.getCode()==key.intValue()){ | ||
202 | - compensate_income = compensate_income.subtract((BigDecimal)tmpMap.get("allAmount")); | ||
203 | - } | ||
204 | - | ||
205 | - } | ||
206 | - }*/ | ||
207 | - | ||
208 | summary.setGoods_income(goods_income); | 165 | summary.setGoods_income(goods_income); |
209 | summary.setGoodsIncome(goods_income.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); | 166 | summary.setGoodsIncome(goods_income.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString()); |
210 | summary.setCompensate_income(compensate_income); | 167 | summary.setCompensate_income(compensate_income); |
-
Please register or login to post a comment