diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java
index 44dfcf5b..d772f522 100644
--- a/hai-order/src/main/java/com/web/controller/OrderPayController.java
+++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java
@@ -54,7 +54,7 @@ import java.util.concurrent.ThreadLocalRandom;
 @Controller
 @RequestMapping("/orderPay")
 @Api(value = "订单支付")
-public class OrderPayController {
+public class    OrderPayController {
 
     private static Logger log = LoggerFactory.getLogger(OrderPayController.class);
 
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java
index c3aa2277..47c93310 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java
@@ -1,12 +1,9 @@
 package com.hai.service.impl;
 
 import com.alibaba.fastjson.JSON;
-<<<<<<< HEAD
 import com.alicp.jetcache.anno.CacheType;
 import com.alicp.jetcache.anno.Cached;
-=======
 import com.alibaba.fastjson.JSONObject;
->>>>>>> dev_yy
 import com.hai.common.exception.ErrorCode;
 import com.hai.common.exception.ErrorHelp;
 import com.hai.common.exception.SysCode;
@@ -62,17 +59,17 @@ public class HighCouponServiceImpl implements HighCouponService {
     @Resource
     private HighApproveService highApproveService;
 
-<<<<<<< HEAD
+
     @Autowired
     private RedisTemplate redisTemplate;
-=======
+
 
     @Resource
     private HighAgentService highAgentService;
 
     @Resource
     private HighCouponAgentService highCouponAgentService;
->>>>>>> dev_yy
+
 
     @Override
     @Transactional(propagation= Propagation.REQUIRES_NEW)
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
index 1461ca06..d0de2411 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
@@ -3086,51 +3086,51 @@ public class HighOrderServiceImpl implements HighOrderService {
     @Override
     public List<HighOrder> orderListByAgentId(Map<String, Object> map) throws Exception {
 
-        HighOrderExample example = new HighOrderExample();
-        HighOrderExample.Criteria criteria = example.createCriteria();
-
-        criteria.andOrderStatusEqualTo(3);
-
-       /* if (MapUtils.getLong(map , "agentId") != null) {
-            criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId"));
-        } else {
-<<<<<<< HEAD
-            criteria.andIdentificationCodeIsNotNull();
-        }*/
-
-        List<HighOrder> list = highOrderMapper.selectByExample(example);
-
-      /*  for (HighOrder order : list) {
-            HighUser user = highUserService.findByUserId(order.getIdentificationCode());
-            order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
-            List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
-            order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
-            order.setAgentName(user.getName());
-        }*/
-=======
-            criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L);
-        }
-        if (MapUtils.getLong(map , "code") != null) {
-            criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "code"));
-        }
-
-        List<HighOrder> list = highOrderMapper.selectByExample(example);
-
-        if (list.size() > 0) {
-            for (HighOrder order : list) {
-                HighUser user = highUserService.findByUserId(order.getIdentificationCode());
-                order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
-                List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
-                order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
-                if (user != null) {
-                    order.setAgentName(user.getName());
-                } else {
-                    order.setAgentName("暂无推广人");
-                }
-            }
-        }
->>>>>>> dev_yy
-
-        return list;
+//        HighOrderExample example = new HighOrderExample();
+//        HighOrderExample.Criteria criteria = example.createCriteria();
+//
+//        criteria.andOrderStatusEqualTo(3);
+//
+//       /* if (MapUtils.getLong(map , "agentId") != null) {
+//            criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "agentId"));
+//        } else {
+//<<<<<<< HEAD
+//            criteria.andIdentificationCodeIsNotNull();
+//        }*/
+//
+//        List<HighOrder> list = highOrderMapper.selectByExample(example);
+//
+//      /*  for (HighOrder order : list) {
+//            HighUser user = highUserService.findByUserId(order.getIdentificationCode());
+//            order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
+//            List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
+//            order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
+//            order.setAgentName(user.getName());
+//        }*/
+//=======
+//            criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L);
+//        }
+//        if (MapUtils.getLong(map , "code") != null) {
+//            criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "code"));
+//        }
+//
+//        List<HighOrder> list = highOrderMapper.selectByExample(example);
+//
+//        if (list.size() > 0) {
+//            for (HighOrder order : list) {
+//                HighUser user = highUserService.findByUserId(order.getIdentificationCode());
+//                order.setTime(DateUtil.date2String(order.getCreateTime() , "MM月dd日 HH:mm"));
+//                List<HighChildOrder> childOrder = getChildOrderByOrder(order.getId());
+//                order.setGoodsTypeName("购买：" + GoodsType.getNameByType(childOrder.get(0).getGoodsType()));
+//                if (user != null) {
+//                    order.setAgentName(user.getName());
+//                } else {
+//                    order.setAgentName("暂无推广人");
+//                }
+//            }
+//        }
+//>>>>>>> dev_yy
+//
+        return null;
     }
 }