admin
2020-08-26 26f7accb815f55f18f8eedfca4324700a96884ec
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -55,7 +55,6 @@
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.UserOrderWeiQuanRecordService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.user.PreviewInfoService;
@@ -64,14 +63,12 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
@@ -116,9 +113,6 @@
   private ESOrderService esOrderService;
   @Resource
   private UserVIPInfoService userVIPInfoService;
   @Resource
   private HongBaoV2Service hongBaoV2Service;
   @Resource
@@ -143,16 +137,11 @@
   private UserInviteService userInviteService;
   @Resource
   private ThreeSaleSerivce threeSaleSerivce;
   @Resource
   private OrderHongBaoMapService orderHongBaoMapService;
   @Resource
   private PreviewInfoService previewInfoService;
   @Resource
   private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
   @Resource
   private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;
@@ -261,19 +250,9 @@
   /**
    * 订单列表
    *
    * @param acceptData
    * @param page
    * @param uid
    * @param state      状态:0全部 1-未到账 2-已到账 3-已失效 4已收货
    * @param type       类型:1-返利订单 2-分享订单 3-邀请订单
    * @param orderState 1有效订单 2 维权订单 3失效订单
    * @param orderNo    订单号
    * @param startTime  起始时间
    * @param endTime    结束时间
    * @param slotTime   时间段:1-最近三天 2-最近七天 3最近半月 4本月 5近三月 6近半年
    * @param dateType   1-今日 2-昨天 3-本月 4-上个月 |
    * @param source     页面来源:welfareCore-福利中心、bonus -奖金统计(我的界面)
    * @param filter
    * @param out
    */
   @RequestMapping(value = "getOrderList", method = RequestMethod.POST)
@@ -355,14 +334,14 @@
         String orderFindUrl = null;
         if (state == null && page == 1) {
            if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4) || count == 0L) {
               orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
               orderFindUrl = configService.getValue(ConfigKeyEnum.orderFindNotifyUrl.getKey(),acceptData.getSystem());
            }
         }
         JSONObject data = new JSONObject();
         data.put("count", count);
         data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
         data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
         data.put("helpUrl", configService.getValue(ConfigKeyEnum.orderListHelp.getKey(),acceptData.getSystem()));
         data.put("validMoney", "¥ " + validMoney);
         data.put("invalidMoney", "¥ " + invalidMoney);
         data.put("findOrderHelpUrl", orderFindUrl);