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

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -5,7 +5,6 @@
import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.Iterator;

@@ -36,7 +35,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.CommonOrderGoods;

import com.yeshi.fanli.entity.order.ESOrder;

@@ -288,17 +286,22 @@
      }



      try {

         boolean notBackSuVip =  false;

         if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

            notBackSuVip = true;

         }

			
         // 筛选结果顶部统计

         String validMoney = "0.00";

         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, notBackSuVip);

            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, notBackSuVip);

            if (postSaleMoney != null)

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



@@ -316,9 +319,10 @@
         List<CommonOrderVO> list = null;

         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

            list = commonOrderService.getOrderList(acceptData, page, uid, state, orderType,

                  orderState, orderNo, startTime, endTime, dateType, listSource);

                  orderState, orderNo, startTime, endTime, dateType, listSource, notBackSuVip);

				
            count = commonOrderService.countOrderList(uid, state, orderType, orderState, orderNo,

                  startTime, endTime, dateType, listSource);

                  startTime, endTime, dateType, listSource, notBackSuVip);

         } else {

            list = commonOrderService.getOrderByUid(acceptData, page, uid, state, orderType,

                  orderState, orderNo, startTime, endTime, dateType, listSource);