订单统计 + 资金明细

yujian

2019-11-27 e915a40b79552686b8d8a8cfc48a341fa2c0f518

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

@@ -72,6 +72,7 @@
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.order.CommonOrderGoodsVO;

import com.yeshi.fanli.vo.order.CommonOrderVO;

import com.yeshi.fanli.vo.order.OrderCountVO;

import com.yeshi.fanli.vo.order.WeiQuanInfo;



import net.sf.json.JSONObject;

@@ -494,6 +495,9 @@
               order.setVipOrder(false);

         } else

            order.setVipOrder(false);

			
         if(order.isVipOrder())

            order.setVipOrderDesc("订单来源：由超级会员的粉丝产生");

      }



      for (CommonOrderVO order : listOrder) {

@@ -794,6 +798,11 @@
   @Override

   public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source) {

      return commonOrderMapper.countHistoryOrder(uid, day, source);

   }

	
   @Override

   public OrderCountVO getOrderCount(Long uid, Integer day, Integer source) {

      return commonOrderMapper.getOrderCount(uid, day, source);

   }



   @Override

@@ -1621,7 +1630,7 @@
   public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {

      return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);

   }




   @Override

   public long count24HValidOrderByUid(Long uid, Date minTime) {

      return commonOrderMapper.count24HValidOrderByUid(uid, minTime);