足迹、收藏订单兼容新需求

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java

@@ -245,12 +245,12 @@
         String invalidMoney = "0.00";

         if (page == 1) {

            BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,

                  orderNo, state, startTime, endTime, listSource);

                  orderNo, state, startTime, endTime, listSource,false);

            if (predictMoney != null)

               validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();



            BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,

                  orderNo, state, startTime, endTime, listSource);

                  orderNo, state, startTime, endTime, listSource,false);

            if (postSaleMoney != null)

               invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();



@@ -313,7 +313,11 @@
         List<ESOrder> listES = esOrderService.query(key, uid.toString(), listSource);



         if (listES.size() != 0) {

            list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);

            // 2.1版本

            AcceptData acceptData = new AcceptData();

            acceptData.setPlatform("android");

            acceptData.setVersion("56");

            list = commonOrderService.searchOrderByUid(acceptData, page, Constant.PAGE_SIZE, uid, listES);

            count = commonOrderService.countSearchOrderByUid(uid, listES);

         }