提交代码

hai-service/src/main/java/com/hai/service/HighDiscountPackageRecordService.java

@@ -2,7 +2,6 @@ package com.hai.service;
 
 import com.hai.entity.HighDiscountPackageRecord;
 
-<<<<<<< HEAD
 import java.util.List;
 import java.util.Map;
 
@@ -24,8 +23,6 @@ public interface HighDiscountPackageRecordService {
     * @return java.util.List<com.hai.entity.HighDiscountPackageRecord>
     */
     List<HighDiscountPackageRecord> getDiscountPackageRecord(Map<String , Object> map);
-=======
-public interface HighDiscountPackageRecordService {
 
     /**
      * 增加记录
@@ -33,5 +30,4 @@ public interface HighDiscountPackageRecordService {
      */
     void insertRecord(HighDiscountPackageRecord record);
 
->>>>>>> c91e5b70c15cdb86ee69f2771ce00208b0bbf4cb
 }

hai-service/src/main/java/com/hai/service/impl/HighDiscountPackageRecordServiceImpl.java

@@ -2,13 +2,13 @@ package com.hai.service.impl;
 
 import com.hai.dao.HighDiscountPackageRecordMapper;
 import com.hai.entity.HighDiscountPackageRecord;
-<<<<<<< HEAD
 import com.hai.entity.HighDiscountPackageRecordExample;
 import com.hai.service.HighDiscountPackageRecordService;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -25,6 +25,9 @@ public class HighDiscountPackageRecordServiceImpl implements HighDiscountPackage
     @Resource
     private HighDiscountPackageRecordMapper discountPackageRecordMapper;
 
+    @Resource
+    private HighDiscountPackageRecordMapper highDiscountPackageRecordMapper;
+
     @Override
     public List<HighDiscountPackageRecord> getDiscountPackageRecord(Map<String, Object> map) {
 
@@ -52,24 +55,12 @@ public class HighDiscountPackageRecordServiceImpl implements HighDiscountPackage
         example.setOrderByClause("created_time");
 
         return discountPackageRecordMapper.selectByExample(example);
-=======
+    }
-import com.hai.service.HighDiscountPackageRecordService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-
-@Service("discountPackageRecordService")
-public class HighDiscountPackageRecordServiceImpl implements HighDiscountPackageRecordService {
-
-    @Resource
-    private HighDiscountPackageRecordMapper highDiscountPackageRecordMapper;
 
     @Override
     public void insertRecord(HighDiscountPackageRecord record) {
         record.setCreatedTime(new Date());
         record.setStatus(1);
         highDiscountPackageRecordMapper.insert(record);
->>>>>>> c91e5b70c15cdb86ee69f2771ce00208b0bbf4cb
     }
 }