正式数据库修改

admin

2019-03-13 69bee82b81626b82b7f39f0e459e4f56b1699b51

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

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



import java.io.Serializable;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;

@@ -14,14 +10,15 @@


import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.DateUtil;

import org.yeshi.utils.NumberUtil;



import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;

import com.yeshi.fanli.dao.order.LostOrderDao;

import com.yeshi.fanli.dao.order.PidOrderDao;

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.service.inter.order.CommonOrderService;

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -34,10 +31,10 @@
   private OrderService orderService;



   @Resource

   private LostOrderDao lostOrderDao;

   private HongBaoOrderService hongBaoOrderService;



   @Resource

   private PidOrderDao pidOrderDao;

   private LostOrderDao lostOrderDao;



   @Resource

   private LostOrderMapper lostOrderMapper;

@@ -70,7 +67,7 @@
      }



      // 查询是否为分享赚订单

      if (pidOrderDao.list("from PidOrder p where p.orderId=?", new Serializable[] { orderId }).size() > 0)

      if (hongBaoOrderService.countByOrderNoAndHongBaoType(orderId, HongBaoV2.TYPE_SHARE_GOODS) > 0)

         return -5;



      WriteLock lostOrderwriteLock = lostOrderLock.writeLock();

@@ -282,20 +279,17 @@
   public long countQuery(String key, Integer state, Integer handleType) {

      return lostOrderMapper.countQuery(key, state, handleType);

   }

	
	


   @Override

   public List<Map<String, Object>> countLostNum( Integer dateType, Integer resultCode, 
         String year, String startTime, String endTime) throws Exception {

   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);

   }

	
	


   @Override

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

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

         throws Exception {

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

   }

	


}