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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -7,6 +7,7 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.elastic.ESOrderDao;

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

import com.yeshi.fanli.entity.order.ESOrder;

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



@@ -14,17 +15,31 @@
public class ESOrderServiceImpl implements ESOrderService {



   @Resource

   private ESOrderDao esOrderDao;

   private OrderSearchIndexMapper orderSearchIndexMapper;



   @Resource

   private ESOrderDao esOrderDao;



   @Override

   public void add(ESOrder record) {

      esOrderDao.save(record, record.getPlatform() + "#" + record.getTradeId());

   }



	
   @Override

   public List<ESOrder> query(String key, String uid) {

      return esOrderDao.query(key, uid);

   public List<ESOrder> query(String key, String uid, List<Integer> listPlatform) {

      return esOrderDao.query(key, uid, listPlatform);

   }



   @Override

   public void syncAddOrder(int count) {

      List<Long> hbIdList = orderSearchIndexMapper.listHBId(0, count);

      if (hbIdList == null || hbIdList.size() == 0)

         return;

      List<ESOrder> list = orderSearchIndexMapper.listByHBIds(hbIdList);

      if (list != null)

         for (ESOrder order : list) {

            add(order);

         }

      orderSearchIndexMapper.deleteByHBIds(hbIdList);

   }

}