Merge remote-tracking branch 'origin/div' into div

admin

2020-05-23 37e8ba46879a6094938ad685b1054eb6446ae749

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

@@ -802,13 +806,12 @@
    *    type 类型：0全部、1淘宝 2京东、拼多多

    * @param out

    */

   @RequestMapping(value = "teamOrderSearch", method = RequestMethod.POST)

   @RequestMapping(value = "teamOrderSearch")

   public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, String key, PrintWriter out) {

      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

		
      

      List<TeamOrderVO> resultList = new ArrayList<>();

      if (StringUtil.isNullOrEmpty(key)) {

@@ -917,6 +920,14 @@
                        }

                     }

                  }

                  String orderTime = "下单" + teamVO.getDownTime() ;

                  if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {

                     orderTime += "\n收货" + teamVO.getSettleTime();

                  }

                  if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {

                     orderTime += "\n售后" + teamVO.getServiceTime();

                  }

                  teamVO.setOrderTime(orderTime);

                  map.put(mapKey, teamVO);

               }