先合并下

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

 package com.gic.haoban.manage.web.controller;
 
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.MaidianLogDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.MaidianLogApiService;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.api.service.TestApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
@@ -11,6 +15,7 @@ import com.gic.haoban.manage.web.qo.QywxXcxSendMessageQo;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +57,8 @@ public class TestController extends WebBaseController {
     @Autowired
     private DepartmentApiService departmentApiService;
 
-//    @Autowired
-//    private MaidianLogApiService maidianLogApiService;
+    @Autowired
+    private MaidianLogApiService maidianLogApiService;
 
     @RequestMapping("/send-message-test")
     public HaobanResponse testSendMessage(QywxXcxSendMessageQo qo) {
@@ -130,9 +135,9 @@ public class TestController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_1);
     }
 
-//    @RequestMapping("/maidian-log")
-//    public HaobanResponse maidian(String hbversion, BasePageInfo pageInfo) {
-//        Page<MaidianLogDTO> page = maidianLogApiService.queryList(hbversion, pageInfo);
-//        return resultResponse(HaoBanErrCode.ERR_1,page);
-//    }
+    @RequestMapping("/maidian-log")
+    public HaobanResponse maidian(String hbversion, BasePageInfo pageInfo) {
+        Page<MaidianLogDTO> page = maidianLogApiService.queryList(hbversion, pageInfo);
+        return resultResponse(HaoBanErrCode.ERR_1,page);
+    }
 }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -70,6 +70,6 @@
     <dubbo:reference interface="com.gic.cloud.web.service.api.service.CloudStoreGroupService" id="cloudStoreGroupService" timeout="10000" retries="0" />
 	<dubbo:reference id="maidianDataService" interface="com.gic.cloud.data.api.service.MaidianDataService"  timeout="10000" retries="0" check="false"/>
 
-<!-- 	<dubbo:reference id="maidianLogApiService" interface="com.gic.haoban.manage.api.service.MaidianLogApiService"  timeout="10000" retries="0" check="false"/> -->
+	<dubbo:reference id="maidianLogApiService" interface="com.gic.haoban.manage.api.service.MaidianLogApiService"  timeout="10000" retries="0" check="false"/>
 	
 </beans>