特价相关bug修改

admin

2021-06-02 512f368d7d8e71ee72a8f71dd7d2146f4c64f774

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

@@ -12,6 +12,7 @@

import javax.annotation.Resource;

import com.yeshi.fanli.entity.SystemEnum;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -250,6 +251,7 @@

   /**
    * 订单列表
     *
    * @param acceptData
    * @param page
    * @param filter
@@ -317,6 +319,12 @@

         long count = 0L;
         List<CommonOrderVO> list = null;
            if (acceptData.getSystem() == SystemEnum.yhqjx) {
                list = commonOrderService.getOrderList(acceptData, page, uid, state, orderType, orderState, orderNo,
                        startTime, endTime, dateType, listSource);
                count = commonOrderService.countOrderList(uid, state, orderType, orderState, orderNo, startTime,
                        endTime, dateType, listSource);
            } else {
         if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
            list = commonOrderService.getOrderList(acceptData, page, uid, state, orderType, orderState, orderNo,
                  startTime, endTime, dateType, listSource);
@@ -329,6 +337,7 @@
            count = commonOrderService.countGroupOrderNoByUid(uid, state, orderType, orderState, orderNo, startTime,
                  endTime, dateType, listSource);
         }
            }

         // 判断是否需要显示订单找回提示 8秒内请求3次触发
         String orderFindUrl = null;