|
@@ -397,30 +397,37 @@ public class AppGameBettingController extends BaseController{
|
|
|
Map<String, AppUserGameBettingDetailsCountVO> itemMap = new HashMap<>();
|
|
|
for (int j = 0; j < bettingList.size(); j++) {
|
|
|
AppGameBetting appGameBetting = bettingList.get(j);
|
|
|
+
|
|
|
List<AppGameItemBettingVO> itemList = JSON.parseArray(appGameBetting.getBettingItem(), AppGameItemBettingVO.class);
|
|
|
|
|
|
for(AppGameItemBettingVO item : itemList){
|
|
|
- if(item.getBettingItem().equals(appUserGameBettingCountVO.getGameLotterySucc())){
|
|
|
- if(itemMap.containsKey(item.getBettingItem())){
|
|
|
- AppUserGameBettingDetailsCountVO appUserGameBettingDetailsCountVO = itemMap.get(item.getBettingItem());
|
|
|
- appUserGameBettingDetailsCountVO.setOrderAmount(appUserGameBettingDetailsCountVO.getOrderAmount() + item.getBettingAmount());
|
|
|
- if(appGameBetting.getIsWinning() == 1){
|
|
|
- appUserGameBettingDetailsCountVO.setWinAmount(appUserGameBettingDetailsCountVO.getWinAmount() + (item.getBettingAmount() * getMultiple(itemList.size())));
|
|
|
- }else if(appGameBetting.getIsWinning() == 2){
|
|
|
+ if(itemMap.containsKey(item.getBettingItem())){
|
|
|
+ AppUserGameBettingDetailsCountVO appUserGameBettingDetailsCountVO = itemMap.get(item.getBettingItem());
|
|
|
+ appUserGameBettingDetailsCountVO.setOrderAmount(appUserGameBettingDetailsCountVO.getOrderAmount() + item.getBettingAmount());
|
|
|
+ if(appGameBetting.getIsWinning() == 1){
|
|
|
+ if(item.getBettingItem().equals(appUserGameBettingCountVO.getGameLotterySucc())) {
|
|
|
+ appUserGameBettingDetailsCountVO.setWinAmount(appUserGameBettingDetailsCountVO.getWinAmount() + (appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple()));
|
|
|
+ }else{
|
|
|
appUserGameBettingDetailsCountVO.setLoseAmount(appUserGameBettingDetailsCountVO.getLoseAmount() + item.getBettingAmount());
|
|
|
}
|
|
|
- itemMap.put(item.getBettingItem(), appUserGameBettingDetailsCountVO);
|
|
|
- }else{
|
|
|
- AppUserGameBettingDetailsCountVO appUserGameBettingDetailsCountVO = new AppUserGameBettingDetailsCountVO();
|
|
|
- appUserGameBettingDetailsCountVO.setBettingTtem(item.getBettingItem());
|
|
|
- appUserGameBettingDetailsCountVO.setOrderAmount(appUserGameBettingDetailsCountVO.getOrderAmount() + item.getBettingAmount());
|
|
|
- if(appGameBetting.getIsWinning() == 1){
|
|
|
- appUserGameBettingDetailsCountVO.setWinAmount(appUserGameBettingDetailsCountVO.getWinAmount() + item.getBettingAmount() * getMultiple(itemList.size()));
|
|
|
- }else if(appGameBetting.getIsWinning() == 2){
|
|
|
- appUserGameBettingDetailsCountVO.setLoseAmount(appUserGameBettingDetailsCountVO.getLoseAmount() + item.getBettingAmount());
|
|
|
+ }else if(appGameBetting.getIsWinning() == 2){
|
|
|
+ appUserGameBettingDetailsCountVO.setLoseAmount(appUserGameBettingDetailsCountVO.getLoseAmount() + item.getBettingAmount());
|
|
|
+ }
|
|
|
+ itemMap.put(item.getBettingItem(), appUserGameBettingDetailsCountVO);
|
|
|
+ }else{
|
|
|
+ AppUserGameBettingDetailsCountVO appUserGameBettingDetailsCountVO = new AppUserGameBettingDetailsCountVO();
|
|
|
+ appUserGameBettingDetailsCountVO.setBettingTtem(item.getBettingItem());
|
|
|
+ appUserGameBettingDetailsCountVO.setOrderAmount(item.getBettingAmount());
|
|
|
+ if(appGameBetting.getIsWinning() == 1){
|
|
|
+ if(item.getBettingItem().equals(appUserGameBettingCountVO.getGameLotterySucc())){
|
|
|
+ appUserGameBettingDetailsCountVO.setWinAmount(appGameBetting.getBettingAmount() * appGameBetting.getBettingMultiple());
|
|
|
+ }else{
|
|
|
+ appUserGameBettingDetailsCountVO.setLoseAmount(item.getBettingAmount());
|
|
|
}
|
|
|
- itemMap.put(item.getBettingItem(), appUserGameBettingDetailsCountVO);
|
|
|
+ }else if(appGameBetting.getIsWinning() == 2){
|
|
|
+ appUserGameBettingDetailsCountVO.setLoseAmount(item.getBettingAmount());
|
|
|
}
|
|
|
+ itemMap.put(item.getBettingItem(), appUserGameBettingDetailsCountVO);
|
|
|
}
|
|
|
}
|
|
|
}
|