订单优化 + 后台提现曲线图

yujian

2019-01-14 92c681fabac989d1a9f16fa13202d7f5ccac52d9

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

@@ -135,6 +135,12 @@
   public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {

      return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);

   }

	
   @Override

   public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, 
         String startTime, String endTime) {

      return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);

   }



   @Override

   public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,

@@ -220,14 +226,11 @@
      SimpleDateFormat formatday = new SimpleDateFormat("yyyy.MM.dd");



      for (CommonOrderVO order : listOrder) {

         Date createTime = order.getCreateTime();

         if (createTime != null) {

            order.setObtainTime(createTime.getTime());

         }



         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

            order.setDownTime("下单时间：" + format.format(thirdCreateTime));

            order.setObtainTime(thirdCreateTime.getTime());

         }



         Date settleTime = order.getSettleTime();

@@ -475,8 +478,31 @@
      if (list.size() == 0) {

         return list;

      }



		
      SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");

      for (CommonOrderVO order : list) {

			
         // 下单时间

         Date thirdCreateTime = order.getThirdCreateTime();

         if (thirdCreateTime != null) {

            order.setDownTime(format.format(thirdCreateTime));

         }

         // 收货时间

         Date settleTime = order.getSettleTime();

         if (settleTime != null) {

            order.setReceiveTime(format.format(settleTime));

         }

			
         // 到账时间

         Date accountTime = order.getAccountTime();

         if (accountTime != null) {

            order.setHongBaoDate(format.format(accountTime));

         }

			
         BigDecimal settlement = order.getSettlement();

         if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {

            order.setPayment(settlement); // 实际付款金额

         }



         /* 订单返利类型 转换 */

         Integer hongBaoType = order.getHongBaoType();

@@ -506,6 +532,7 @@
            // 已失效

            order.setHongBaoState(3);

         }

			
      }

      

      return list;