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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.order;



import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;

@@ -16,6 +17,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

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

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

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

@@ -88,7 +90,7 @@


      // 次数限制

      long count = lostOrderMapper.countTodayAppeal(lostOrder.getUserInfo().getId());

      String countMax = configService.get("order_appeal_count_day");

      String countMax = configService.get(ConfigKeyEnum.orderAppealCountDay.getKey());

      if (countMax != null && countMax.trim().length() > 0 && count >= Long.parseLong(countMax)) {

         return -7;

      }

@@ -314,15 +316,13 @@
   }



   @Override

   public List<Map<String, Object>> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,

         String endTime) throws Exception {

      return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);

   public Integer countLostOrderNum(String preDay) {

      return lostOrderMapper.countLostOrderNum(preDay);

   }



   @Override

   public List<Map<String, Object>> countAppealMoney(Integer dateType, String year, String startTime, String endTime)

         throws Exception {

      return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);

   public BigDecimal countAppealMoney(String preDay) {

      return lostOrderMapper.countAppealMoney(preDay);

   }



   @Override