Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitConfig.java → xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/config/RabbitIntegralConfig.java

 package com.xxfc.platform.activity.config;
 
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.DirectExchange;
 import org.springframework.amqp.core.Queue;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @date 2019/7/15
  */
 @Configuration
-public class RabbitConfig {
+public class RabbitIntegralConfig {
 
     public static final String HZ_EXC = "hz_exchange";
     public static final String INTEGRAL_QUEUE = "integral_queue";

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/IntegralUserRecordController.java

@@ -2,7 +2,6 @@ package com.xxfc.platform.activity.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.biz.IntegralUserRecordBiz;
-import com.xxfc.platform.activity.entity.IntegralUserRecord;
 import com.xxfc.platform.activity.vo.IntegralUserRecordDto;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,5 +34,8 @@ public class IntegralUserRecordController {
         return integralUserRecordBiz.getUserList(integralUserRecordDto);
     }
 
-
+    @GetMapping(value = "/getListByCode")
+    public ObjectRestResponse getListByCode(IntegralUserRecordDto integralUserRecordDto) {
+        return integralUserRecordBiz.getByUserAndTime(integralUserRecordDto);
+    }
 }