From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/WechatSubscribeV1InnerServiceSMOImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/WechatSubscribeV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/WechatSubscribeV1InnerServiceSMOImpl.java
index 1d46467..668c775 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/WechatSubscribeV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/WechatSubscribeV1InnerServiceSMOImpl.java
@@ -16,19 +16,15 @@
package com.java110.user.smo.impl;
-import com.java110.po.fee.PayFeePo;
import com.java110.user.dao.IWechatSubscribeV1ServiceDao;
import com.java110.intf.user.IWechatSubscribeV1InnerServiceSMO;
-import com.java110.dto.wechatSubscribe.WechatSubscribeDto;
-import com.java110.po.wechatSubscribe.WechatSubscribePo;
+import com.java110.dto.wechat.WechatSubscribeDto;
+import com.java110.po.wechat.WechatSubscribePo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
@@ -99,6 +95,19 @@
return wechatSubscribes;
}
+ @Override
+ public List<WechatSubscribeDto> queryDistinctWechatSubscribes(@RequestBody WechatSubscribeDto wechatSubscribeDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ int page = wechatSubscribeDto.getPage();
+
+ if (page != PageDto.DEFAULT_PAGE) {
+ wechatSubscribeDto.setPage((page - 1) * wechatSubscribeDto.getRow());
+ }
+
+ List<WechatSubscribeDto> wechatSubscribes = BeanConvertUtil.covertBeanList(wechatSubscribeV1ServiceDaoImpl.queryDistinctWechatSubscribes(BeanConvertUtil.beanCovertMap(wechatSubscribeDto)), WechatSubscribeDto.class);
+
+ return wechatSubscribes;
+ }
@Override
--
Gitblit v1.8.0