重构

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminAdminController.java

@@ -10,6 +10,7 @@ import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AdminResponseCode;
 import com.wwdz.ch.admin.util.AdminResponseUtil;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsAdminDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,9 +30,7 @@ import com.wwdz.ch.core.util.RegexUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder;
 import com.wwdz.ch.core.validator.Order;
-import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.Admin;
-import com.wwdz.ch.db.service.DtsAdminService;
 
 @RestController
 @RequestMapping("/admin/admin")
@@ -40,7 +39,7 @@ public class AdminAdminController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminAdminController.class);
 
 	@Autowired
-	private DtsAdminService adminService;
+	private DtsAdminDao dtsAdminDao;
 
 	@RequiresPermissions("admin:admin:list")
 	@RequiresPermissionsDesc(menu = { "系统管理", "管理员管理" }, button = "查询")
@@ -51,7 +50,7 @@ public class AdminAdminController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->管理员管理->查询,请求参数:username:{},page:{}", username, page);
 
-		List<Admin> adminList = adminService.querySelective(username, page, limit, sort, order);
+		List<Admin> adminList = dtsAdminDao.querySelective(username, page, limit, sort, order);
 		long total = PageInfo.of(adminList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);
@@ -90,7 +89,7 @@ public class AdminAdminController {
 		}
 
 		String username = admin.getUsername();
-		List<Admin> adminList = adminService.findAdmin(username);
+		List<Admin> adminList = dtsAdminDao.findAdmin(username);
 		if (adminList.size() > 0) {
 			logger.error("系统管理->管理员管理->添加 ,错误：{}", AdminResponseCode.ADMIN_NAME_EXIST.desc());
 			return AdminResponseUtil.fail(AdminResponseCode.ADMIN_NAME_EXIST);
@@ -100,7 +99,7 @@ public class AdminAdminController {
 		BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
 		String encodedPassword = encoder.encode(rawPassword);
 		admin.setPassword(encodedPassword);
-		adminService.add(admin);
+		dtsAdminDao.add(admin);
 
 		logger.info("【请求结束】系统管理->管理员管理->添加,响应结果:{}", JSONObject.toJSONString(admin));
 		return ResponseUtil.ok(admin);
@@ -112,7 +111,7 @@ public class AdminAdminController {
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->管理员管理->详情,请求参数,id:{}", id);
 
-		Admin admin = adminService.findById(id);
+		Admin admin = dtsAdminDao.findById(id);
 
 		logger.info("【请求结束】系统管理->管理员管理->详情,响应结果:{}", JSONObject.toJSONString(admin));
 		return ResponseUtil.ok(admin);
@@ -139,7 +138,7 @@ public class AdminAdminController {
 		String encodedPassword = encoder.encode(rawPassword);
 		admin.setPassword(encodedPassword);
 
-		if (adminService.updateById(admin) == 0) {
+		if (dtsAdminDao.updateById(admin) == 0) {
 			logger.error("系统管理->管理员管理-编辑 ,错误：{}", "更新数据失败！");
 			return ResponseUtil.updatedDataFailed();
 		}
@@ -159,7 +158,7 @@ public class AdminAdminController {
 			return ResponseUtil.badArgument();
 		}
 
-		adminService.deleteById(anotherAdminId);
+		dtsAdminDao.deleteById(anotherAdminId);
 
 		logger.info("【请求结束】系统管理->管理员管理->删除 成功！");
 		return ResponseUtil.ok();

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminAuthController.java

@@ -12,6 +12,8 @@ import java.util.Set;
 import javax.servlet.http.HttpServletResponse;
 
 import com.wwdz.ch.admin.entity.request.LoginRequestDto;
+import com.wwdz.ch.db.dao.dts.DtsPermissionDao;
+import com.wwdz.ch.db.dao.dts.DtsRoleDao;
 import com.xxdxxs.utils.JsonUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
@@ -42,8 +44,6 @@ import com.wwdz.ch.core.util.Base64;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.util.UUID;
 import com.wwdz.ch.db.domain.Admin;
-import com.wwdz.ch.db.service.DtsPermissionService;
-import com.wwdz.ch.db.service.DtsRoleService;
 
 @RestController
 @RequestMapping("/admin/auth")
@@ -52,9 +52,10 @@ public class AdminAuthController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminAuthController.class);
 
 	@Autowired
-	private DtsRoleService roleService;
+	private DtsRoleDao dtsRoleDao;
+
 	@Autowired
-	private DtsPermissionService permissionService;
+	private DtsPermissionDao dtsPermissionDao;
 
 	/*
 	 * { username : value, password : value }
@@ -127,8 +128,8 @@ public class AdminAuthController {
 			data.put("avatar", admin.getAvatar());
 
 			Integer[] roleIds = admin.getRoleIds();
-			Set<String> roles = roleService.queryByIds(roleIds);
-			Set<String> permissions = permissionService.queryByRoleIds(roleIds);
+			Set<String> roles = dtsRoleDao.queryByIds(roleIds);
+			Set<String> permissions = dtsPermissionDao.queryByRoleIds(roleIds);
 			data.put("roles", roles);
 			// NOTE
 			// 这里需要转换perms结构，因为对于前端而已API形式的权限更容易理解

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminCollectController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsCollectDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.CollectObsolete;
-import com.wwdz.ch.db.service.DtsCollectService;
 
 @RestController
 @RequestMapping("/admin/collect")
@@ -31,7 +31,7 @@ public class AdminCollectController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminCollectController.class);
 
 	@Autowired
-	private DtsCollectService collectService;
+	private DtsCollectDao dtsCollectDao;
 
 	@RequiresPermissions("admin:collect:list")
 	@RequiresPermissionsDesc(menu = { "用户管理", "用户收藏" }, button = "查询")
@@ -42,7 +42,7 @@ public class AdminCollectController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->用户收藏->查询,请求参数:userId:{},page:{}", userId, page);
 
-		List<CollectObsolete> collectList = collectService.querySelective(userId, valueId, page, limit, sort, order);
+		List<CollectObsolete> collectList = dtsCollectDao.querySelective(userId, valueId, page, limit, sort, order);
 		long total = PageInfo.of(collectList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminDashbordController.java

@@ -12,6 +12,9 @@ import java.util.Set;
 import com.wwdz.ch.admin.entity.vo.OrderAmtsVo;
 import com.wwdz.ch.admin.entity.vo.UserOrderCntVo;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.ItemDao;
+import com.wwdz.ch.db.dao.dts.DtsGoodsProductDao;
+import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,9 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.bean.DayStatis;
-import com.wwdz.ch.db.service.DtsGoodsProductService;
-import com.wwdz.ch.db.service.ItemService;
-import com.wwdz.ch.db.service.DtsUserService;
 
 @RestController
 @RequestMapping("/admin/dashboard")
@@ -36,18 +36,20 @@ public class AdminDashbordController {
 	private static final int STATIS_DAYS_RANG = 30;// 统计的天数范围，一个月数据
 
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao userService;
+
 	@Autowired
-	private ItemService goodsService;
+	private ItemDao itemDao;
+
 	@Autowired
-	private DtsGoodsProductService productService;
+	private DtsGoodsProductDao productService;
 
 	@GetMapping("")
 	public Object info() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName() + "] 系统管理->首页仪表盘查询");
 
 		int userTotal = userService.count();
-		int goodsTotal = goodsService.count();
+		int goodsTotal = itemDao.count();
 	//	int productTotal = productService.count();
 		Map<String, Integer> data = new HashMap<>();
 		data.put("userTotal", userTotal);

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminFeedbackController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsFeedbackDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.Feedback;
-import com.wwdz.ch.db.service.DtsFeedbackService;
 
 /**
  * @author CHENBO
@@ -36,7 +36,7 @@ public class AdminFeedbackController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminFeedbackController.class);
 
 	@Autowired
-	private DtsFeedbackService feedbackService;
+	private DtsFeedbackDao dtsFeedbackDao;
 
 	@RequiresPermissions("admin:feedback:list")
 	@RequiresPermissionsDesc(menu = { "用户管理", "意见反馈" }, button = "查询")
@@ -47,7 +47,7 @@ public class AdminFeedbackController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->意见反馈->查询,请求参数:userId:{},username:{},page:{}", userId, username, page);
 
-		List<Feedback> feedbackList = feedbackService.querySelective(userId, username, page, limit, sort, order);
+		List<Feedback> feedbackList = dtsFeedbackDao.querySelective(userId, username, page, limit, sort, order);
 		long total = PageInfo.of(feedbackList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminFootprintController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsFootprintDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.Footprint;
-import com.wwdz.ch.db.service.DtsFootprintService;
 
 @RestController
 @RequestMapping("/admin/footprint")
@@ -31,7 +31,7 @@ public class AdminFootprintController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminFootprintController.class);
 
 	@Autowired
-	private DtsFootprintService footprintService;
+	private DtsFootprintDao dtsFootprintDao;
 
 	@RequiresPermissions("admin:footprint:list")
 	@RequiresPermissionsDesc(menu = { "用户管理", "用户足迹" }, button = "查询")
@@ -42,7 +42,7 @@ public class AdminFootprintController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->用户足迹->查询,请求参数:userId:{},goodsId:{},page:{}", userId, goodsId, page);
 
-		List<Footprint> footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort, order);
+		List<Footprint> footprintList = dtsFootprintDao.querySelective(userId, goodsId, page, limit, sort, order);
 		long total = PageInfo.of(footprintList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminGoodsController.java

@@ -14,7 +14,7 @@ import com.wwdz.ch.admin.service.AdminGoodsService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.admin.util.CatVo;
 import com.wwdz.ch.db.domain.Category;
-import com.wwdz.ch.db.dao.impl.CategoryManagerImpl;
+import com.wwdz.ch.db.impl.CategoryDaoImpl;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.util.CollectionUtils;
 import org.slf4j.Logger;
@@ -43,7 +43,7 @@ public class AdminGoodsController {
 	private AdminGoodsService adminGoodsService;
 
 	@Autowired
-	private CategoryManagerImpl categoryManager;
+	private CategoryDaoImpl categoryManager;
 	
 	@Autowired
 	private AdminDataAuthService adminDataAuthService;

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminHistoryController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsSearchHistoryDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +22,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.SearchHistory;
-import com.wwdz.ch.db.service.DtsSearchHistoryService;
 
 @RestController
 @RequestMapping("/admin/history")
@@ -29,7 +29,7 @@ public class AdminHistoryController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminHistoryController.class);
 
 	@Autowired
-	private DtsSearchHistoryService searchHistoryService;
+	private DtsSearchHistoryDao dtsSearchHistoryDao;
 
 	@RequiresPermissions("admin:history:list")
 	@RequiresPermissionsDesc(menu = { "用户管理", "搜索历史" }, button = "查询")
@@ -40,7 +40,7 @@ public class AdminHistoryController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->搜索历史->查询,请求参数:userId:{},keyword:{},page:{}", userId, keyword, page);
 
-		List<SearchHistory> footprintList = searchHistoryService.querySelective(userId, keyword, page, limit, sort,
+		List<SearchHistory> footprintList = dtsSearchHistoryDao.querySelective(userId, keyword, page, limit, sort,
 				order);
 		long total = PageInfo.of(footprintList).getTotal();
 		Map<String, Object> data = new HashMap<>();

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminIssueController.java

@@ -8,6 +8,7 @@ import javax.validation.constraints.NotNull;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsIssueDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +28,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.Issue;
-import com.wwdz.ch.db.service.DtsIssueService;
 
 @RestController
 @RequestMapping("/admin/issue")
@@ -36,7 +36,7 @@ public class AdminIssueController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminIssueController.class);
 
 	@Autowired
-	private DtsIssueService issueService;
+	private DtsIssueDao dtsIssueDao;
 
 	@RequiresPermissions("admin:issue:list")
 	@RequiresPermissionsDesc(menu = { "商场管理", "通用问题" }, button = "查询")
@@ -47,7 +47,7 @@ public class AdminIssueController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->通用问题->查询,请求参数:question:{},page:{}", question, page);
 
-		List<Issue> issueList = issueService.querySelective(question, page, limit, sort, order);
+		List<Issue> issueList = dtsIssueDao.querySelective(question, page, limit, sort, order);
 		long total = PageInfo.of(issueList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);
@@ -79,7 +79,7 @@ public class AdminIssueController {
 		if (error != null) {
 			return error;
 		}
-		issueService.add(issue);
+		dtsIssueDao.add(issue);
 
 		logger.info("【请求结束】商场管理->通用问题->查询,响应结果:{}", JSONObject.toJSONString(issue));
 		return ResponseUtil.ok(issue);
@@ -90,7 +90,7 @@ public class AdminIssueController {
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->通用问题->详情,请求参数,id:{}", id);
 
-		Issue issue = issueService.findById(id);
+		Issue issue = dtsIssueDao.findById(id);
 
 		logger.info("【请求结束】商场管理->通用问题->详情,响应结果:{}", JSONObject.toJSONString(issue));
 		return ResponseUtil.ok(issue);
@@ -106,7 +106,7 @@ public class AdminIssueController {
 		if (error != null) {
 			return error;
 		}
-		if (issueService.updateById(issue) == 0) {
+		if (dtsIssueDao.updateById(issue) == 0) {
 			logger.error("商场管理->通用问题->编辑 失败:{}", "更新数据失败！");
 			return ResponseUtil.updatedDataFailed();
 		}
@@ -125,7 +125,7 @@ public class AdminIssueController {
 		if (id == null) {
 			return ResponseUtil.badArgument();
 		}
-		issueService.deleteById(id);
+		dtsIssueDao.deleteById(id);
 
 		logger.info("【请求结束】商场管理->通用问题->删除,响应结果:{}", "成功!");
 		return ResponseUtil.ok();

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminKeywordController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import javax.validation.constraints.NotNull;
 
+import com.wwdz.ch.db.dao.dts.DtsKeywordDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +28,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.Keyword;
-import com.wwdz.ch.db.service.DtsKeywordService;
 
 @RestController
 @RequestMapping("/admin/keyword")
@@ -36,7 +36,7 @@ public class AdminKeywordController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminKeywordController.class);
 
 	@Autowired
-	private DtsKeywordService keywordService;
+	private DtsKeywordDao dtsKeywordDao;
 
 	@RequiresPermissions("admin:keyword:list")
 	@RequiresPermissionsDesc(menu = { "商场管理", "关键词" }, button = "查询")
@@ -47,7 +47,7 @@ public class AdminKeywordController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->关键词->查询,请求参数:keyword:{},url:{},page:{}", keyword, url, page);
 
-		List<Keyword> brandList = keywordService.querySelective(keyword, url, page, limit, sort, order);
+		List<Keyword> brandList = dtsKeywordDao.querySelective(keyword, url, page, limit, sort, order);
 		long total = PageInfo.of(brandList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);
@@ -78,7 +78,7 @@ public class AdminKeywordController {
 		if (error != null) {
 			return error;
 		}
-		keywordService.add(keywords);
+		dtsKeywordDao.add(keywords);
 		logger.info("【请求结束】商场管理->关键词->添加,响应结果:{}", JSONObject.toJSONString(keywords));
 		return ResponseUtil.ok(keywords);
 	}
@@ -89,7 +89,7 @@ public class AdminKeywordController {
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->关键词->详情,请求参数,id:{}", id);
 
-		Keyword keywords = keywordService.findById(id);
+		Keyword keywords = dtsKeywordDao.findById(id);
 
 		logger.info("【请求结束】商场管理->关键词->详情,响应结果:{}", JSONObject.toJSONString(keywords));
 		return ResponseUtil.ok(keywords);
@@ -105,7 +105,7 @@ public class AdminKeywordController {
 		if (error != null) {
 			return error;
 		}
-		if (keywordService.updateById(keywords) == 0) {
+		if (dtsKeywordDao.updateById(keywords) == 0) {
 			logger.info("商场管理->关键词->编辑 错误：{}", "更新数据失败！");
 			return ResponseUtil.updatedDataFailed();
 		}
@@ -124,7 +124,7 @@ public class AdminKeywordController {
 		if (id == null) {
 			return ResponseUtil.badArgument();
 		}
-		keywordService.deleteById(id);
+		dtsKeywordDao.deleteById(id);
 
 		logger.info("【请求结束】商场管理->关键词->删除,响应结果:{}", "成功!");
 		return ResponseUtil.ok();

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminProfileController.java

@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.controller;
 import com.wwdz.ch.admin.util.AdminResponseCode;
 import com.wwdz.ch.admin.util.AdminResponseUtil;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsAdminDao;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.subject.Subject;
@@ -20,7 +21,6 @@ import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder;
 import com.wwdz.ch.db.domain.Admin;
-import com.wwdz.ch.db.service.DtsAdminService;
 
 @RestController
 @RequestMapping("/admin/profile")
@@ -29,7 +29,7 @@ public class AdminProfileController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminProfileController.class);
 
 	@Autowired
-	private DtsAdminService adminService;
+	private DtsAdminDao dtsAdminDao;
 
 	@RequiresAuthentication
 	@PostMapping("/password")
@@ -57,7 +57,7 @@ public class AdminProfileController {
 		String encodedNewPassword = encoder.encode(newPassword);
 		admin.setPassword(encodedNewPassword);
 
-		adminService.updateById(admin);
+		dtsAdminDao.updateById(admin);
 
 		logger.info("【请求结束】系统管理->修改密码,响应结果:{}", "成功!");
 		return ResponseUtil.ok();

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminRoleController.java

@@ -9,6 +9,8 @@ import java.util.Set;
 import javax.validation.constraints.NotNull;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
+import com.wwdz.ch.db.dao.dts.DtsPermissionDao;
+import com.wwdz.ch.db.dao.dts.DtsRoleDao;
 import com.wwdz.ch.db.domain.Role;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -34,10 +36,7 @@ import com.wwdz.ch.admin.util.PermissionUtil;
 import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
-import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.Permission;
-import com.wwdz.ch.db.service.DtsPermissionService;
-import com.wwdz.ch.db.service.DtsRoleService;
 
 @RestController
 @RequestMapping("/admin/role")
@@ -46,9 +45,10 @@ public class AdminRoleController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminRoleController.class);
 
 	@Autowired
-	private DtsRoleService roleService;
+	private DtsRoleDao dtsRoleDao;
+
 	@Autowired
-	private DtsPermissionService permissionService;
+	private DtsPermissionDao dtsPermissionDao;
 
 	@RequiresPermissions("admin:role:list")
 	@RequiresPermissionsDesc(menu = { "系统管理", "角色管理" }, button = "角色查询")
@@ -59,7 +59,7 @@ public class AdminRoleController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->角色管理->角色查询,请求参数,name:{},page:{}", name, page);
 
-		List<Role> roleList = roleService.querySelective(name, page, limit, sort, order);
+		List<Role> roleList = dtsRoleDao.querySelective(name, page, limit, sort, order);
 		long total = PageInfo.of(roleList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);
@@ -71,7 +71,7 @@ public class AdminRoleController {
 
 	@GetMapping("/options")
 	public Object options() {
-		List<Role> roleList = roleService.queryAll();
+		List<Role> roleList = dtsRoleDao.queryAll();
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->角色管理->查询所有角色");
 
 		List<Map<String, Object>> options = new ArrayList<>(roleList.size());
@@ -92,7 +92,7 @@ public class AdminRoleController {
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->角色管理->角色详情,请求参数,id:{}", id);
 
-		Role role = roleService.findById(id);
+		Role role = dtsRoleDao.findById(id);
 
 		logger.info("【请求结束】系统管理->角色管理->角色详情,响应结果:{}", JSONObject.toJSONString(role));
 		return ResponseUtil.ok(role);
@@ -118,12 +118,12 @@ public class AdminRoleController {
 			return error;
 		}
 
-		if (roleService.checkExist(role.getName())) {
+		if (dtsRoleDao.checkExist(role.getName())) {
 			logger.info("系统管理->角色管理->角色添加错误:{}", AdminResponseCode.ROLE_NAME_EXIST.desc());
 			return AdminResponseUtil.fail(AdminResponseCode.ROLE_NAME_EXIST);
 		}
 
-		roleService.add(role);
+		dtsRoleDao.add(role);
 
 		logger.info("【请求结束】系统管理->角色管理->角色添加,响应结果:{}", JSONObject.toJSONString(role));
 		return ResponseUtil.ok(role);
@@ -140,7 +140,7 @@ public class AdminRoleController {
 			return error;
 		}
 
-		roleService.updateById(role);
+		dtsRoleDao.updateById(role);
 		logger.info("【请求结束】系统管理->角色管理->角色编辑,响应结果:{}", "成功!");
 		return ResponseUtil.ok();
 	}
@@ -155,7 +155,7 @@ public class AdminRoleController {
 		if (id == null) {
 			return ResponseUtil.badArgument();
 		}
-		roleService.deleteById(id);
+		dtsRoleDao.deleteById(id);
 
 		logger.info("【请求结束】系统管理->角色管理->角色删除,响应结果:{}", "成功!");
 		return ResponseUtil.ok();
@@ -180,11 +180,11 @@ public class AdminRoleController {
 		// 这里需要注意的是，如果存在超级权限*，那么这里需要转化成当前所有系统权限。
 		// 之所以这么做，是因为前端不能识别超级权限，所以这里需要转换一下。
 		Set<String> assignedPermissions = null;
-		if (permissionService.checkSuperPermission(roleId)) {
+		if (dtsPermissionDao.checkSuperPermission(roleId)) {
 			getSystemPermissions();
 			assignedPermissions = systemPermissionsString;
 		} else {
-			assignedPermissions = permissionService.queryByRoleId(roleId);
+			assignedPermissions = dtsPermissionDao.queryByRoleId(roleId);
 		}
 
 		return assignedPermissions;
@@ -231,18 +231,18 @@ public class AdminRoleController {
 		}
 
 		// 如果修改的角色是超级权限，则拒绝修改。
-		if (permissionService.checkSuperPermission(roleId)) {
+		if (dtsPermissionDao.checkSuperPermission(roleId)) {
 			logger.error("系统管理->角色管理->权限变更 错误:{}", AdminResponseCode.ROLE_SUPER_SUPERMISSION.desc());
 			return AdminResponseUtil.fail(AdminResponseCode.ROLE_SUPER_SUPERMISSION);
 		}
 
 		// 先删除旧的权限，再更新新的权限
-		permissionService.deleteByRoleId(roleId);
+		dtsPermissionDao.deleteByRoleId(roleId);
 		for (String permission : permissions) {
 			Permission permission1 = new Permission();
 			permission1.setRoleId(roleId);
 			permission1.setPermission(permission);
-			permissionService.add(permission1);
+			dtsPermissionDao.add(permission1);
 		}
 
 		logger.info("【请求结束】系统管理->角色管理->权限变更,响应结果:{}", "成功!");

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStatController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.ResponseUtil;
-import com.wwdz.ch.db.service.StatService;
+import com.wwdz.ch.db.dao.StatDao;
 
 @SuppressWarnings("rawtypes")
 @RestController
@@ -27,7 +27,7 @@ public class AdminStatController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminStatController.class);
 
 	@Autowired
-	private StatService statService;
+	private StatDao statDao;
 
 	@RequiresPermissions("admin:stat:user")
 	@RequiresPermissionsDesc(menu = { "统计管理", "用户统计" }, button = "查询")
@@ -35,7 +35,7 @@ public class AdminStatController {
 	public Object statUser() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 统计管理->用户统计->查询");
 
-		List<Map> rows = statService.statUser();
+		List<Map> rows = statDao.statUser();
 		String[] columns = new String[] { "day", "users" };
 		StatVo statVo = new StatVo();
 		statVo.setColumns(columns);
@@ -51,7 +51,7 @@ public class AdminStatController {
 	public Object statOrder() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 统计管理->订单统计->查询");
 
-		List<Map> rows = statService.statOrder();
+		List<Map> rows = statDao.statOrder();
 		String[] columns = new String[] { "day", "orders", "customers", "amount", "pcr" };
 		StatVo statVo = new StatVo();
 		statVo.setColumns(columns);
@@ -67,7 +67,7 @@ public class AdminStatController {
 	public Object statGoods() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 统计管理->商品统计->查询");
 
-		List<Map> rows = statService.statGoods();
+		List<Map> rows = statDao.statGoods();
 		String[] columns = new String[] { "day", "orders", "products", "amount" };
 		StatVo statVo = new StatVo();
 		statVo.setColumns(columns);

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStorageController.java

@@ -11,9 +11,9 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
+import com.wwdz.ch.db.dao.dts.DtsStorageDao;
 import com.wwdz.ch.db.domain.Storage;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
-import com.wwdz.ch.db.service.DtsStorageService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,12 +36,12 @@ import java.util.Map;
 public class AdminStorageController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminStorageController.class);
 
-
-
 	@Autowired
 	private StorageService storageService;
+
 	@Autowired
-	private DtsStorageService DtsStorageService;
+	private DtsStorageDao dtsStorageDao;
+
 	@Autowired
 	UploadService uploadService;
 
@@ -54,7 +54,7 @@ public class AdminStorageController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->查询,请求参数,name:{},key:{},page:{}", name, key, page);
 
-		List<Storage> storageList = DtsStorageService.querySelective(key, name, page, limit, sort, order);
+		List<Storage> storageList = dtsStorageDao.querySelective(key, name, page, limit, sort, order);
 		long total = PageInfo.of(storageList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);
@@ -89,7 +89,7 @@ public class AdminStorageController {
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->详情,请求参数,id:{}", id);
 
-		Storage storageInfo = DtsStorageService.findById(id);
+		Storage storageInfo = dtsStorageDao.findById(id);
 		if (storageInfo == null) {
 			return ResponseUtil.badArgumentValue();
 		}
@@ -104,7 +104,7 @@ public class AdminStorageController {
 	public Object update(@RequestBody Storage dtsStorage) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->编辑,请求参数:{}", JSONObject.toJSONString(dtsStorage));
 
-		if (DtsStorageService.update(dtsStorage) == 0) {
+		if (dtsStorageDao.update(dtsStorage) == 0) {
 			logger.error("系统管理->对象存储->编辑 错误:{}", "更新数据失败!");
 			return ResponseUtil.updatedDataFailed();
 		}
@@ -123,7 +123,7 @@ public class AdminStorageController {
 		if (StringUtils.isEmpty(key)) {
 			return ResponseUtil.badArgument();
 		}
-		DtsStorageService.deleteByKey(key);
+		dtsStorageDao.deleteByKey(key);
 		storageService.delete(key);
 
 		logger.info("【请求结束】系统管理->对象存储->删除:响应结果:{}", "成功!");

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminUserController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
 import com.wwdz.ch.admin.util.AuthSupport;
+import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +23,6 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
 import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.service.DtsUserService;
 
 @RestController
 @RequestMapping("/admin/user")
@@ -31,7 +31,7 @@ public class AdminUserController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminUserController.class);
 
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao dtsUserDao;
 
 	@RequiresPermissions("admin:user:list")
 	@RequiresPermissionsDesc(menu = { "用户管理", "会员管理" }, button = "查询")
@@ -42,7 +42,7 @@ public class AdminUserController {
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 用户管理->会员管理->查询,请求参数,username:{},code:{},page:{}", username, mobile, page);
 
-		List<User> userList = userService.querySelective(username, mobile, page, limit, sort, order);
+		List<User> userList = dtsUserDao.querySelective(username, mobile, page, limit, sort, order);
 		long total = PageInfo.of(userList).getTotal();
 		Map<String, Object> data = new HashMap<>();
 		data.put("total", total);

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/CategoryController.java

@@ -13,7 +13,7 @@ import com.wwdz.ch.admin.service.CategoryService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.core.type.ListResult;
 import com.wwdz.ch.db.domain.Category;
-import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.CategoryDao;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@ public class CategoryController {
 	private static final Logger logger = LoggerFactory.getLogger(CategoryController.class);
 
 	@Autowired
-	private CategoryManager categoryManager;
+	private CategoryDao categoryDao;
 
 	@Autowired
 	private CategoryService categoryService;
@@ -65,12 +65,12 @@ public class CategoryController {
 		/**
 		 *  获取最大深度
 		 */
-		Integer maxLevel = categoryManager.getMaxCagtegoryLevel();
+		Integer maxLevel = categoryDao.getMaxCagtegoryLevel();
 		Integer level = maxLevel;
 		Map<Integer, List<CategoryVo>> parentCategoryMap = new HashMap<>();
 
 		while (level > 0) {
-			List<Category> categoryList = categoryManager.queryByLevel(level, 0, 10000);
+			List<Category> categoryList = categoryDao.queryByLevel(level, 0, 10000);
 			for (Category c : categoryList) {
 				Integer parentId = c.getPid();
 				List<CategoryVo> children = parentCategoryMap.get(parentId);
@@ -120,7 +120,7 @@ public class CategoryController {
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->类目管理->详情,请求参数,id:{}", id);
 
-		Category category = categoryManager.findById(id);
+		Category category = categoryDao.findById(id);
 
 		logger.info("【请求结束】商场管理->类目管理->详情:响应结果:{}", JSONObject.toJSONString(category));
 		return ResponseUtil.ok(category);
@@ -133,7 +133,7 @@ public class CategoryController {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->类目管理->编辑,请求参数:{}", JSONObject.toJSONString(categoryVo));
 
 
-		if (categoryManager.updateById(categoryVo.toDo()) == 0) {
+		if (categoryDao.updateById(categoryVo.toDo()) == 0) {
 			logger.error("商场管理->类目管理->编辑 失败，更新数据失败！");
 			return ResponseUtil.updatedDataFailed();
 		}
@@ -158,7 +158,7 @@ public class CategoryController {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 商场管理->类目管理->一级分类目录查询");
 
 		// 所有一级分类目录
-		List<Category> l1CatList = categoryManager.queryByLevel(1, 1 ,100);
+		List<Category> l1CatList = categoryDao.queryByLevel(1, 1 ,100);
 		List<Map<String, Object>> data = new ArrayList<>(l1CatList.size());
 		for (Category category : l1CatList) {
 			Map<String, Object> d = new HashMap<>(2);

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/BidRecordServiceImpl.java

@@ -6,7 +6,7 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 import com.wwdz.ch.admin.service.BidRecordService;
 import com.wwdz.ch.db.domain.BidRecord;
-import com.wwdz.ch.db.dao.BidRecordManager;
+import com.wwdz.ch.db.dao.BidRecordDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,34 +23,34 @@ public class BidRecordServiceImpl implements BidRecordService {
     private static final Logger logger = LoggerFactory.getLogger(BidRecordServiceImpl.class);
 
     @Autowired
-    BidRecordManager bidRecordManager;
+    BidRecordDao bidRecordDao;
 
 
     @Override
     public void add(BidRecord record) {
-        bidRecordManager.add(record);
+        bidRecordDao.add(record);
     }
 
     @Override
     public int updateById(BidRecord record) {
-        return bidRecordManager.updateById(record);
+        return bidRecordDao.updateById(record);
     }
 
     @Override
     public BidRecord queryById(Long id) {
-        return bidRecordManager.queryById(id);
+        return bidRecordDao.queryById(id);
     }
 
     @Override
     public List<BidRecord> queryByCid(Integer cid) {
-        return bidRecordManager.queryByCid(cid);
+        return bidRecordDao.queryByCid(cid);
     }
 
     @Override
     public Object query(BidRecordRequestDto dto) {
         Map<String, Object> data = new HashMap<>();
         try {
-            List<BidRecord> list = bidRecordManager.query(dto);
+            List<BidRecord> list = bidRecordDao.query(dto);
             long total = PageInfo.of(list).getTotal();
             List<BidRecordVo> bidRecordVoList = list.parallelStream().map(a -> new BidRecordVo(a)).collect(Collectors.toList());
             data.put("total", total);
@@ -64,6 +64,6 @@ public class BidRecordServiceImpl implements BidRecordService {
 
     @Override
     public void deleteById(Long id) {
-        bidRecordManager.deleteById(id);
+        bidRecordDao.deleteById(id);
     }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/CategoryServiceImpl.java

@@ -4,10 +4,10 @@ import com.wwdz.ch.admin.entity.vo.CategoryVo;
 import com.wwdz.ch.admin.service.CategoryService;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.ResponseUtil;
+import com.wwdz.ch.db.dao.CategoryDao;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.GoodsCategoryObsolete;
-import com.wwdz.ch.db.dao.CategoryManager;
-import com.wwdz.ch.db.dao.ItemManager;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,10 +27,10 @@ public class CategoryServiceImpl implements CategoryService {
     private static final Logger logger = LoggerFactory.getLogger(CategoryServiceImpl.class);
 
     @Autowired
-    CategoryManager categoryManager;
+    CategoryDao categoryDao;
 
     @Autowired
-    ItemManager itemManager;
+    ItemDao itemDao;
 
     @Override
     public List<Category> queryByLevel(Integer level, Integer offset, Integer limit) {
@@ -49,7 +49,7 @@ public class CategoryServiceImpl implements CategoryService {
 
     @Override
     public List<CategoryVo> querySelective(String id, String name, Integer page, Integer size, String sort, String order) {
-        List<Category> collectList = categoryManager.querySelective(id, name, page, size, sort, order);
+        List<Category> collectList = categoryDao.querySelective(id, name, page, size, sort, order);
         List<CategoryVo> data = collectList.parallelStream().map(a -> new CategoryVo(a)).collect(Collectors.toList());
         return data;
     }
@@ -57,10 +57,10 @@ public class CategoryServiceImpl implements CategoryService {
     public Object getSubCategory(Integer id){
         try {
             List<CategoryVo> categoryVoList = new ArrayList<>();
-            List<Category> categoryList = categoryManager.queryByPid(id);
+            List<Category> categoryList = categoryDao.queryByPid(id);
             for (Category c : categoryList) {
                 CategoryVo categoryVo = new CategoryVo(c);
-                categoryVo.setCategoryPath(StringUtils.join(categoryManager.getCategoryPath(c.getId()), ">"));
+                categoryVo.setCategoryPath(StringUtils.join(categoryDao.getCategoryPath(c.getId()), ">"));
 
                 //如果是叶子结点，就从商品表中查询标准件信息作为该分类的信息
               /*  if (c.getIsLeaf()) {
@@ -79,7 +79,7 @@ public class CategoryServiceImpl implements CategoryService {
             }
             Map<String, Object> data = new HashMap<>();
             data.put("categoryList", categoryVoList);
-            data.put("categoryPath", categoryManager.getCategoryPath(id));
+            data.put("categoryPath", categoryDao.getCategoryPath(id));
             return ResponseUtil.ok(data);
         } catch (Exception e) {
            logger.error("getSubCategory id : {}, error {}", id, e);
@@ -95,10 +95,10 @@ public class CategoryServiceImpl implements CategoryService {
         Category pCat = new Category();
         pCat.setId(pid);
         pCat.setIsLeaf(false);
-        categoryManager.updateById(pCat);
+        categoryDao.updateById(pCat);
         //新建的类目为叶子节点
         category.setIsLeaf(true);
-        categoryManager.add(category);
+        categoryDao.add(category);
     }
 
     @Override
@@ -108,25 +108,25 @@ public class CategoryServiceImpl implements CategoryService {
             return ResponseUtil.badArgument();
         }
         //查询该类目下有没有子类目，有的话不能进行删除
-        List<Category> categorys = categoryManager.queryByPid(category.getId());
+        List<Category> categorys = categoryDao.queryByPid(category.getId());
         if (!CollectionUtils.isEmpty(categorys)) {
             return Result.failed("该分类下有子类目，不能删除");
         }
 
         //检验该分类下有没有商品，有商品的话不能删除
-        long count = itemManager.countByCid(id);
+        long count = itemDao.countByCid(id);
         if (count > 0) {
             return Result.failed("该分类下有归属商品，不能删除");
         }
-        categoryManager.deleteById(id);
+        categoryDao.deleteById(id);
 
         //查询该父节点下还有没有其它的节点，没有的话该父节点就是叶子节点
-        List<Category> categoryList = categoryManager.queryByPid(category.getPid());
+        List<Category> categoryList = categoryDao.queryByPid(category.getPid());
         if (CollectionUtils.isEmpty(categoryList)) {
             Category pCat = new Category();
             pCat.setId(category.getPid());
             pCat.setIsLeaf(true);
-            categoryManager.updateById(pCat);
+            categoryDao.updateById(pCat);
         }
         return Result.success();
     }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ItemServiceImpl.java

@@ -8,13 +8,13 @@ import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.core.storage.QiniuStorage;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.CroppingRecordDao;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.CroppingRecord;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.OperateLog;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
-import com.wwdz.ch.db.dao.CategoryManager;
-import com.wwdz.ch.db.dao.ItemManager;
+import com.wwdz.ch.db.dao.CategoryDao;
 import com.wwdz.ch.db.dto.request.CroppingRecordRequestDto;
 import com.xxdxxs.utils.EntityMapper;
 import com.xxdxxs.utils.JsonUtils;
@@ -35,7 +35,7 @@ public class ItemServiceImpl implements ItemService {
     private final static String IMG_SUFFIX = ".png";
 
     @Autowired
-    ItemManager itemManager;
+    ItemDao itemDao;
 
     @Autowired
     QiniuStorage qiniuStorage;
@@ -44,7 +44,7 @@ public class ItemServiceImpl implements ItemService {
     OperateLogService operateLogService;
 
     @Autowired
-    CategoryManager categoryManager;
+    CategoryDao categoryDao;
 
     @Autowired
     CroppingRecordDao croppingRecordDao;
@@ -52,7 +52,7 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public List<CoinVo> findList(CoinRequestDto coinRequestDto) {
         try {
-            List<Item> itemList = itemManager.findList(coinRequestDto);
+            List<Item> itemList = itemDao.findList(coinRequestDto);
             List<CoinVo> coinVoList = new ArrayList<>();
             itemList.forEach(item -> {
                 CoinVo coinVo = convertEntity(item);
@@ -71,21 +71,21 @@ public class ItemServiceImpl implements ItemService {
             Item item;
             Long itemId = coinRequestDto.getId();
             if (!ObjectUtils.isEmpty(itemId)) {
-                item = itemManager.findDetails(coinRequestDto.getId());
+                item = itemDao.findDetails(coinRequestDto.getId());
             } else {
-                item = itemManager.findOne(coinRequestDto);
+                item = itemDao.findOne(coinRequestDto);
             }
             CoinVo coinVo = convertEntity(item);
             //用于展示商品归属的类目（页面级联下拉控件数据展示）
             Integer categoryId = item.getCid();
-            Category category = categoryManager.findById(categoryId);
+            Category category = categoryDao.findById(categoryId);
             List<Integer> categoryIds = new ArrayList<>();
             if (null != category) {
                 categoryIds.add(0, category.getId());
                 Integer pid = category.getPid();
                 while (pid != 0) {
                     categoryIds.add(0, pid);
-                    Category pCategory = categoryManager.findById(pid);
+                    Category pCategory = categoryDao.findById(pid);
                     if (null != pCategory) {
                         pid = pCategory.getPid();
                     } else {
@@ -112,14 +112,14 @@ public class ItemServiceImpl implements ItemService {
             //如果该商品为标准件则替换原有的标准件
             if (item.getIsStd()) {
                 //查询出该分类下原有的标准件
-                Item oldStanardItem = itemManager.findStandard(item.getCid());
+                Item oldStanardItem = itemDao.findStandard(item.getCid());
                 if (oldStanardItem != null) {
-                    itemManager.cancelStandardItem(oldStanardItem.getId());
+                    itemDao.cancelStandardItem(oldStanardItem.getId());
                 }
             }
 
             //查询原有的数据
-            Item oldItem = itemManager.findDetails(coinRequestDto.getId());
+            Item oldItem = itemDao.findDetails(coinRequestDto.getId());
             String extra = oldItem.getExtra();
             Map<String, Object> map = new HashMap<>();
             if (StringUtils.hasLength(extra)) {
@@ -145,7 +145,7 @@ public class ItemServiceImpl implements ItemService {
                 paramMap.put("topImage", url);
                 item.setTopImage(url);
             }
-            itemManager.setCoin(item);
+            itemDao.setCoin(item);
 
 
 

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/OperateLogServiceImpl.java

 package com.wwdz.ch.admin.impl;
 
 import com.wwdz.ch.admin.service.OperateLogService;
+import com.wwdz.ch.db.dao.OperateLogDao;
 import com.wwdz.ch.db.domain.OperateLog;
-import com.wwdz.ch.db.dao.OperateLogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,11 +12,11 @@ import java.util.Date;
 public class OperateLogServiceImpl implements OperateLogService {
 
     @Autowired
-    OperateLogManager operateLogManager;
+    OperateLogDao operateLogDao;
 
     @Override
     public void insert(OperateLog operateLog) {
         operateLog.setCreateTime(new Date());
-        operateLogManager.insert(operateLog);
+        operateLogDao.insert(operateLog);
     }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynCoinJob.java

@@ -3,7 +3,7 @@ package com.wwdz.ch.admin.job;
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.db.dao.CoinsDao;
-import com.wwdz.ch.db.dao.ItemManager;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.domain.Coins;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
@@ -20,7 +20,7 @@ public class SynCoinJob {
     private static final Logger logger = LoggerFactory.getLogger(SynCoinJob.class);
 
     @Autowired
-    ItemManager itemManager;
+    ItemDao itemDao;
 
     @Autowired
     CoinsDao coinsDao;
@@ -65,7 +65,7 @@ public class SynCoinJob {
                         item.setOriginalExtra(coins.getExtra());
                         item.setOriginalSourceUrl(coins.getSourceUrl());
                         item.setSource(coins.getSource());
-                        itemManager.insert(item);
+                        itemDao.insert(item);
                     });
                logger.info(">>>>>>>>>>>>>>>>> 同步数据的页码: {}, 同步成功 <<<<<<<<<<<<<<<<<", i);
             });

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminDataAuthService.java

@@ -2,18 +2,18 @@ package com.wwdz.ch.admin.service;
 
 import java.util.Set;
 
+import com.wwdz.ch.db.dao.dts.DtsRoleDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.db.domain.Admin;
-import com.wwdz.ch.db.service.DtsRoleService;
 
 @Service
 public class AdminDataAuthService {
 
 	@Autowired
-	private DtsRoleService roleService;
+	private DtsRoleDao dtsRoleDao;
 	
 	/**
 	 * 是否属于运营商管理员，超级管理员除外
@@ -24,7 +24,7 @@ public class AdminDataAuthService {
 		Admin currentUser = AuthSupport.currentUser();
 		if (currentUser != null) {
 			roleIds = currentUser.getRoleIds();
-			Set<String> roles = roleService.queryByIds(roleIds);
+			Set<String> roles = dtsRoleDao.queryByIds(roleIds);
 			//仅仅只是品牌管理员且不属于超级管理员
 			if (roles.contains(AuthSupport.BRAND_ROLE_NAME) && !roles.contains(AuthSupport.SUPER_ROLE_NAME)) {
 				return true;

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminGoodsService.java

@@ -4,10 +4,9 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.wwdz.ch.admin.entity.vo.ItemVo;
+import com.wwdz.ch.db.dao.CategoryDao;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.domain.*;
-import com.wwdz.ch.db.dao.CategoryManager;
-import com.wwdz.ch.db.dao.ItemManager;
-import com.wwdz.ch.db.service.ItemService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,13 +24,10 @@ public class AdminGoodsService {
 	private static final Logger logger = LoggerFactory.getLogger(AdminGoodsService.class);
 
 	@Autowired
-	private ItemService itemService;
+	private ItemDao itemDao;
 
 	@Autowired
-	private ItemManager itemManager;
-
-	@Autowired
-	private CategoryManager categoryManager;
+	private CategoryDao categoryDao;
 
 	@Autowired
 	private QCodeService qCodeService;
@@ -39,7 +35,7 @@ public class AdminGoodsService {
 	public Object list(String name, Integer page, Integer limit, String sort, String order) {
 		Map<String, Object> data = new HashMap<>();
 		try {
-			List<Item> itemList = itemService.querySelective(name, page, limit, sort, order);
+			List<Item> itemList = itemDao.querySelective(name, page, limit, sort, order);
 			long total = PageInfo.of(itemList).getTotal();
 			List<ItemVo> itemVoList = new ArrayList<>();
 			itemVoList = itemList.stream().map(i -> ItemVo.fromItem(i)).collect(Collectors.toList());
@@ -61,7 +57,7 @@ public class AdminGoodsService {
 		// 分类可以不设置，如果设置则需要验证分类存在
 		Integer categoryId = item.getCid();
 		if (categoryId != null && categoryId != 0) {
-			if (categoryManager.findById(categoryId) == null) {
+			if (categoryDao.findById(categoryId) == null) {
 				return ResponseUtil.badArgumentValue();
 			}
 		}
@@ -88,14 +84,14 @@ public class AdminGoodsService {
 		//如果该商品为标准件则替换原有的标准件
 		if (item.getIsStd()) {
 			//查询出该分类下原有的标准件
-			Item oldStanardItem = itemManager.findStandard(item.getCid());
+			Item oldStanardItem = itemDao.findStandard(item.getCid());
 			if (oldStanardItem != null) {
-				itemManager.cancelStandardItem(oldStanardItem.getId());
+				itemDao.cancelStandardItem(oldStanardItem.getId());
 			}
 		}
 
 		Long id = item.getId();
-		Item oldItem = itemManager.findDetails(id);
+		Item oldItem = itemDao.findDetails(id);
 		oldItem.setName(item.getName());
 		oldItem.setCid(item.getCid());
 		oldItem.setDetail(item.getDetail());
@@ -104,7 +100,7 @@ public class AdminGoodsService {
 		oldItem.setIsOnSale(item.getIsOnSale());
 		oldItem.setIsStd(item.getIsStd());
 		oldItem.setTopImage(item.getTopImage());
-		if (itemService.updateById(oldItem) == 0) {
+		if (itemDao.updateById(oldItem) == 0) {
 			logger.error("商品管理->商品管理->编辑错误:{}", "更新数据失败");
 			throw new RuntimeException("更新数据失败");
 		}
@@ -119,7 +115,7 @@ public class AdminGoodsService {
 			return ResponseUtil.badArgument();
 		}
 		Long gid = item.getId();
-		itemManager.deleteById(id);
+		itemDao.deleteById(id);
 		logger.info("【请求结束】商品管理->商品管理->删除,响应结果:{}", "成功!");
 		return ResponseUtil.ok();
 	}
@@ -135,7 +131,7 @@ public class AdminGoodsService {
 		item.setCreateTime(now);
 		item.setUpdateTime(now);
 		item.setIsDeleted(false);
-		itemService.add(item);
+		itemDao.add(item);
 
 		// 将生成的分享图片地址写入数据库
 	/*	String url = qCodeService.createGoodShareImage(null, item.getId().toString(), item.getImages().split(";")[0], item.getName(), item.getPrice());
@@ -151,18 +147,18 @@ public class AdminGoodsService {
 	}
 
 	public Object detail(Long id) {
-		Item item = itemService.findById(id);
+		Item item = itemDao.findById(id);
 
 		//用于展示商品归属的类目（页面级联下拉控件数据展示）
 		Integer categoryId = item.getCid();
-		Category category = categoryManager.findById(categoryId);
+		Category category = categoryDao.findById(categoryId);
 		List<Integer> categoryIds = new ArrayList<>();
 		if (null != category) {
 			categoryIds.add(0, category.getId());
 			Integer pid = category.getPid();
 			while (pid != 0) {
 				categoryIds.add(0, pid);
-				Category pCategory = categoryManager.findById(pid);
+				Category pCategory = categoryDao.findById(pid);
 				if (null != pCategory) {
 					pid = pCategory.getPid();
 				} else {

ch-admin-api/src/main/java/com/wwdz/ch/admin/shiro/AdminAuthorizingRealm.java

@@ -3,6 +3,9 @@ package com.wwdz.ch.admin.shiro;
 import java.util.List;
 import java.util.Set;
 
+import com.wwdz.ch.db.dao.dts.DtsAdminDao;
+import com.wwdz.ch.db.dao.dts.DtsPermissionDao;
+import com.wwdz.ch.db.dao.dts.DtsRoleDao;
 import org.apache.shiro.authc.AccountException;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
@@ -18,15 +21,11 @@ import org.apache.shiro.subject.PrincipalCollection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder;
 import com.wwdz.ch.db.domain.Admin;
-import com.wwdz.ch.db.service.DtsAdminService;
-import com.wwdz.ch.db.service.DtsPermissionService;
-import com.wwdz.ch.db.service.DtsRoleService;
 
 /**
  * 授权相关服务-shiro
@@ -39,11 +38,13 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
 	private static final Logger logger = LoggerFactory.getLogger(AdminAuthorizingRealm.class);
 
 	@Autowired
-	private DtsAdminService adminService;
+	private DtsAdminDao dtsAdminDao;
+
 	@Autowired
-	private DtsRoleService roleService;
+	private DtsRoleDao dtsRoleDao;
+
 	@Autowired
-	private DtsPermissionService permissionService;
+	private DtsPermissionDao dtsPermissionDao;
 
 	@Override
 	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
@@ -53,8 +54,8 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
 
 		Admin admin = (Admin) getAvailablePrincipal(principals);
 		Integer[] roleIds = admin.getRoleIds();
-		Set<String> roles = roleService.queryByIds(roleIds);
-		Set<String> permissions = permissionService.queryByRoleIds(roleIds);
+		Set<String> roles = dtsRoleDao.queryByIds(roleIds);
+		Set<String> permissions = dtsPermissionDao.queryByRoleIds(roleIds);
 		SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
 		info.setRoles(roles);
 		info.setStringPermissions(permissions);
@@ -75,7 +76,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
 			throw new AccountException("密码不能为空");
 		}
 
-		List<Admin> adminList = adminService.findAdmin(username);
+		List<Admin> adminList = dtsAdminDao.findAdmin(username);
 		Assert.state(adminList.size() < 2, "同一个用户名存在两个账户");
 		if (adminList.size() == 0) {
 			logger.error("找不到用户（" + username + "）的帐号信息");

ch-core/src/main/java/com/wwdz/ch/core/notify/WxTemplateSender.java

@@ -3,13 +3,11 @@ package com.wwdz.ch.core.notify;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.wwdz.ch.db.dao.dts.DtsUserFormIdDao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import com.wwdz.ch.db.domain.UserFormidObsolete;
-import com.wwdz.ch.db.service.DtsUserFormIdService;
-
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaTemplateData;
 import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
@@ -24,7 +22,7 @@ public class WxTemplateSender {
 	private WxMaService wxMaService;
 
 	@Autowired
-	private DtsUserFormIdService formIdService;
+	private DtsUserFormIdDao dtsUserFormIdDao;
 
 	/**
 	 * 发送微信消息(模板消息),不带跳转
@@ -58,7 +56,7 @@ public class WxTemplateSender {
 
 	private void sendMsg(String touser, String templatId, String[] parms, String page, String color,
 			String emphasisKeyword) {
-		UserFormidObsolete userFormid = formIdService.queryByOpenId(touser);
+		UserFormidObsolete userFormid = dtsUserFormIdDao.queryByOpenId(touser);
 		if (userFormid == null)
 			return;
 
@@ -73,7 +71,7 @@ public class WxTemplateSender {
 
 		try {
 			wxMaService.getMsgService().sendTemplateMsg(msg);
-			if (formIdService.updateUserFormId(userFormid) == 0) {
+			if (dtsUserFormIdDao.updateUserFormId(userFormid) == 0) {
 				logger.warn("更新数据已失效");
 			}
 		} catch (Exception e) {

ch-core/src/main/java/com/wwdz/ch/core/storage/StorageService.java

@@ -4,12 +4,11 @@ import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.stream.Stream;
 
+import com.wwdz.ch.db.dao.dts.DtsStorageDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
-
 import com.wwdz.ch.core.util.CharUtil;
 import com.wwdz.ch.db.domain.Storage;
-import com.wwdz.ch.db.service.DtsStorageService;
 
 /**
  * 提供存储服务类，所有存储服务均由该类对外提供
@@ -17,8 +16,9 @@ import com.wwdz.ch.db.service.DtsStorageService;
 public class StorageService {
 	private String active;
 	private com.wwdz.ch.core.storage.Storage storage;
+
 	@Autowired
-	private DtsStorageService DtsStorageService;
+	private DtsStorageDao dtsStorageDao;
 
 	public String getActive() {
 		return active;
@@ -74,7 +74,7 @@ public class StorageService {
 
 		do {
 			key = CharUtil.getRandomString(20) + suffix;
-			storageInfo = DtsStorageService.findByKey(key);
+			storageInfo = dtsStorageDao.findByKey(key);
 		} while (storageInfo != null);
 
 		return key;

ch-core/src/main/java/com/wwdz/ch/core/system/ConfigService.java

@@ -2,13 +2,10 @@ package com.wwdz.ch.core.system;
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
+import com.wwdz.ch.db.dao.dts.DtsSystemConfigDao;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import com.wwdz.ch.db.domain.System;
-import com.wwdz.ch.db.service.DtsSystemConfigService;
 
 /**
  * 该类用于自动初始化数据库配置到BaseConfig中，以便BaseConfig的子类调用
@@ -16,8 +13,9 @@ import com.wwdz.ch.db.service.DtsSystemConfigService;
 //@Component
 class ConfigService {
 	private static ConfigService systemConfigService;
+
 	@Autowired
-	private DtsSystemConfigService dtsSystemConfigService;
+	private DtsSystemConfigDao dtsSystemConfigDao;
 
 	// 不允许实例化
 	private ConfigService() {
@@ -40,7 +38,7 @@ class ConfigService {
 	 * @param prefix
 	 */
 	public void reloadConfig(String prefix) {
-		List<System> list = dtsSystemConfigService.queryAll();
+		List<System> list = dtsSystemConfigDao.queryAll();
 		for (System item : list) {
 			// 符合条件，添加
 			if (item.getKeyName().startsWith(prefix))
@@ -52,7 +50,7 @@ class ConfigService {
 	 * 读取全部配置
 	 */
 	private void inistConfigs() {
-		List<System> list = dtsSystemConfigService.queryAll();
+		List<System> list = dtsSystemConfigDao.queryAll();
 		for (System item : list) {
 			BaseConfig.addConfig(item.getKeyName(), item.getKeyValue());
 		}

ch-core/src/main/java/com/wwdz/ch/core/util/ElasticsearchUtil.java

@@ -9,6 +9,7 @@ import co.elastic.clients.elasticsearch.core.GetResponse;
 import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.search.Hit;
+import co.elastic.clients.elasticsearch.core.search.SourceConfig;
 import co.elastic.clients.util.ObjectBuilder;
 import com.wwdz.ch.core.entity.EsSearchParam;
 import com.wwdz.ch.db.bean.ItemOfEs;
@@ -57,9 +58,14 @@ public class ElasticsearchUtil {
 
         //    SearchResponse<ItemOfEs> searchResponse = elasticsearchClient.search((Function<SearchRequest.Builder, ObjectBuilder<SearchRequest>>) builder,  ItemOfEs.class);
 
+
+         //   SearchRequest searchRequest = (SearchRequest)((ObjectBuilder)fn.apply(new co.elastic.clients.elasticsearch.core.SearchRequest.Builder())).build();
+
+
             SearchResponse<ItemOfEs> searchResponse = elasticsearchClient.search(s -> s
                     .index(INDEX)
-                //    .query(nameQuery)
+                    .source(sourceBuild->sourceBuild.filter(f->f.includes("coin_id", "name", "price", "top_image_path")))
+                    .query(nameQuery)
                     .from(page).size(size)
                     .sort(f -> f.field(o -> o.field("coin_id").order(SortOrder.Desc))),
                     ItemOfEs.class);

ch-dao/src/main/java/com/wwdz/ch/db/dao/BidRecordManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/BidRecordDao.java

@@ -5,7 +5,7 @@ import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
 
 import java.util.List;
 
-public interface BidRecordManager {
+public interface BidRecordDao {
 
     void add(BidRecord record);
 

ch-dao/src/main/java/com/wwdz/ch/db/dao/CategoryManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/CategoryDao.java

@@ -3,7 +3,7 @@ package com.wwdz.ch.db.dao;
 import com.wwdz.ch.db.domain.Category;
 import java.util.List;
 
-public interface CategoryManager {
+public interface CategoryDao {
 
     List<Category> queryByLevel(Integer level, Integer offset, Integer limit);
 

ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemDao.java

 package com.wwdz.ch.db.dao;
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.db.domain.Item;
+import com.wwdz.ch.db.domain.ItemExample;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
+import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.List;
 
-public interface ItemManager {
+public interface ItemDao {
 
 
     Item findOne(CoinRequestDto coinRequestDto);
@@ -32,4 +36,58 @@ public interface ItemManager {
     int insert(Item item);
 
     int update(Item item);
+
+
+    /**
+     * 获取分类下的商品
+     *
+     * @param catList
+     * @param offset
+     * @param limit
+     * @return
+     */
+     List<Item> queryByCategories(List<Integer> catList, int offset, int limit);
+
+    /**
+     * 获取分类下的商品
+     *
+     * @param catId
+     * @param offset
+     * @param limit
+     * @return
+     */
+     List<Item> queryByCategory(Integer catId, int offset, int limit);
+
+     List<Item> querySelective(Integer catId, String keywords, Integer offset, Integer limit, String sort, String order);
+
+
+     List<Item> querySelective(String name, Integer page, Integer size, String sort, String order);
+
+    /**
+     * 获取某个商品信息,包含完整信息
+     *
+     * @param id
+     * @return
+     */
+     Item findById(Long id);
+
+
+    /**
+     * 获取所有在售物品总数
+     *
+     * @return
+     */
+    Integer queryOnSale();
+
+    int updateById(Item item);
+
+
+    void add(Item item);
+
+    /**
+     * 获取所有物品总数，包括在售的和下架的，但是不包括已删除的商品
+     *
+     * @return
+     */
+    int count();
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/OperateLogManager.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/OperateLogDao.java

@@ -2,7 +2,7 @@ package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.OperateLog;
 
-public interface OperateLogManager {
+public interface OperateLogDao {
 
     void insert(OperateLog operateLog);
 }

ch-dao/src/main/java/com/wwdz/ch/db/service/StatService.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/StatDao.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.dao;
 
 import java.util.List;
 import java.util.Map;
@@ -11,7 +11,7 @@ import com.wwdz.ch.db.mapper.ex.StatMapper;
 
 @Service
 @SuppressWarnings("rawtypes")
-public class StatService {
+public class StatDao {
 	@Resource
 	private StatMapper statMapper;
 

ch-dao/src/main/java/com/wwdz/ch/db/service/UgcCoinService.java → ch-dao/src/main/java/com/wwdz/ch/db/dao/UgcCoinDao.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.dao;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.mapper.UgcCoinMapper;
@@ -10,7 +10,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class UgcCoinService {
+public class UgcCoinDao {
 
     @Resource
     private UgcCoinMapper ugcCoinMapper;

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsAccountDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import javax.annotation.Resource;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.mapper.AccountTraceObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserMapper;
+import com.wwdz.ch.db.domain.AccountTraceObsolete;
+import com.wwdz.ch.db.domain.AccountTraceObsoleteExample;
+import com.wwdz.ch.db.domain.User;
+import com.wwdz.ch.db.domain.UserAccountObsolete;
+import com.wwdz.ch.db.domain.UserAccountObsoleteExample;
+
+public interface DtsAccountDao {
+
+	 UserAccountObsolete findShareUserAccountByUserId(Integer shareUserId);
+
+
+	void settleApplyTrace(Integer sharedUserId, String startTime,String endTime,Integer type, BigDecimal toSettleMoney,String mobile);
+
+	List<AccountTraceObsolete> queryAccountTraceList(Integer userId, Integer page, Integer size);
+
+	/**
+	 * 新增申请提现记录
+	 * 
+	 * @param userId
+	 * @param applyAmt
+	 */
+	void addExtractRecord(Integer userId, BigDecimal applyAmt, String mobile, String smsCode, BigDecimal hasAmount);
+
+	void add(UserAccountObsolete userAccount);
+
+	/**
+	 * 根据账号和状态，查询提现记录
+	 * @param userId 
+	 * @param types
+	 * @return
+	 */
+	 List<AccountTraceObsolete> getAccountTraceList(Integer userId, Byte... types);
+
+
+	 List<AccountTraceObsolete> querySelectiveTrace(List<User> userList, List<Byte> status, Integer page, Integer size, String sort, String order);
+
+	/**
+	 * 为资金账户的安全，建议做线下销账处理，处理后执行该逻辑
+	 * 这里只根据记录做状态调整和审批意见记录
+	 * @param traceId
+	 * @param status
+	 * @param traceMsg
+	 * @return
+	 */
+
+	 boolean approveAccountTrace(Integer traceId, Byte status, String traceMsg);
+	
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsAdminDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Admin;
+
+import java.util.List;
+
+public interface DtsAdminDao {
+    List<Admin> findAdmin(String username);
+
+    Admin findAdmin(Integer id);
+
+    List<Admin> querySelective(String username, Integer page, Integer limit, String sort, String order);
+
+    int updateById(Admin admin);
+
+    void deleteById(Integer id);
+
+    void add(Admin admin);
+
+    Admin findById(Integer id);
+
+    List<Admin> allAdmin();
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsCollectDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.CollectObsolete;
+
+import java.util.List;
+
+public interface DtsCollectDao {
+    int count(Long uid, Long gid);
+
+    List<CollectObsolete> queryByType(Long userId, Byte type, Integer page, Integer size);
+
+    int countByType(Long userId, Byte type);
+
+    CollectObsolete queryByTypeAndValue(Long userId, Byte type, Long valueId);
+
+    void deleteById(Long id);
+
+    int add(CollectObsolete collect);
+
+    List<CollectObsolete> querySelective(String userId, String valueId, Integer page, Integer size, String sort, String order);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsFeedbackDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Feedback;
+
+import java.util.List;
+
+public interface DtsFeedbackDao {
+    Integer add(Feedback feedback);
+
+    List<Feedback> querySelective(Long userId, String username, Integer page, Integer limit, String sort, String order);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsFootprintDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Footprint;
+
+import java.util.List;
+
+public interface DtsFootprintDao {
+    List<Footprint> queryByAddTime(Long userId, Integer page, Integer size);
+
+    Footprint findById(Long id);
+
+    void deleteById(Long id);
+
+    void add(Footprint footprint);
+
+    List<Footprint> querySelective(String userId, String coinsId, Integer page, Integer size, String sort, String order);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsGoodsAttributeDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.GoodsAttributeObsolete;
+
+import java.util.List;
+
+public interface DtsGoodsAttributeDao {
+    List<GoodsAttributeObsolete> queryByGid(Integer goodsId);
+
+    void add(GoodsAttributeObsolete goodsAttribute);
+
+    GoodsAttributeObsolete findById(Integer id);
+
+    void deleteByGid(Integer gid);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsGoodsProductDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.GoodsProductObsolete;
+
+import java.util.List;
+
+public interface DtsGoodsProductDao {
+    List<GoodsProductObsolete> queryByGid(Integer gid);
+
+    GoodsProductObsolete findById(Integer id);
+
+    void deleteById(Integer id);
+
+    void add(GoodsProductObsolete goodsProduct);
+
+    int count();
+
+    void deleteByGid(Integer gid);
+
+    int addStock(Integer id, Short num);
+
+    int addBrowse(Integer id, Short num);
+
+    int reduceStock(Integer id, Integer goodsId, Short num);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsGoodsSpecificationDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.GoodsSpecificationObsolete;
+
+import java.util.List;
+
+public interface DtsGoodsSpecificationDao {
+    List<GoodsSpecificationObsolete> queryByGid(Integer id);
+
+    GoodsSpecificationObsolete findById(Integer id);
+
+    void deleteByGid(Integer gid);
+
+    void add(GoodsSpecificationObsolete goodsSpecification);
+
+    Object getSpecificationVoList(Integer id);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsIssueDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Issue;
+
+import java.util.List;
+
+public interface DtsIssueDao {
+    List<Issue> query();
+
+    void deleteById(Integer id);
+
+    void add(Issue issue);
+
+    List<Issue> querySelective(String question, Integer page, Integer size, String sort, String order);
+
+    int updateById(Issue issue);
+
+    Issue findById(Integer id);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsKeywordDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Keyword;
+
+import java.util.List;
+
+public interface DtsKeywordDao {
+    Keyword queryDefault();
+
+    List<Keyword> queryHots();
+
+    List<Keyword> queryByKeyword(String keyword, Integer page, Integer size);
+
+    List<Keyword> querySelective(String keyword, String url, Integer page, Integer limit, String sort, String order);
+
+    void add(Keyword keywords);
+
+    Keyword findById(Integer id);
+
+    int updateById(Keyword keywords);
+
+    void deleteById(Integer id);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsPermissionDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Permission;
+
+import java.util.Set;
+
+public interface DtsPermissionDao {
+    Set<String> queryByRoleIds(Integer[] roleIds);
+
+    Set<String> queryByRoleId(Integer roleId);
+
+    boolean checkSuperPermission(Integer roleId);
+
+    void deleteByRoleId(Integer roleId);
+
+    void add(Permission DtsPermission);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsRoleDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Role;
+
+import java.util.List;
+import java.util.Set;
+
+public interface DtsRoleDao {
+    Set<String> queryByIds(Integer[] roleIds);
+
+    List<Role> querySelective(String roleName, Integer page, Integer size, String sort, String order);
+
+    Role findById(Integer id);
+
+    void add(Role role);
+
+    void deleteById(Integer id);
+
+    void updateById(Role role);
+
+    boolean checkExist(String name);
+
+    List<Role> queryAll();
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsSearchHistoryDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.SearchHistory;
+
+import java.util.List;
+
+public interface DtsSearchHistoryDao {
+    void save(SearchHistory searchHistory);
+
+    List<SearchHistory> queryByUid(Long uid);
+
+    void deleteByUid(Long uid);
+
+    List<SearchHistory> querySelective(String userId, String keyword, Integer page, Integer size, String sort, String order);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsStorageDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.Storage;
+
+import java.util.List;
+
+public interface DtsStorageDao {
+    void deleteByKey(String key);
+
+    void add(Storage storageInfo);
+
+    Storage findByKey(String key);
+
+    int update(Storage storageInfo);
+
+    Storage findById(Integer id);
+
+    List<Storage> querySelective(String key, String name, Integer page, Integer limit, String sort, String order);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsSystemConfigDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.System;
+
+import java.util.List;
+
+public interface DtsSystemConfigDao {
+    List<System> queryAll();
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsUserDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.bean.DayStatis;
+import com.wwdz.ch.db.domain.User;
+import com.wwdz.ch.db.domain.UserVo;
+
+import java.util.List;
+
+public interface DtsUserDao {
+    User findById(Long userId);
+
+    UserVo findUserVoById(Long userId);
+
+    User queryByOid(String openId);
+
+    void add(User user);
+
+    int updateById(User user);
+
+    List<User> querySelective(String username, String mobile, Integer page, Integer size, String sort, String order);
+
+    int count();
+
+    List<User> queryByUsername(String username);
+
+    boolean checkByUsername(String username);
+
+    List<User> queryByMobile(String mobile);
+
+    List<User> queryByOpenid(String openid);
+
+    void deleteById(Long id);
+
+    List<DayStatis> recentCount(int statisDaysRang);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/dts/DtsUserFormIdDao.java

+package com.wwdz.ch.db.dao.dts;
+
+import com.wwdz.ch.db.domain.UserFormidObsolete;
+
+public interface DtsUserFormIdDao {
+    UserFormidObsolete queryByOpenId(String openId);
+
+    int updateUserFormId(UserFormidObsolete userFormid);
+
+    void addUserFormid(UserFormidObsolete userFormid);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/BidRecordManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/BidRecordDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.mapper.BidRecordMapper;
 import com.wwdz.ch.db.domain.BidRecord;
 import com.wwdz.ch.db.domain.BidRecordExample;
 import com.wwdz.ch.db.dto.request.BidRecordRequestDto;
-import com.wwdz.ch.db.dao.BidRecordManager;
+import com.wwdz.ch.db.dao.BidRecordDao;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.stereotype.Service;
 
@@ -14,7 +14,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class BidRecordManagerImpl implements BidRecordManager {
+public class BidRecordDaoImpl implements BidRecordDao {
 
     @Resource
     private BidRecordMapper bidRecordMapper;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/CategoryManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/CategoryDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.mapper.CategoryMapper;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.CategoryExample;
-import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.CategoryDao;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -15,7 +15,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Service
-public class CategoryManagerImpl implements CategoryManager {
+public class CategoryDaoImpl implements CategoryDao {
 
 	@Resource
 	private CategoryMapper categoryMapper;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/CoinsDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/CoinsDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/CroppingRecordDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/CroppingRecordDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.wwdz.ch.db.dao.CroppingRecordDao;
 import com.wwdz.ch.db.domain.CroppingRecord;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/FavoritesDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/FavoritesDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/FavoritesItemsRelationDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/FavoritesItemsRelationDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/FootPrintDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/FootPrintDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.dao.FootPrintDao;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/ItemManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/ItemDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -6,19 +6,21 @@ import com.wwdz.ch.db.mapper.ItemMapper;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.ItemExample;
 import com.wwdz.ch.db.dto.request.CoinRequestDto;
-import com.wwdz.ch.db.dao.ItemManager;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.xxdxxs.db.component.JdbcHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
 @Repository
-public class ItemManagerImpl implements ItemManager {
+public class ItemDaoImpl implements ItemDao {
 
+    //商品来源是中国，所对应的编码
     private final static List<Integer> CHINESE_SOURCE_LIST = Arrays.asList(1, 2, 3, 7, 8, 10, 11);
 
     @Autowired
@@ -144,4 +146,135 @@ public class ItemManagerImpl implements ItemManager {
     public int update(Item item) {
         return itemMapper.updateByPrimaryKeySelective(item);
     }
+
+
+
+
+    //-------------------------初始代码--------------------------//
+    /**
+     * 获取分类下的商品
+     *
+     * @param catList
+     * @param offset
+     * @param limit
+     * @return
+     */
+    public List<Item> queryByCategories(List<Integer> catList, int offset, int limit) {
+        ItemExample example = new ItemExample();
+        example.or().andCidIn(catList).andIsOnSaleEqualTo(true).andIsDeletedEqualTo(false);
+        example.setOrderByClause("sort  asc");
+        PageHelper.startPage(offset, limit);
+
+        return itemMapper.selectByExample(example);
+    }
+
+    /**
+     * 获取分类下的商品
+     *
+     * @param catId
+     * @param offset
+     * @param limit
+     * @return
+     */
+    public List<Item> queryByCategory(Integer catId, int offset, int limit) {
+        ItemExample example = new ItemExample();
+        example.or().andCidEqualTo(catId).andIsOnSaleEqualTo(true).andIsDeletedEqualTo(false);
+        example.setOrderByClause("created desc");
+        PageHelper.startPage(offset, limit);
+
+        return itemMapper.selectByExample(example);
+    }
+
+    public List<Item> querySelective(Integer catId, String keywords,
+                                     Integer offset, Integer limit, String sort, String order) {
+        ItemExample example = new ItemExample();
+        ItemExample.Criteria criteria1 = example.or();
+
+        if (!StringUtils.isEmpty(catId) && catId != 0) {
+            criteria1.andCidEqualTo(catId);
+        }
+        if (!StringUtils.isEmpty(keywords)) {
+            criteria1.andNameLike("%" + keywords + "%");
+        }
+//		criteria1.andIsOnSaleEqualTo(true);
+        criteria1.andIsDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+            example.setOrderByClause(sort + " " + order);
+        }
+
+        PageHelper.startPage(offset, limit);
+
+        return itemMapper.selectByExampleWithBLOBs(example);
+    }
+
+    public List<Item> querySelective(String name, Integer page, Integer size, String sort,
+                                     String order) {
+        ItemExample example = new ItemExample();
+        ItemExample.Criteria criteria = example.createCriteria();
+
+        if (!StringUtils.isEmpty(name)) {
+            criteria.andNameLike("%" + name + "%");
+        }
+        criteria.andIsDeletedEqualTo(false);
+
+        if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+            example.setOrderByClause(sort + " " + order);
+        }
+
+        PageHelper.startPage(page, size);
+        return itemMapper.selectByExampleWithBLOBs(example);
+    }
+
+    /**
+     * 获取某个商品信息,包含完整信息
+     *
+     * @param id
+     * @return
+     */
+    public Item findById(Long id) {
+        ItemExample example = new ItemExample();
+        example.or().andIdEqualTo(id).andIsDeletedEqualTo(false);
+        return itemMapper.selectOneByExampleWithBLOBs(example);
+    }
+
+
+    /**
+     * 获取所有在售物品总数
+     *
+     * @return
+     */
+    public Integer queryOnSale() {
+        ItemExample example = new ItemExample();
+        example.or().andIsOnSaleEqualTo(true).andIsDeletedEqualTo(false);
+        return (int) itemMapper.countByExample(example);
+    }
+
+    public int updateById(Item item) {
+        item.setUpdateTime(new Date());
+        return itemMapper.updateByPrimaryKeyWithBLOBs(item);
+    }
+
+   /* public void deleteById(Long id) {
+        //	itemMapper.logicalDeleteByPrimaryKey(id);
+    }*/
+
+    public void add(Item item) {
+        Date now = new Date();
+        item.setCreateTime(now);
+        item.setUpdateTime(now);
+        itemMapper.insertSelective(item);
+    }
+
+    /**
+     * 获取所有物品总数，包括在售的和下架的，但是不包括已删除的商品
+     *
+     * @return
+     */
+    public int count() {
+        ItemExample example = new ItemExample();
+        example.or().andIsDeletedEqualTo(false);
+        return (int) itemMapper.countByExample(example);
+    }
+
 }

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/OperateLogManagerImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/OperateLogDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.wwdz.ch.db.mapper.OperateLogMapper;
 import com.wwdz.ch.db.domain.OperateLog;
-import com.wwdz.ch.db.dao.OperateLogManager;
+import com.wwdz.ch.db.dao.OperateLogDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class OperateLogManagerImpl implements OperateLogManager {
+public class OperateLogDaoImpl implements OperateLogDao {
 
     @Autowired
     OperateLogMapper operateLogMapper;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/UserDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/UserDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.wwdz.ch.db.dao.UserDao;
 import com.wwdz.ch.db.domain.User;

ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/UserItemsRelationDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/UserItemsRelationDaoImpl.java

-package com.wwdz.ch.db.dao.impl;
+package com.wwdz.ch.db.impl;
 
 import com.wwdz.ch.db.dao.UserItemsRelationDao;
 import com.wwdz.ch.db.mapper.UserItemsRelationMapper;

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsAccountService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsAccountDaoImpl.java

-package com.wwdz.ch.db.service;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-
-import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.AccountTraceObsoleteMapper;
-import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
-import com.wwdz.ch.db.mapper.UserMapper;
-import com.wwdz.ch.db.domain.AccountTraceObsolete;
-import com.wwdz.ch.db.domain.AccountTraceObsoleteExample;
-import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.domain.UserAccountObsolete;
-import com.wwdz.ch.db.domain.UserAccountObsoleteExample;
-
-@Service
-public class DtsAccountService {
-	private static final Logger logger = LoggerFactory.getLogger(DtsAccountService.class);
-
-	public static final long TWO_MONTH_DAYS = 60;//近两个月,60天
-
-	public static final long ONE_WEEK_DAYS = 7;//近一周
-
-	@Resource
-	private UserAccountObsoleteMapper userAccountMapper;
-
-	@Resource
-	private AccountTraceObsoleteMapper accountTraceMapper;
-
-	@Resource
-	private UserMapper userMapper;
-
-	public UserAccountObsolete findShareUserAccountByUserId(Integer shareUserId) {
-
-		UserAccountObsoleteExample example = new UserAccountObsoleteExample();
-		example.or().andUserIdEqualTo(shareUserId);
-		List<UserAccountObsolete> accounts = userAccountMapper.selectByExample(example);
-		// Assert.state(accounts.size() < 2, "同一个用户存在两个账户");
-		if (accounts.size() == 1) {
-			return accounts.get(0);
-		} else {
-			logger.error("根据代理用户id：{},获取账号信息出错!!!",shareUserId);
-			return null;
-		}
-	}
-
-	private String getRandomNum(Integer num) {
-		String base = "0123456789";
-		Random random = new Random();
-		StringBuffer sb = new StringBuffer();
-		for (int i = 0; i < num; i++) {
-			int number = random.nextInt(base.length());
-			sb.append(base.charAt(number));
-		}
-		return sb.toString();
-	}
-
-	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = { Exception.class })
-	public void settleApplyTrace(Integer sharedUserId, String startTime,String endTime,Integer type, BigDecimal toSettleMoney,String mobile) {
-		
-		Integer settlementRate = 5;
-		// 获取用户账户信息并更新记录
-		UserAccountObsolete account = this.findShareUserAccountByUserId(sharedUserId);
-		if (account != null && toSettleMoney.compareTo(new BigDecimal("0")) == 0) {// 如果该用户未产生推荐单，则降低结算比例
-			settlementRate = account.getSettlementRate() > 8 ? 8 : account.getSettlementRate();
-		}
-		
-		//更新代理用户账号信息
-		account.setRemainAmount(account.getRemainAmount().add(toSettleMoney));//剩余结算,尚未结算给用户
-		account.setTotalAmount(account.getTotalAmount().add(toSettleMoney));
-		account.setModifyTime(LocalDateTime.now());
-		account.setSettlementRate(settlementRate);
-		userAccountMapper.updateByPrimaryKeySelective(account);
-		
-		// 新增账户跟踪表，添加结算跟踪记录
-		AccountTraceObsolete trace = new AccountTraceObsolete();
-		trace.setAmount(account.getRemainAmount());//当前申请金额，直接将未结算的进行申请
-		trace.setTotalAmount(account.getTotalAmount());//已提现总金额
-		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
-		String now = df.format(LocalDate.now());
-		String traceSn = now + getRandomNum(6);
-		trace.setTraceSn(traceSn);
-		trace.setAddTime(LocalDateTime.now());
-		trace.setType(type);
-		trace.setUserId(sharedUserId);
-		trace.setStatus((byte) 0);//申请状态
-		trace.setMobile(mobile);
-		accountTraceMapper.insert(trace);
-	}
-
-	public List<AccountTraceObsolete> queryAccountTraceList(Integer userId, Integer page, Integer size) {
-		AccountTraceObsoleteExample example = new AccountTraceObsoleteExample();
-		example.setOrderByClause(AccountTraceObsolete.Column.addTime.desc());
-		AccountTraceObsoleteExample.Criteria criteria = example.or();
-		criteria.andUserIdEqualTo(userId);
-		PageHelper.startPage(page, size);
-		return accountTraceMapper.selectByExample(example);
-	}
-
-	/**
-	 * 新增申请提现记录
-	 * 
-	 * @param userId
-	 * @param applyAmt
-	 */
-	public void addExtractRecord(Integer userId, BigDecimal applyAmt, String mobile, String smsCode,
-			BigDecimal hasAmount) {
-		AccountTraceObsolete record = new AccountTraceObsolete();
-		record.setAmount(applyAmt);
-		record.setMobile(mobile);
-		record.setTotalAmount(applyAmt.add(hasAmount));
-		record.setSmsCode(smsCode);
-
-		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
-		String now = df.format(LocalDate.now());
-		String traceSn = now + getRandomNum(6);
-		record.setTraceSn(traceSn);
-
-		record.setAddTime(LocalDateTime.now());
-		record.setType(1);// 申请中..
-		record.setUserId(userId);
-		accountTraceMapper.insert(record);
-	}
-
-	public void add(UserAccountObsolete userAccount) {
-		userAccount.setCreateTime(LocalDateTime.now());
-		userAccount.setModifyTime(LocalDateTime.now());
-		userAccountMapper.insert(userAccount);
-	}
-
-	/**
-	 * 根据账号和状态，查询提现记录
-	 * @param userId 
-	 * @param types
-	 * @return
-	 */
-	public List<AccountTraceObsolete> getAccountTraceList(Integer userId, Byte... types) {
-		if(userId == null || types == null || types.length < 1) {
-			return null;
-		}
-		AccountTraceObsoleteExample example = new AccountTraceObsoleteExample();
-		List<Byte> statusList = new ArrayList<Byte>();
-		for (Byte type : types) {
-			statusList.add(type);
-		}
-		example.or().andUserIdEqualTo(userId).andStatusIn(statusList);
-		return accountTraceMapper.selectByExample(example);
-	}
-
-	public List<AccountTraceObsolete> querySelectiveTrace(List<User> userList, List<Byte> status, Integer page,
-														  Integer size, String sort, String order) {
-		//是否有匹配到的用户,转用户id集合
-		List<Integer> userIdArray = null;
-		if (userList != null && userList.size() > 0) {
-			userIdArray = new ArrayList<Integer>();
-			for (User dtsUser : userList) {
-				userIdArray.add(dtsUser.getId().intValue()) ;
-			}
-		}
-		
-		AccountTraceObsoleteExample example = new AccountTraceObsoleteExample();
-		AccountTraceObsoleteExample.Criteria criteria = example.or();
-		
-		if (userIdArray != null && userIdArray.size() != 0) {
-			criteria.andUserIdIn(userIdArray);
-		}
-		if (status != null && status.size() != 0) {
-			criteria.andStatusIn(status);
-		}
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
-			example.setOrderByClause(sort + " " + order);
-		}
-		
-		PageHelper.startPage(page, size);
-		return accountTraceMapper.selectByExample(example);
-		
-	}
-
-	/**
-	 * 为资金账户的安全，建议做线下销账处理，处理后执行该逻辑
-	 * 这里只根据记录做状态调整和审批意见记录
-	 * @param traceId
-	 * @param status
-	 * @param traceMsg
-	 * @return
-	 */
-	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = { Exception.class })
-	public boolean approveAccountTrace(Integer traceId, Byte status, String traceMsg) {
-		
-		AccountTraceObsolete trace = accountTraceMapper.selectByPrimaryKey(traceId);
-		trace.setStatus(status);
-		trace.setTraceMsg(traceMsg);
-		if (status.intValue() == 1) {//如果是审批通过，需要消除账户中的可提现余额
-			UserAccountObsolete userAccount = findShareUserAccountByUserId(trace.getUserId());
-			if (userAccount != null) {
-				userAccount.setRemainAmount(userAccount.getRemainAmount().subtract(trace.getAmount()));
-				logger.info("提现审批通过,调整账户可提现余额为{} - {} = {}",userAccount.getRemainAmount(),trace.getAmount(),userAccount.getRemainAmount().subtract(trace.getAmount()));
-				if(userAccountMapper.updateByPrimaryKeySelective(userAccount) == 0) {
-					return false;
-				}
-			} else {
-				logger.error("审批提现，获取账号出错！请检查对应用户 userId:{} 的账户",trace.getUserId());
-				return false;
-			}
-		}
-		if (accountTraceMapper.updateByPrimaryKeySelective(trace) == 0) {
-			return false;
-		}
-		return true;
-	}
-	
-}
+package com.wwdz.ch.db.impl.dts;
+
+import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.dao.dts.DtsAccountDao;
+import com.wwdz.ch.db.domain.*;
+import com.wwdz.ch.db.mapper.AccountTraceObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
+import com.wwdz.ch.db.mapper.UserMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+@Repository
+public class DtsAccountDaoImpl implements DtsAccountDao {
+	private static final Logger logger = LoggerFactory.getLogger(DtsAccountDaoImpl.class);
+
+	public static final long TWO_MONTH_DAYS = 60;//近两个月,60天
+
+	public static final long ONE_WEEK_DAYS = 7;//近一周
+
+	@Resource
+	private UserAccountObsoleteMapper userAccountMapper;
+
+	@Resource
+	private AccountTraceObsoleteMapper accountTraceMapper;
+
+	@Resource
+	private UserMapper userMapper;
+
+	@Override
+	public UserAccountObsolete findShareUserAccountByUserId(Integer shareUserId) {
+
+		UserAccountObsoleteExample example = new UserAccountObsoleteExample();
+		example.or().andUserIdEqualTo(shareUserId);
+		List<UserAccountObsolete> accounts = userAccountMapper.selectByExample(example);
+		// Assert.state(accounts.size() < 2, "同一个用户存在两个账户");
+		if (accounts.size() == 1) {
+			return accounts.get(0);
+		} else {
+			logger.error("根据代理用户id：{},获取账号信息出错!!!",shareUserId);
+			return null;
+		}
+	}
+
+	private String getRandomNum(Integer num) {
+		String base = "0123456789";
+		Random random = new Random();
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < num; i++) {
+			int number = random.nextInt(base.length());
+			sb.append(base.charAt(number));
+		}
+		return sb.toString();
+	}
+	@Override
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = { Exception.class })
+	public void settleApplyTrace(Integer sharedUserId, String startTime,String endTime,Integer type, BigDecimal toSettleMoney,String mobile) {
+		
+		Integer settlementRate = 5;
+		// 获取用户账户信息并更新记录
+		UserAccountObsolete account = this.findShareUserAccountByUserId(sharedUserId);
+		if (account != null && toSettleMoney.compareTo(new BigDecimal("0")) == 0) {// 如果该用户未产生推荐单，则降低结算比例
+			settlementRate = account.getSettlementRate() > 8 ? 8 : account.getSettlementRate();
+		}
+		
+		//更新代理用户账号信息
+		account.setRemainAmount(account.getRemainAmount().add(toSettleMoney));//剩余结算,尚未结算给用户
+		account.setTotalAmount(account.getTotalAmount().add(toSettleMoney));
+		account.setModifyTime(LocalDateTime.now());
+		account.setSettlementRate(settlementRate);
+		userAccountMapper.updateByPrimaryKeySelective(account);
+		
+		// 新增账户跟踪表，添加结算跟踪记录
+		AccountTraceObsolete trace = new AccountTraceObsolete();
+		trace.setAmount(account.getRemainAmount());//当前申请金额，直接将未结算的进行申请
+		trace.setTotalAmount(account.getTotalAmount());//已提现总金额
+		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
+		String now = df.format(LocalDate.now());
+		String traceSn = now + getRandomNum(6);
+		trace.setTraceSn(traceSn);
+		trace.setAddTime(LocalDateTime.now());
+		trace.setType(type);
+		trace.setUserId(sharedUserId);
+		trace.setStatus((byte) 0);//申请状态
+		trace.setMobile(mobile);
+		accountTraceMapper.insert(trace);
+	}
+
+	@Override
+	public List<AccountTraceObsolete> queryAccountTraceList(Integer userId, Integer page, Integer size) {
+		AccountTraceObsoleteExample example = new AccountTraceObsoleteExample();
+		example.setOrderByClause(AccountTraceObsolete.Column.addTime.desc());
+		AccountTraceObsoleteExample.Criteria criteria = example.or();
+		criteria.andUserIdEqualTo(userId);
+		PageHelper.startPage(page, size);
+		return accountTraceMapper.selectByExample(example);
+	}
+
+	/**
+	 * 新增申请提现记录
+	 * 
+	 * @param userId
+	 * @param applyAmt
+	 */
+	@Override
+	public void addExtractRecord(Integer userId, BigDecimal applyAmt, String mobile, String smsCode,
+			BigDecimal hasAmount) {
+		AccountTraceObsolete record = new AccountTraceObsolete();
+		record.setAmount(applyAmt);
+		record.setMobile(mobile);
+		record.setTotalAmount(applyAmt.add(hasAmount));
+		record.setSmsCode(smsCode);
+
+		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
+		String now = df.format(LocalDate.now());
+		String traceSn = now + getRandomNum(6);
+		record.setTraceSn(traceSn);
+
+		record.setAddTime(LocalDateTime.now());
+		record.setType(1);// 申请中..
+		record.setUserId(userId);
+		accountTraceMapper.insert(record);
+	}
+
+	@Override
+	public void add(UserAccountObsolete userAccount) {
+		userAccount.setCreateTime(LocalDateTime.now());
+		userAccount.setModifyTime(LocalDateTime.now());
+		userAccountMapper.insert(userAccount);
+	}
+
+	/**
+	 * 根据账号和状态，查询提现记录
+	 * @param userId 
+	 * @param types
+	 * @return
+	 */
+	@Override
+	public List<AccountTraceObsolete> getAccountTraceList(Integer userId, Byte... types) {
+		if(userId == null || types == null || types.length < 1) {
+			return null;
+		}
+		AccountTraceObsoleteExample example = new AccountTraceObsoleteExample();
+		List<Byte> statusList = new ArrayList<Byte>();
+		for (Byte type : types) {
+			statusList.add(type);
+		}
+		example.or().andUserIdEqualTo(userId).andStatusIn(statusList);
+		return accountTraceMapper.selectByExample(example);
+	}
+
+	@Override
+	public List<AccountTraceObsolete> querySelectiveTrace(List<User> userList, List<Byte> status, Integer page,
+														  Integer size, String sort, String order) {
+		//是否有匹配到的用户,转用户id集合
+		List<Integer> userIdArray = null;
+		if (userList != null && userList.size() > 0) {
+			userIdArray = new ArrayList<Integer>();
+			for (User dtsUser : userList) {
+				userIdArray.add(dtsUser.getId().intValue()) ;
+			}
+		}
+		
+		AccountTraceObsoleteExample example = new AccountTraceObsoleteExample();
+		AccountTraceObsoleteExample.Criteria criteria = example.or();
+		
+		if (userIdArray != null && userIdArray.size() != 0) {
+			criteria.andUserIdIn(userIdArray);
+		}
+		if (status != null && status.size() != 0) {
+			criteria.andStatusIn(status);
+		}
+		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
+			example.setOrderByClause(sort + " " + order);
+		}
+		
+		PageHelper.startPage(page, size);
+		return accountTraceMapper.selectByExample(example);
+		
+	}
+
+	/**
+	 * 为资金账户的安全，建议做线下销账处理，处理后执行该逻辑
+	 * 这里只根据记录做状态调整和审批意见记录
+	 * @param traceId
+	 * @param status
+	 * @param traceMsg
+	 * @return
+	 */
+	@Override
+	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = { Exception.class })
+	public boolean approveAccountTrace(Integer traceId, Byte status, String traceMsg) {
+		
+		AccountTraceObsolete trace = accountTraceMapper.selectByPrimaryKey(traceId);
+		trace.setStatus(status);
+		trace.setTraceMsg(traceMsg);
+		if (status.intValue() == 1) {//如果是审批通过，需要消除账户中的可提现余额
+			UserAccountObsolete userAccount = findShareUserAccountByUserId(trace.getUserId());
+			if (userAccount != null) {
+				userAccount.setRemainAmount(userAccount.getRemainAmount().subtract(trace.getAmount()));
+				logger.info("提现审批通过,调整账户可提现余额为{} - {} = {}",userAccount.getRemainAmount(),trace.getAmount(),userAccount.getRemainAmount().subtract(trace.getAmount()));
+				if(userAccountMapper.updateByPrimaryKeySelective(userAccount) == 0) {
+					return false;
+				}
+			} else {
+				logger.error("审批提现，获取账号出错！请检查对应用户 userId:{} 的账户",trace.getUserId());
+				return false;
+			}
+		}
+		if (accountTraceMapper.updateByPrimaryKeySelective(trace) == 0) {
+			return false;
+		}
+		return true;
+	}
+	
+}

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsAdminService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsAdminDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.AdminMapper;
+import com.wwdz.ch.db.dao.dts.DtsAdminDao;
 import com.wwdz.ch.db.domain.Admin;
-import com.wwdz.ch.db.domain.AdminExample;
 import com.wwdz.ch.db.domain.Admin.Column;
+import com.wwdz.ch.db.domain.AdminExample;
+import com.wwdz.ch.db.mapper.AdminMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsAdminService {
+public class DtsAdminDaoImpl implements DtsAdminDao {
 	private final Column[] result = new Column[] { Column.id, Column.username, Column.avatar, Column.roleIds };
 	@Resource
 	private AdminMapper adminMapper;
 
+	@Override
 	public List<Admin> findAdmin(String username) {
 		AdminExample example = new AdminExample();
 		example.or().andUsernameEqualTo(username).andDeletedEqualTo(false);
 		return adminMapper.selectByExample(example);
 	}
 
+	@Override
 	public Admin findAdmin(Integer id) {
 		return adminMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
 	public List<Admin> querySelective(String username, Integer page, Integer limit, String sort, String order) {
 		AdminExample example = new AdminExample();
 		AdminExample.Criteria criteria = example.createCriteria();
@@ -44,25 +49,30 @@ public class DtsAdminService {
 		return adminMapper.selectByExampleSelective(example, result);
 	}
 
+	@Override
 	public int updateById(Admin admin) {
 		admin.setUpdateTime(LocalDateTime.now());
 		return adminMapper.updateByPrimaryKeySelective(admin);
 	}
 
+	@Override
 	public void deleteById(Integer id) {
 		adminMapper.logicalDeleteByPrimaryKey(id);
 	}
 
+	@Override
 	public void add(Admin admin) {
 		admin.setAddTime(LocalDateTime.now());
 		admin.setUpdateTime(LocalDateTime.now());
 		adminMapper.insertSelective(admin);
 	}
 
+	@Override
 	public Admin findById(Integer id) {
 		return adminMapper.selectByPrimaryKeySelective(id, result);
 	}
 
+	@Override
 	public List<Admin> allAdmin() {
 		AdminExample example = new AdminExample();
 		example.or().andDeletedEqualTo(false);

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsCollectService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsCollectDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.CollectObsoleteMapper;
+import com.wwdz.ch.db.dao.dts.DtsCollectDao;
 import com.wwdz.ch.db.domain.CollectObsolete;
 import com.wwdz.ch.db.domain.CollectObsoleteExample;
-
+import com.wwdz.ch.db.mapper.CollectObsoleteMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
-
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsCollectService {
+public class DtsCollectDaoImpl implements DtsCollectDao {
 	@Resource
 	private CollectObsoleteMapper collectMapper;
 
+	@Override
 	public int count(Long uid, Long gid) {
 		CollectObsoleteExample example = new CollectObsoleteExample();
 		example.or().andUserIdEqualTo(uid).andValueIdEqualTo(gid).andDeletedEqualTo(false);
 		return (int) collectMapper.countByExample(example);
 	}
 
+	@Override
 	public List<CollectObsolete> queryByType(Long userId, Byte type, Integer page, Integer size) {
 		CollectObsoleteExample example = new CollectObsoleteExample();
 		example.or().andUserIdEqualTo(userId).andTypeEqualTo(type).andDeletedEqualTo(false);
@@ -31,30 +32,35 @@ public class DtsCollectService {
 		return collectMapper.selectByExample(example);
 	}
 
+	@Override
 	public int countByType(Long userId, Byte type) {
 		CollectObsoleteExample example = new CollectObsoleteExample();
 		example.or().andUserIdEqualTo(userId).andTypeEqualTo(type).andDeletedEqualTo(false);
 		return (int) collectMapper.countByExample(example);
 	}
 
+	@Override
 	public CollectObsolete queryByTypeAndValue(Long userId, Byte type, Long valueId) {
 		CollectObsoleteExample example = new CollectObsoleteExample();
 		example.or().andUserIdEqualTo(userId).andValueIdEqualTo(valueId).andTypeEqualTo(type).andDeletedEqualTo(false);
 		return collectMapper.selectOneByExample(example);
 	}
 
+	@Override
 	public void deleteById(Long id) {
 		collectMapper.logicalDeleteByPrimaryKey(id);
 	}
 
+	@Override
 	public int add(CollectObsolete collect) {
 		collect.setAddTime(LocalDateTime.now());
 		collect.setUpdateTime(LocalDateTime.now());
 		return collectMapper.insertSelective(collect);
 	}
 
+	@Override
 	public List<CollectObsolete> querySelective(String userId, String valueId, Integer page, Integer size, String sort,
-                                                String order) {
+												String order) {
 		CollectObsoleteExample example = new CollectObsoleteExample();
 		CollectObsoleteExample.Criteria criteria = example.createCriteria();
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsFeedbackService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsFeedbackDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.FeedbackMapper;
+import com.wwdz.ch.db.dao.dts.DtsFeedbackDao;
 import com.wwdz.ch.db.domain.Feedback;
 import com.wwdz.ch.db.domain.FeedbackExample;
-
+import com.wwdz.ch.db.mapper.FeedbackMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -17,18 +17,20 @@ import java.util.List;
  * @date 2017/12/27
  */
 @Service
-public class DtsFeedbackService {
+public class DtsFeedbackDaoImpl implements DtsFeedbackDao {
 	@Autowired
 	private FeedbackMapper feedbackMapper;
 
+	@Override
 	public Integer add(Feedback feedback) {
 		feedback.setAddTime(LocalDateTime.now());
 		feedback.setUpdateTime(LocalDateTime.now());
 		return feedbackMapper.insertSelective(feedback);
 	}
 
+	@Override
 	public List<Feedback> querySelective(Long userId, String username, Integer page, Integer limit, String sort,
-                                         String order) {
+										 String order) {
 		FeedbackExample example = new FeedbackExample();
 		FeedbackExample.Criteria criteria = example.createCriteria();
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsFootprintService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsFootprintDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.dao.dts.DtsFootprintDao;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;
 import com.wwdz.ch.db.mapper.FootprintMapper;
@@ -12,10 +13,11 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class DtsFootprintService {
+public class DtsFootprintDaoImpl implements DtsFootprintDao {
 	@Resource
 	private FootprintMapper footprintMapper;
 
+	@Override
 	public List<Footprint> queryByAddTime(Long userId, Integer page, Integer size) {
 		FootprintExample example = new FootprintExample();
 		example.or().andUserIdEqualTo(userId).andDeletedEqualTo(false);
@@ -24,22 +26,26 @@ public class DtsFootprintService {
 		return footprintMapper.selectByExample(example);
 	}
 
+	@Override
 	public Footprint findById(Long id) {
 		return footprintMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
 	public void deleteById(Long id) {
 		footprintMapper.logicalDeleteByPrimaryKey(id);
 	}
 
+	@Override
 	public void add(Footprint footprint) {
 		footprint.setAddTime(new Date());
 		footprint.setUpdateTime(new Date());
 		footprintMapper.insertSelective(footprint);
 	}
 
+	@Override
 	public List<Footprint> querySelective(String userId, String coinsId, Integer page, Integer size, String sort,
-                                          String order) {
+										  String order) {
 		FootprintExample example = new FootprintExample();
 		FootprintExample.Criteria criteria = example.createCriteria();
 

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsGoodsAttributeService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsGoodsAttributeDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
-import org.springframework.stereotype.Service;
-
-import com.wwdz.ch.db.mapper.GoodsAttributeObsoleteMapper;
+import com.wwdz.ch.db.dao.dts.DtsGoodsAttributeDao;
 import com.wwdz.ch.db.domain.GoodsAttributeObsolete;
 import com.wwdz.ch.db.domain.GoodsAttributeObsoleteExample;
+import com.wwdz.ch.db.mapper.GoodsAttributeObsoleteMapper;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsGoodsAttributeService {
+public class DtsGoodsAttributeDaoImpl implements DtsGoodsAttributeDao {
 	@Resource
 	private GoodsAttributeObsoleteMapper goodsAttributeMapper;
 
+	@Override
 	public List<GoodsAttributeObsolete> queryByGid(Integer goodsId) {
 		GoodsAttributeObsoleteExample example = new GoodsAttributeObsoleteExample();
 		example.or().andGoodsIdEqualTo(goodsId).andDeletedEqualTo(false);
 		return goodsAttributeMapper.selectByExample(example);
 	}
 
+	@Override
 	public void add(GoodsAttributeObsolete goodsAttribute) {
 		goodsAttribute.setAddTime(LocalDateTime.now());
 		goodsAttribute.setUpdateTime(LocalDateTime.now());
 		goodsAttributeMapper.insertSelective(goodsAttribute);
 	}
 
+	@Override
 	public GoodsAttributeObsolete findById(Integer id) {
 		return goodsAttributeMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
 	public void deleteByGid(Integer gid) {
 		GoodsAttributeObsoleteExample example = new GoodsAttributeObsoleteExample();
 		example.or().andGoodsIdEqualTo(gid);

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsGoodsProductService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsGoodsProductDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
-import java.time.LocalDateTime;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.wwdz.ch.db.mapper.ex.GoodsProductMapper;
-import com.wwdz.ch.db.mapper.GoodsProductObsoleteMapper;
+import com.wwdz.ch.db.dao.dts.DtsGoodsProductDao;
 import com.wwdz.ch.db.domain.GoodsProductObsolete;
 import com.wwdz.ch.db.domain.GoodsProductObsoleteExample;
+import com.wwdz.ch.db.mapper.GoodsProductObsoleteMapper;
+import com.wwdz.ch.db.mapper.ex.GoodsProductMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Service
-public class DtsGoodsProductService {
+public class DtsGoodsProductDaoImpl implements DtsGoodsProductDao {
 	@Resource
 	private GoodsProductObsoleteMapper dtsGoodsProductMapper;
 	@Resource
 	private GoodsProductMapper goodsProductMapper;
 
-	public List<GoodsProductObsolete> queryByGid(Integer gid) {
+	@Override
+    public List<GoodsProductObsolete> queryByGid(Integer gid) {
 		GoodsProductObsoleteExample example = new GoodsProductObsoleteExample();
 		example.or().andGoodsIdEqualTo(gid).andDeletedEqualTo(false);
 		return dtsGoodsProductMapper.selectByExample(example);
 	}
 
-	public GoodsProductObsolete findById(Integer id) {
+	@Override
+    public GoodsProductObsolete findById(Integer id) {
 		return dtsGoodsProductMapper.selectByPrimaryKey(id);
 	}
 
-	public void deleteById(Integer id) {
+	@Override
+    public void deleteById(Integer id) {
 		dtsGoodsProductMapper.logicalDeleteByPrimaryKey(id);
 	}
 
-	public void add(GoodsProductObsolete goodsProduct) {
+	@Override
+    public void add(GoodsProductObsolete goodsProduct) {
 		goodsProduct.setAddTime(LocalDateTime.now());
 		goodsProduct.setUpdateTime(LocalDateTime.now());
 		dtsGoodsProductMapper.insertSelective(goodsProduct);
 	}
 
-	public int count() {
+	@Override
+    public int count() {
 		GoodsProductObsoleteExample example = new GoodsProductObsoleteExample();
 		example.or().andDeletedEqualTo(false);
 		return (int) dtsGoodsProductMapper.countByExample(example);
 	}
 
-	public void deleteByGid(Integer gid) {
+	@Override
+    public void deleteByGid(Integer gid) {
 		GoodsProductObsoleteExample example = new GoodsProductObsoleteExample();
 		example.or().andGoodsIdEqualTo(gid);
 		dtsGoodsProductMapper.logicalDeleteByExample(example);
 	}
 
-	public int addStock(Integer id, Short num) {
+	@Override
+    public int addStock(Integer id, Short num) {
 		return goodsProductMapper.addStock(id, num);
 	}
 
-	public int addBrowse(Integer id, Short num) {
+	@Override
+    public int addBrowse(Integer id, Short num) {
 		return goodsProductMapper.addBrowse(id, num);// 新增商品流量量
 	}
 
-	public int reduceStock(Integer id, Integer goodsId, Short num) {
+	@Override
+    public int reduceStock(Integer id, Integer goodsId, Short num) {
 		goodsProductMapper.addSales(goodsId, num);// 每次需将商品的销售量加下
 		return goodsProductMapper.reduceStock(id, num);
 	}

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsGoodsSpecificationService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsGoodsSpecificationDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
+import com.wwdz.ch.db.dao.dts.DtsGoodsSpecificationDao;
+import com.wwdz.ch.db.domain.GoodsSpecificationObsolete;
+import com.wwdz.ch.db.domain.GoodsSpecificationObsoleteExample;
+import com.wwdz.ch.db.mapper.GoodsSpecificationObsoleteMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.wwdz.ch.db.mapper.GoodsSpecificationObsoleteMapper;
-import com.wwdz.ch.db.domain.GoodsSpecificationObsolete;
-import com.wwdz.ch.db.domain.GoodsSpecificationObsoleteExample;
-
 @Service
-public class DtsGoodsSpecificationService {
+public class DtsGoodsSpecificationDaoImpl implements DtsGoodsSpecificationDao {
 	@Resource
 	private GoodsSpecificationObsoleteMapper goodsSpecificationMapper;
 
-	public List<GoodsSpecificationObsolete> queryByGid(Integer id) {
+	@Override
+    public List<GoodsSpecificationObsolete> queryByGid(Integer id) {
 		GoodsSpecificationObsoleteExample example = new GoodsSpecificationObsoleteExample();
 		example.or().andGoodsIdEqualTo(id).andDeletedEqualTo(false);
 		return goodsSpecificationMapper.selectByExample(example);
 	}
 
-	public GoodsSpecificationObsolete findById(Integer id) {
+	@Override
+    public GoodsSpecificationObsolete findById(Integer id) {
 		return goodsSpecificationMapper.selectByPrimaryKey(id);
 	}
 
-	public void deleteByGid(Integer gid) {
+	@Override
+    public void deleteByGid(Integer gid) {
 		GoodsSpecificationObsoleteExample example = new GoodsSpecificationObsoleteExample();
 		example.or().andGoodsIdEqualTo(gid);
 		goodsSpecificationMapper.logicalDeleteByExample(example);
 	}
 
-	public void add(GoodsSpecificationObsolete goodsSpecification) {
+	@Override
+    public void add(GoodsSpecificationObsolete goodsSpecification) {
 		goodsSpecification.setAddTime(LocalDateTime.now());
 		goodsSpecification.setUpdateTime(LocalDateTime.now());
 		goodsSpecificationMapper.insertSelective(goodsSpecification);
@@ -47,7 +50,8 @@ public class DtsGoodsSpecificationService {
 	 * @param id
 	 * @return
 	 */
-	public Object getSpecificationVoList(Integer id) {
+	@Override
+    public Object getSpecificationVoList(Integer id) {
 		List<GoodsSpecificationObsolete> goodsSpecificationList = queryByGid(id);
 
 		Map<String, VO> map = new HashMap<>();

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsIssueService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsIssueDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.IssueMapper;
+import com.wwdz.ch.db.dao.dts.DtsIssueDao;
 import com.wwdz.ch.db.domain.Issue;
 import com.wwdz.ch.db.domain.IssueExample;
-
+import com.wwdz.ch.db.mapper.IssueMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -13,27 +13,31 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsIssueService {
+public class DtsIssueDaoImpl implements DtsIssueDao {
 	@Resource
 	private IssueMapper issueMapper;
 
-	public List<Issue> query() {
+	@Override
+    public List<Issue> query() {
 		IssueExample example = new IssueExample();
 		example.or().andDeletedEqualTo(false);
 		return issueMapper.selectByExample(example);
 	}
 
-	public void deleteById(Integer id) {
+	@Override
+    public void deleteById(Integer id) {
 		issueMapper.logicalDeleteByPrimaryKey(id);
 	}
 
-	public void add(Issue issue) {
+	@Override
+    public void add(Issue issue) {
 		issue.setAddTime(LocalDateTime.now());
 		issue.setUpdateTime(LocalDateTime.now());
 		issueMapper.insertSelective(issue);
 	}
 
-	public List<Issue> querySelective(String question, Integer page, Integer size, String sort, String order) {
+	@Override
+    public List<Issue> querySelective(String question, Integer page, Integer size, String sort, String order) {
 		IssueExample example = new IssueExample();
 		IssueExample.Criteria criteria = example.createCriteria();
 
@@ -50,12 +54,14 @@ public class DtsIssueService {
 		return issueMapper.selectByExample(example);
 	}
 
-	public int updateById(Issue issue) {
+	@Override
+    public int updateById(Issue issue) {
 		issue.setUpdateTime(LocalDateTime.now());
 		return issueMapper.updateByPrimaryKeySelective(issue);
 	}
 
-	public Issue findById(Integer id) {
+	@Override
+    public Issue findById(Integer id) {
 		return issueMapper.selectByPrimaryKey(id);
 	}
 }

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsKeywordService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsKeywordDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.KeywordMapper;
+import com.wwdz.ch.db.dao.dts.DtsKeywordDao;
 import com.wwdz.ch.db.domain.Keyword;
 import com.wwdz.ch.db.domain.KeywordExample;
-
+import com.wwdz.ch.db.mapper.KeywordMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -13,23 +13,26 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsKeywordService {
+public class DtsKeywordDaoImpl implements DtsKeywordDao {
 	@Resource
 	private KeywordMapper keywordsMapper;
 
-	public Keyword queryDefault() {
+	@Override
+    public Keyword queryDefault() {
 		KeywordExample example = new KeywordExample();
 		example.or().andIsDefaultEqualTo(true).andDeletedEqualTo(false);
 		return keywordsMapper.selectOneByExample(example);
 	}
 
-	public List<Keyword> queryHots() {
+	@Override
+    public List<Keyword> queryHots() {
 		KeywordExample example = new KeywordExample();
 		example.or().andIsHotEqualTo(true).andDeletedEqualTo(false);
 		return keywordsMapper.selectByExample(example);
 	}
 
-	public List<Keyword> queryByKeyword(String keyword, Integer page, Integer size) {
+	@Override
+    public List<Keyword> queryByKeyword(String keyword, Integer page, Integer size) {
 		KeywordExample example = new KeywordExample();
 		example.setDistinct(true);
 		example.or().andKeywordLike("%" + keyword + "%").andDeletedEqualTo(false);
@@ -37,7 +40,8 @@ public class DtsKeywordService {
 		return keywordsMapper.selectByExampleSelective(example, Keyword.Column.keyword);
 	}
 
-	public List<Keyword> querySelective(String keyword, String url, Integer page, Integer limit, String sort,
+	@Override
+    public List<Keyword> querySelective(String keyword, String url, Integer page, Integer limit, String sort,
                                         String order) {
 		KeywordExample example = new KeywordExample();
 		KeywordExample.Criteria criteria = example.createCriteria();
@@ -58,22 +62,26 @@ public class DtsKeywordService {
 		return keywordsMapper.selectByExample(example);
 	}
 
-	public void add(Keyword keywords) {
+	@Override
+    public void add(Keyword keywords) {
 		keywords.setAddTime(LocalDateTime.now());
 		keywords.setUpdateTime(LocalDateTime.now());
 		keywordsMapper.insertSelective(keywords);
 	}
 
-	public Keyword findById(Integer id) {
+	@Override
+    public Keyword findById(Integer id) {
 		return keywordsMapper.selectByPrimaryKey(id);
 	}
 
-	public int updateById(Keyword keywords) {
+	@Override
+    public int updateById(Keyword keywords) {
 		keywords.setUpdateTime(LocalDateTime.now());
 		return keywordsMapper.updateByPrimaryKeySelective(keywords);
 	}
 
-	public void deleteById(Integer id) {
+	@Override
+    public void deleteById(Integer id) {
 		keywordsMapper.logicalDeleteByPrimaryKey(id);
 	}
 }

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsPermissionService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsPermissionDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
+import com.wwdz.ch.db.dao.dts.DtsPermissionDao;
+import com.wwdz.ch.db.domain.Permission;
+import com.wwdz.ch.db.domain.PermissionExample;
+import com.wwdz.ch.db.mapper.PermissionMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
-import com.wwdz.ch.db.mapper.PermissionMapper;
-import com.wwdz.ch.db.domain.Permission;
-import com.wwdz.ch.db.domain.PermissionExample;
-
 @Service
-public class DtsPermissionService {
+public class DtsPermissionDaoImpl implements DtsPermissionDao {
 	@Resource
 	private PermissionMapper permissionMapper;
 
-	public Set<String> queryByRoleIds(Integer[] roleIds) {
+	@Override
+    public Set<String> queryByRoleIds(Integer[] roleIds) {
 		Set<String> permissions = new HashSet<String>();
 		if (roleIds.length == 0) {
 			return permissions;
@@ -36,7 +36,8 @@ public class DtsPermissionService {
 		return permissions;
 	}
 
-	public Set<String> queryByRoleId(Integer roleId) {
+	@Override
+    public Set<String> queryByRoleId(Integer roleId) {
 		Set<String> permissions = new HashSet<String>();
 		if (roleId == null) {
 			return permissions;
@@ -53,7 +54,8 @@ public class DtsPermissionService {
 		return permissions;
 	}
 
-	public boolean checkSuperPermission(Integer roleId) {
+	@Override
+    public boolean checkSuperPermission(Integer roleId) {
 		if (roleId == null) {
 			return false;
 		}
@@ -63,13 +65,15 @@ public class DtsPermissionService {
 		return permissionMapper.countByExample(example) != 0;
 	}
 
-	public void deleteByRoleId(Integer roleId) {
+	@Override
+    public void deleteByRoleId(Integer roleId) {
 		PermissionExample example = new PermissionExample();
 		example.or().andRoleIdEqualTo(roleId).andDeletedEqualTo(false);
 		permissionMapper.logicalDeleteByExample(example);
 	}
 
-	public void add(Permission DtsPermission) {
+	@Override
+    public void add(Permission DtsPermission) {
 		DtsPermission.setAddTime(LocalDateTime.now());
 		DtsPermission.setUpdateTime(LocalDateTime.now());
 		permissionMapper.insertSelective(DtsPermission);

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsRoleService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsRoleDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.alibaba.druid.util.StringUtils;
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.RoleMapper;
+import com.wwdz.ch.db.dao.dts.DtsRoleDao;
 import com.wwdz.ch.db.domain.Role;
 import com.wwdz.ch.db.domain.RoleExample;
-
+import com.wwdz.ch.db.mapper.RoleMapper;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.Arrays;
@@ -15,11 +16,12 @@ import java.util.List;
 import java.util.Set;
 
 @Service
-public class DtsRoleService {
+public class DtsRoleDaoImpl implements DtsRoleDao {
 	@Resource
 	private RoleMapper roleMapper;
 
-	public Set<String> queryByIds(Integer[] roleIds) {
+	@Override
+    public Set<String> queryByIds(Integer[] roleIds) {
 		Set<String> roles = new HashSet<String>();
 		if (roleIds.length == 0) {
 			return roles;
@@ -37,7 +39,8 @@ public class DtsRoleService {
 
 	}
 
-	public List<Role> querySelective(String roleName, Integer page, Integer size, String sort, String order) {
+	@Override
+    public List<Role> querySelective(String roleName, Integer page, Integer size, String sort, String order) {
 		RoleExample example = new RoleExample();
 		RoleExample.Criteria criteria = example.createCriteria();
 
@@ -54,32 +57,38 @@ public class DtsRoleService {
 		return roleMapper.selectByExample(example);
 	}
 
-	public Role findById(Integer id) {
+	@Override
+    public Role findById(Integer id) {
 		return roleMapper.selectByPrimaryKey(id);
 	}
 
-	public void add(Role role) {
+	@Override
+    public void add(Role role) {
 		role.setAddTime(LocalDateTime.now());
 		role.setUpdateTime(LocalDateTime.now());
 		roleMapper.insertSelective(role);
 	}
 
-	public void deleteById(Integer id) {
+	@Override
+    public void deleteById(Integer id) {
 		roleMapper.logicalDeleteByPrimaryKey(id);
 	}
 
-	public void updateById(Role role) {
+	@Override
+    public void updateById(Role role) {
 		role.setUpdateTime(LocalDateTime.now());
 		roleMapper.updateByPrimaryKeySelective(role);
 	}
 
-	public boolean checkExist(String name) {
+	@Override
+    public boolean checkExist(String name) {
 		RoleExample example = new RoleExample();
 		example.or().andNameEqualTo(name).andDeletedEqualTo(false);
 		return roleMapper.countByExample(example) != 0;
 	}
 
-	public List<Role> queryAll() {
+	@Override
+    public List<Role> queryAll() {
 		RoleExample example = new RoleExample();
 		example.or().andDeletedEqualTo(false);
 		return roleMapper.selectByExample(example);

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsSearchHistoryService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsSearchHistoryDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.SearchHistoryMapper;
+import com.wwdz.ch.db.dao.dts.DtsSearchHistoryDao;
 import com.wwdz.ch.db.domain.SearchHistory;
 import com.wwdz.ch.db.domain.SearchHistoryExample;
-
+import com.wwdz.ch.db.mapper.SearchHistoryMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
@@ -13,30 +13,34 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsSearchHistoryService {
+public class DtsSearchHistoryDaoImpl implements DtsSearchHistoryDao {
 	@Resource
 	private SearchHistoryMapper searchHistoryMapper;
 
-	public void save(SearchHistory searchHistory) {
+	@Override
+    public void save(SearchHistory searchHistory) {
 		searchHistory.setAddTime(LocalDateTime.now());
 		searchHistory.setUpdateTime(LocalDateTime.now());
 		searchHistoryMapper.insertSelective(searchHistory);
 	}
 
-	public List<SearchHistory> queryByUid(Long uid) {
+	@Override
+    public List<SearchHistory> queryByUid(Long uid) {
 		SearchHistoryExample example = new SearchHistoryExample();
 		example.or().andUserIdEqualTo(uid).andDeletedEqualTo(false);
 		example.setDistinct(true);
 		return searchHistoryMapper.selectByExampleSelective(example, SearchHistory.Column.keyword);
 	}
 
-	public void deleteByUid(Long uid) {
+	@Override
+    public void deleteByUid(Long uid) {
 		SearchHistoryExample example = new SearchHistoryExample();
 		example.or().andUserIdEqualTo(uid);
 		searchHistoryMapper.logicalDeleteByExample(example);
 	}
 
-	public List<SearchHistory> querySelective(String userId, String keyword, Integer page, Integer size, String sort,
+	@Override
+    public List<SearchHistory> querySelective(String userId, String keyword, Integer page, Integer size, String sort,
                                               String order) {
 		SearchHistoryExample example = new SearchHistoryExample();
 		SearchHistoryExample.Criteria criteria = example.createCriteria();

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsStorageService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsStorageDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.StorageMapper;
+import com.wwdz.ch.db.dao.dts.DtsStorageDao;
 import com.wwdz.ch.db.domain.Storage;
 import com.wwdz.ch.db.domain.StorageExample;
-
+import com.wwdz.ch.db.mapper.StorageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -13,38 +13,44 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-public class DtsStorageService {
+public class DtsStorageDaoImpl implements DtsStorageDao {
 	@Autowired
 	private StorageMapper storageMapper;
 
-	public void deleteByKey(String key) {
+	@Override
+    public void deleteByKey(String key) {
 		StorageExample example = new StorageExample();
 		example.or().andKeyEqualTo(key);
 		storageMapper.logicalDeleteByExample(example);
 	}
 
-	public void add(Storage storageInfo) {
+	@Override
+    public void add(Storage storageInfo) {
 		storageInfo.setAddTime(LocalDateTime.now());
 		storageInfo.setUpdateTime(LocalDateTime.now());
 		storageMapper.insertSelective(storageInfo);
 	}
 
-	public Storage findByKey(String key) {
+	@Override
+    public Storage findByKey(String key) {
 		StorageExample example = new StorageExample();
 		example.or().andKeyEqualTo(key).andDeletedEqualTo(false);
 		return storageMapper.selectOneByExample(example);
 	}
 
-	public int update(Storage storageInfo) {
+	@Override
+    public int update(Storage storageInfo) {
 		storageInfo.setUpdateTime(LocalDateTime.now());
 		return storageMapper.updateByPrimaryKeySelective(storageInfo);
 	}
 
-	public Storage findById(Integer id) {
+	@Override
+    public Storage findById(Integer id) {
 		return storageMapper.selectByPrimaryKey(id);
 	}
 
-	public List<Storage> querySelective(String key, String name, Integer page, Integer limit, String sort,
+	@Override
+    public List<Storage> querySelective(String key, String name, Integer page, Integer limit, String sort,
                                         String order) {
 		StorageExample example = new StorageExample();
 		StorageExample.Criteria criteria = example.createCriteria();

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsSystemConfigService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsSystemConfigDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
-import org.springframework.stereotype.Service;
-
-import com.wwdz.ch.db.mapper.SystemMapper;
+import com.wwdz.ch.db.dao.dts.DtsSystemConfigDao;
 import com.wwdz.ch.db.domain.System;
 import com.wwdz.ch.db.domain.SystemExample;
+import com.wwdz.ch.db.mapper.SystemMapper;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class DtsSystemConfigService {
+public class DtsSystemConfigDaoImpl implements DtsSystemConfigDao {
 	@Resource
 	private SystemMapper systemMapper;
 
-	public List<System> queryAll() {
+	@Override
+    public List<System> queryAll() {
 		SystemExample example = new SystemExample();
 		example.or();
 		return systemMapper.selectByExample(example);

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsUserService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsUserDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
 import com.github.pagehelper.PageHelper;
 import com.wwdz.ch.db.bean.DayStatis;
+import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserExample;
 import com.wwdz.ch.db.domain.UserVo;
@@ -16,7 +17,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
-public class DtsUserService {
+public class DtsUserDaoImpl implements DtsUserDao {
 	
 	@Resource
 	private UserMapper userMapper;
@@ -27,11 +28,13 @@ public class DtsUserService {
 	@Resource
 	private StatMapper statMapper;
 
-	public User findById(Long userId) {
+	@Override
+    public User findById(Long userId) {
 		return userMapper.selectByPrimaryKey(userId);
 	}
 
-	public UserVo findUserVoById(Long userId) {
+	@Override
+    public UserVo findUserVoById(Long userId) {
 		User user = findById(userId);
 		UserVo userVo = new UserVo();
 		userVo.setNickname(user.getNickname());
@@ -39,24 +42,28 @@ public class DtsUserService {
 		return userVo;
 	}
 
-	public User queryByOid(String openId) {
+	@Override
+    public User queryByOid(String openId) {
 		UserExample example = new UserExample();
 		example.or().andWeixinOpenidEqualTo(openId).andDeletedEqualTo(false);
 		return userMapper.selectOneByExample(example);
 	}
 
-	public void add(User user) {
+	@Override
+    public void add(User user) {
 		user.setAddTime(new Date());
 		user.setUpdateTime(new Date());
 		userMapper.insertSelective(user);
 	}
 
-	public int updateById(User user) {
+	@Override
+    public int updateById(User user) {
 		user.setUpdateTime(new Date());
 		return userMapper.updateByPrimaryKeySelective(user);
 	}
 
-	public List<User> querySelective(String username, String mobile, Integer page, Integer size, String sort,
+	@Override
+    public List<User> querySelective(String username, String mobile, Integer page, Integer size, String sort,
                                      String order) {
 		UserExample example = new UserExample();
 		UserExample.Criteria criteria = example.createCriteria();
@@ -77,44 +84,51 @@ public class DtsUserService {
 		return userMapper.selectByExample(example);
 	}
 
-	public int count() {
+	@Override
+    public int count() {
 		UserExample example = new UserExample();
 		example.or().andDeletedEqualTo(false);
 
 		return (int) userMapper.countByExample(example);
 	}
 
-	public List<User> queryByUsername(String username) {
+	@Override
+    public List<User> queryByUsername(String username) {
 		UserExample example = new UserExample();
 		example.or().andUsernameEqualTo(username).andDeletedEqualTo(false);
 		return userMapper.selectByExample(example);
 	}
 
-	public boolean checkByUsername(String username) {
+	@Override
+    public boolean checkByUsername(String username) {
 		UserExample example = new UserExample();
 		example.or().andUsernameEqualTo(username).andDeletedEqualTo(false);
 		return userMapper.countByExample(example) != 0;
 	}
 
-	public List<User> queryByMobile(String mobile) {
+	@Override
+    public List<User> queryByMobile(String mobile) {
 		UserExample example = new UserExample();
 		example.or().andMobileEqualTo(mobile).andDeletedEqualTo(false);
 		return userMapper.selectByExample(example);
 	}
 
-	public List<User> queryByOpenid(String openid) {
+	@Override
+    public List<User> queryByOpenid(String openid) {
 		UserExample example = new UserExample();
 		example.or().andWeixinOpenidEqualTo(openid).andDeletedEqualTo(false);
 		return userMapper.selectByExample(example);
 	}
 
-	public void deleteById(Long id) {
+	@Override
+    public void deleteById(Long id) {
 		userMapper.logicalDeleteByPrimaryKey(id);
 	}
 
 
 
-	public List<DayStatis> recentCount(int statisDaysRang) {
+	@Override
+    public List<DayStatis> recentCount(int statisDaysRang) {
 		return statMapper.statisIncreaseUserCnt(statisDaysRang);
 	}
 }

ch-dao/src/main/java/com/wwdz/ch/db/service/DtsUserFormIdService.java → ch-dao/src/main/java/com/wwdz/ch/db/impl/dts/DtsUserFormIdDaoImpl.java

-package com.wwdz.ch.db.service;
+package com.wwdz.ch.db.impl.dts;
 
-import org.springframework.stereotype.Service;
-
-import com.wwdz.ch.db.mapper.UserFormidObsoleteMapper;
+import com.wwdz.ch.db.dao.dts.DtsUserFormIdDao;
 import com.wwdz.ch.db.domain.UserFormidObsolete;
 import com.wwdz.ch.db.domain.UserFormidObsoleteExample;
+import com.wwdz.ch.db.mapper.UserFormidObsoleteMapper;
+import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 
 @Service
-public class DtsUserFormIdService {
+public class DtsUserFormIdDaoImpl implements DtsUserFormIdDao {
 	@Resource
 	private UserFormidObsoleteMapper formidMapper;
 
@@ -20,7 +20,8 @@ public class DtsUserFormIdService {
 	 * @param openId
 	 * @return
 	 */
-	public UserFormidObsolete queryByOpenId(String openId) {
+	@Override
+    public UserFormidObsolete queryByOpenId(String openId) {
 		UserFormidObsoleteExample example = new UserFormidObsoleteExample();
 		// 符合找到该用户记录，且可用次数大于1，且还未过期
 		example.or().andOpenidEqualTo(openId).andExpireTimeGreaterThan(LocalDateTime.now());
@@ -32,7 +33,8 @@ public class DtsUserFormIdService {
 	 *
 	 * @param userFormid
 	 */
-	public int updateUserFormId(UserFormidObsolete userFormid) {
+	@Override
+    public int updateUserFormId(UserFormidObsolete userFormid) {
 		// 更新或者删除缓存
 		if (userFormid.getIsprepay() && userFormid.getUseamount() > 1) {
 			userFormid.setUseamount(userFormid.getUseamount() - 1);
@@ -48,7 +50,8 @@ public class DtsUserFormIdService {
 	 *
 	 * @param userFormid
 	 */
-	public void addUserFormid(UserFormidObsolete userFormid) {
+	@Override
+    public void addUserFormid(UserFormidObsolete userFormid) {
 		userFormid.setAddTime(LocalDateTime.now());
 		userFormid.setUpdateTime(LocalDateTime.now());
 		formidMapper.insertSelective(userFormid);

ch-dao/src/main/java/com/wwdz/ch/db/service/ItemService.java

-package com.wwdz.ch.db.service;
-
-import com.github.pagehelper.PageHelper;
-import com.wwdz.ch.db.mapper.ItemMapper;
-import com.wwdz.ch.db.domain.*;
-
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@Service
-public class ItemService {
-
-	@Resource
-	private ItemMapper itemMapper;
-
-	/**
-	 * 获取分类下的商品
-	 *
-	 * @param catList
-	 * @param offset
-	 * @param limit
-	 * @return
-	 */
-	public List<Item> queryByCategories(List<Integer> catList, int offset, int limit) {
-		ItemExample example = new ItemExample();
-		example.or().andCidIn(catList).andIsOnSaleEqualTo(true).andIsDeletedEqualTo(false);
-		example.setOrderByClause("sort  asc");
-		PageHelper.startPage(offset, limit);
-
-		return itemMapper.selectByExample(example);
-	}
-
-	/**
-	 * 获取分类下的商品
-	 *
-	 * @param catId
-	 * @param offset
-	 * @param limit
-	 * @return
-	 */
-	public List<Item> queryByCategory(Integer catId, int offset, int limit) {
-		ItemExample example = new ItemExample();
-		example.or().andCidEqualTo(catId).andIsOnSaleEqualTo(true).andIsDeletedEqualTo(false);
-		example.setOrderByClause("created desc");
-		PageHelper.startPage(offset, limit);
-
-		return itemMapper.selectByExample(example);
-	}
-
-	public List<Item> querySelective(Integer catId, String keywords,
-									 Integer offset, Integer limit, String sort, String order) {
-		ItemExample example = new ItemExample();
-		ItemExample.Criteria criteria1 = example.or();
-
-		if (!StringUtils.isEmpty(catId) && catId != 0) {
-			criteria1.andCidEqualTo(catId);
-		}
-		if (!StringUtils.isEmpty(keywords)) {
-			criteria1.andNameLike("%" + keywords + "%");
-		}
-//		criteria1.andIsOnSaleEqualTo(true);
-		criteria1.andIsDeletedEqualTo(false);
-
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
-			example.setOrderByClause(sort + " " + order);
-		}
-
-		PageHelper.startPage(offset, limit);
-
-		return itemMapper.selectByExampleWithBLOBs(example);
-	}
-
-	public List<Item> querySelective(String name, Integer page, Integer size, String sort,
-									 String order) {
-		ItemExample example = new ItemExample();
-		ItemExample.Criteria criteria = example.createCriteria();
-
-		if (!StringUtils.isEmpty(name)) {
-			criteria.andNameLike("%" + name + "%");
-		}
-		criteria.andIsDeletedEqualTo(false);
-
-		if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
-			example.setOrderByClause(sort + " " + order);
-		}
-
-		PageHelper.startPage(page, size);
-		return itemMapper.selectByExampleWithBLOBs(example);
-	}
-
-	/**
-	 * 获取某个商品信息,包含完整信息
-	 *
-	 * @param id
-	 * @return
-	 */
-	public Item findById(Long id) {
-		ItemExample example = new ItemExample();
-		example.or().andIdEqualTo(id).andIsDeletedEqualTo(false);
-		return itemMapper.selectOneByExampleWithBLOBs(example);
-	}
-
-
-	/**
-	 * 获取所有在售物品总数
-	 *
-	 * @return
-	 */
-	public Integer queryOnSale() {
-		ItemExample example = new ItemExample();
-		example.or().andIsOnSaleEqualTo(true).andIsDeletedEqualTo(false);
-		return (int) itemMapper.countByExample(example);
-	}
-
-	public int updateById(Item item) {
-		item.setUpdateTime(new Date());
-		return itemMapper.updateByPrimaryKeyWithBLOBs(item);
-	}
-
-	public void deleteById(Long id) {
-	//	itemMapper.logicalDeleteByPrimaryKey(id);
-	}
-
-	public void add(Item item) {
-		Date now = new Date();
-		item.setCreateTime(now);
-		item.setUpdateTime(now);
-		itemMapper.insertSelective(item);
-	}
-
-	/**
-	 * 获取所有物品总数，包括在售的和下架的，但是不包括已删除的商品
-	 *
-	 * @return
-	 */
-	public int count() {
-		ItemExample example = new ItemExample();
-		example.or().andIsDeletedEqualTo(false);
-		return (int) itemMapper.countByExample(example);
-	}
-
-}

ch-dao/src/test/java/com/wwdz/ch/dao/MapperReturnTest.java

 package com.wwdz.ch.dao;
 
+import com.wwdz.ch.db.mapper.SystemMapper;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
-
-import com.wwdz.ch.db.dao.SystemMapper;
 import com.wwdz.ch.db.domain.System;
+import javax.annotation.Resource;
 
 @WebAppConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
 public class MapperReturnTest {
 
-    @Autowired
+    @Resource
     private SystemMapper systemMapper;
 
     @Test

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/CategoryServiceImpl.java

 package com.wwdz.ch.wx.impl;
 
 import com.wwdz.ch.core.type.Result;
-import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.CategoryDao;
 import com.wwdz.ch.wx.entity.request.CategoryRequestDto;
 import com.wwdz.ch.wx.service.CategoryService;
 import org.slf4j.Logger;
@@ -13,13 +13,13 @@ import org.springframework.stereotype.Service;
 public class CategoryServiceImpl implements CategoryService {
     private static final Logger logger = LoggerFactory.getLogger(CategoryServiceImpl.class);
     @Autowired
-    private CategoryManager categoryManager;
+    private CategoryDao categoryDao;
 
     @Override
     public Result top(CategoryRequestDto dto) {
         try {
             logger.info("【请求结束】查询分类类目成功");
-            return Result.success(categoryManager.queryByLevel(dto.getLevel(), dto.getPage(), dto.getSize()));
+            return Result.success(categoryDao.queryByLevel(dto.getLevel(), dto.getPage(), dto.getSize()));
         } catch (Exception e) {
             logger.error("查询分类类目失败", e);
             return Result.failed("查询分类类目失败");
@@ -30,7 +30,7 @@ public class CategoryServiceImpl implements CategoryService {
     public Result child(CategoryRequestDto dto) {
         try {
             logger.info("【请求结束】查询子类目成功");
-            return Result.success(categoryManager.queryByPid(dto.getId()));
+            return Result.success(categoryDao.queryByPid(dto.getId()));
         } catch (Exception e) {
             logger.error("查询子类目失败", e);
             return Result.failed("查询子类目失败");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

@@ -4,7 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.FavoritesDao;
 import com.wwdz.ch.db.dao.FavoritesItemsRelationDao;
-import com.wwdz.ch.db.dao.ItemManager;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.dao.UserItemsRelationDao;
 import com.wwdz.ch.db.domain.Favorites;
 import com.wwdz.ch.db.domain.FavoritesItemsRelation;
@@ -38,7 +38,7 @@ public class FavoritesServiceImpl implements FavoritesService {
     @Autowired
     private UserItemsRelationDao userItemsRelationDao;
     @Autowired
-    private ItemManager itemManager;
+    private ItemDao itemDao;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -185,7 +185,7 @@ public class FavoritesServiceImpl implements FavoritesService {
             List<AgentTranceResponseVo> list = new ArrayList<>();
             for (FavoritesItemsRelation relation : relationPage.getList()) {
                 ItemResponseVo vo = new ItemResponseVo();
-                Item item = itemManager.findDetails(relation.getItemId());
+                Item item = itemDao.findDetails(relation.getItemId());
                 vo.setId(relation.getItemId());
                 vo.setName(item.getName());
                 vo.setImages(item.getImages());
@@ -245,7 +245,7 @@ public class FavoritesServiceImpl implements FavoritesService {
                             .filter(usersItemsIds::contains).collect(Collectors.toList());
                     CoinRequestDto coinRequestDto = new CoinRequestDto();
                     coinRequestDto.setIds(itemIds);
-                    itemManager.deleteUserItems(coinRequestDto);
+                    itemDao.deleteUserItems(coinRequestDto);
                 }
             }
 
@@ -275,7 +275,7 @@ public class FavoritesServiceImpl implements FavoritesService {
                         .filter(usersItemsIds::contains).collect(Collectors.toList());
                 CoinRequestDto coinRequestDto = new CoinRequestDto();
                 coinRequestDto.setIds(itemIds);
-                itemManager.deleteUserItems(coinRequestDto);
+                itemDao.deleteUserItems(coinRequestDto);
             }
 
             // 删除收藏册和钱币的关联

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FootPrintServiceImpl.java

@@ -3,7 +3,7 @@ package com.wwdz.ch.wx.impl;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.FavoritesItemsRelationDao;
 import com.wwdz.ch.db.dao.FootPrintDao;
-import com.wwdz.ch.db.dao.ItemManager;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
@@ -28,7 +28,7 @@ public class FootPrintServiceImpl implements FootPrintService {
     @Autowired
     private FootPrintDao footPrintDao;
     @Autowired
-    private ItemManager itemManager;
+    private ItemDao itemDao;
     @Autowired
     private FavoritesItemsRelationDao favoritesItemsRelationDao;
 
@@ -64,7 +64,7 @@ public class FootPrintServiceImpl implements FootPrintService {
             List<ItemResponseVo> weekList = new ArrayList<>();
             List<ItemResponseVo> monthList = new ArrayList<>();
             for (Footprint footprint : list) {
-                Item item = itemManager.findDetails(footprint.getItemId());
+                Item item = itemDao.findDetails(footprint.getItemId());
                 ItemResponseVo itemResponseVo = new ItemResponseVo();
                 itemResponseVo.setId(footprint.getId());
                 itemResponseVo.setItemId(item.getId());
@@ -151,7 +151,7 @@ public class FootPrintServiceImpl implements FootPrintService {
             List<ItemResponseVo> weekList = new ArrayList<>();
             List<ItemResponseVo> monthList = new ArrayList<>();
             for (Footprint footprint : list) {
-                Item item = itemManager.findDetails(footprint.getItemId());
+                Item item = itemDao.findDetails(footprint.getItemId());
                 ItemResponseVo itemResponseVo = new ItemResponseVo();
                 itemResponseVo.setId(footprint.getId());
                 itemResponseVo.setItemId(item.getId());

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -3,9 +3,9 @@ package com.wwdz.ch.wx.impl;
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.core.type.Result;
-import com.wwdz.ch.db.dao.CategoryManager;
+import com.wwdz.ch.db.dao.CategoryDao;
 import com.wwdz.ch.db.dao.FavoritesItemsRelationDao;
-import com.wwdz.ch.db.dao.ItemManager;
+import com.wwdz.ch.db.dao.ItemDao;
 import com.wwdz.ch.db.dao.UserItemsRelationDao;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.FavoritesItemsRelation;
@@ -30,13 +30,13 @@ import java.util.*;
 public class ItemServiceImpl implements ItemService {
     private static final Logger logger = LoggerFactory.getLogger(ItemServiceImpl.class);
     @Autowired
-    private ItemManager itemManager;
+    private ItemDao itemDao;
     @Autowired
     private UserItemsRelationDao userItemsRelationDao;
     @Autowired
     private FavoritesItemsRelationDao favoritesItemsRelationDao;
     @Autowired
-    private CategoryManager categoryManager;
+    private CategoryDao categoryDao;
 
 
     @Override
@@ -45,7 +45,7 @@ public class ItemServiceImpl implements ItemService {
             CoinRequestDto coinRequestDto = new CoinRequestDto();
             coinRequestDto.setPage(dto.getPage());
             coinRequestDto.setLimit(dto.getSize());
-            PageInfo<Item> page = itemManager.findByPage(coinRequestDto);
+            PageInfo<Item> page = itemDao.findByPage(coinRequestDto);
             PageInfo<AgentTranceResponseVo> result = new PageInfo<>();
             result.setPageNum(page.getPageNum());
             result.setPageSize(page.getPageSize());
@@ -104,7 +104,7 @@ public class ItemServiceImpl implements ItemService {
             item.setUpdateTime(now);
             item.setSourceType(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode());
             item.setIsDeleted(false);
-            itemManager.insert(item);
+            itemDao.insert(item);
 
             // 新增用户和藏品关联记录
             UserItemsRelation userItemsRelation = new UserItemsRelation();
@@ -129,7 +129,7 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result info(ItemRequestDto dto) {
         try {
-            Item item = itemManager.findDetails(dto.getId());
+            Item item = itemDao.findDetails(dto.getId());
             if (null == item.getId()) {
                 return Result.failed("数据异常，该藏品不存在");
             }
@@ -139,7 +139,7 @@ public class ItemServiceImpl implements ItemService {
             itemResponseVo.setImages(item.getImages());
             itemResponseVo.setDetail(item.getDetail());
             itemResponseVo.setCid(item.getCid());
-            Category category = categoryManager.findById(item.getCid());
+            Category category = categoryDao.findById(item.getCid());
             if (Objects.nonNull(category)) {
                 itemResponseVo.setCategoryName(category.getName());
             }
@@ -165,7 +165,7 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result collect(ItemRequestDto dto) {
         try {
-            Item item = itemManager.findDetails(dto.getId());
+            Item item = itemDao.findDetails(dto.getId());
             if (null == item.getId()) {
                 return Result.failed("数据异常，该藏品不存在");
             }
@@ -178,7 +178,7 @@ public class ItemServiceImpl implements ItemService {
             item.setUpdateTime(now);
             item.setSourceType(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode());
             item.setIsDeleted(false);
-            itemManager.update(item);
+            itemDao.update(item);
 
             // 删除藏品和原收藏册关联
             List<Long> itemIds = new ArrayList<>();
@@ -201,7 +201,7 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result update(ItemRequestDto dto) {
         try {
-            Item item = itemManager.findDetails(dto.getId());
+            Item item = itemDao.findDetails(dto.getId());
             if (null == item.getId()) {
                 return Result.failed("数据异常，该藏品不存在");
             }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserInfoService.java

@@ -6,12 +6,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
 import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.service.DtsUserService;
 
 @Service
 public class UserInfoService {
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao userService;
 
 	public UserInfo getInfo(Long userId) {
 		User user = userService.findById(userId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/UgcCoinController.java

@@ -3,7 +3,7 @@ package com.wwdz.ch.wx.web;
 import com.wwdz.ch.core.type.ListResult;
 import com.wwdz.ch.core.type.SimpleResult;
 import com.wwdz.ch.db.domain.*;
-import com.wwdz.ch.db.service.UgcCoinService;
+import com.wwdz.ch.db.dao.UgcCoinDao;
 import com.wwdz.ch.wx.annotation.LoginUser;
 import com.wwdz.ch.wx.dao.UgcCoinVo;
 import io.swagger.annotations.Api;
@@ -28,7 +28,7 @@ public class UgcCoinController {
     private static final Logger logger = LoggerFactory.getLogger(UgcCoinController.class);
 
     @Autowired
-    private UgcCoinService ugcCoinService;
+    private UgcCoinDao ugcCoinDao;
 
     //    @RequiresPermissions("admin:category:list")
 //    @RequiresPermissionsDesc(menu = { "商场管理", "成交记录管理" }, button = "查询")
@@ -36,9 +36,9 @@ public class UgcCoinController {
     @ApiOperation(value = "钱币列表")
     public ListResult<UgcCoinVo> list(@LoginUser Long userId, @ApiParam("page") @RequestParam(defaultValue = "1") Integer page,
                                       @ApiParam("size") @RequestParam(defaultValue = "10") Integer size) {
-        List<UgcCoinWithBLOBs> coins = ugcCoinService.queryByUserId(userId, page, size);
+        List<UgcCoinWithBLOBs> coins = ugcCoinDao.queryByUserId(userId, page, size);
         List<UgcCoinVo> data = coins.parallelStream().map(a -> new UgcCoinVo(a)).collect(Collectors.toList());
-        Long total = ugcCoinService.countByUserId(userId);
+        Long total = ugcCoinDao.countByUserId(userId);
         return new ListResult<>(data, total.intValue());
     }
 
@@ -59,7 +59,7 @@ public class UgcCoinController {
     public SimpleResult<UgcCoinVo> detail(@LoginUser Long userId, @NotNull Long id) {
         logger.info("【请求开始】钱币详情,请求参数,userId:{},id:{}", userId, id);
         // 商品信息
-        UgcCoinWithBLOBs rawCoin = ugcCoinService.getById(id);
+        UgcCoinWithBLOBs rawCoin = ugcCoinDao.getById(id);
 
         if (null == rawCoin) {
             return new SimpleResult<>("钱币不存在",null);
@@ -73,7 +73,7 @@ public class UgcCoinController {
         coin.setUid(userId);
         UgcCoinWithBLOBs cb = coin.toDO();
         cb.setIsDeleted(false);
-        ugcCoinService.add(cb);
+        ugcCoinDao.add(cb);
         return new SimpleResult<>(true);
     }
 
@@ -83,7 +83,7 @@ public class UgcCoinController {
         coin.setUid(userId);
         UgcCoinWithBLOBs cb = coin.toDO();
         cb.setIsDeleted(false);
-        ugcCoinService.updateById(cb);
+        ugcCoinDao.updateById(cb);
         return new SimpleResult<>(true);
     }
 
@@ -91,7 +91,7 @@ public class UgcCoinController {
     @GetMapping("/delete")
     @ApiOperation(value = "删除钱币")
     public SimpleResult<Boolean> delete(@ApiParam("钱币ID") @NotNull Long id) {
-        ugcCoinService.deleteById(id);
+        ugcCoinDao.deleteById(id);
         return new SimpleResult<>(true);
     }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxAuthController.java

@@ -15,8 +15,8 @@ import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.RegexUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder;
+import com.wwdz.ch.db.dao.dts.DtsUserDao;
 import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.service.DtsUserService;
 import com.wwdz.ch.wx.annotation.LoginUser;
 import com.wwdz.ch.wx.dao.UserInfo;
 import com.wwdz.ch.wx.dao.UserToken;
@@ -53,7 +53,7 @@ public class WxAuthController {
 	private static final Logger logger = LoggerFactory.getLogger(WxAuthController.class);
 
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao dtsUserDao;
 
 	@Autowired
 	private WxMaService wxService;
@@ -84,7 +84,7 @@ public class WxAuthController {
 			return ResponseUtil.badArgument();
 		}
 
-		List<User> userList = userService.queryByUsername(username);
+		List<User> userList = dtsUserDao.queryByUsername(username);
 		User user = null;
 		if (userList.size() > 1) {
 			logger.error("账户登录 出现多个同名用户错误,用户名:{},用户数量:{}", username, userList.size());
@@ -173,7 +173,7 @@ public class WxAuthController {
 			return ResponseUtil.fail();
 		}
 
-		User user = userService.queryByOid(openId);
+		User user = dtsUserDao.queryByOid(openId);
 		
 		if (user == null) {
 			user = new User();
@@ -189,12 +189,12 @@ public class WxAuthController {
 			user.setLastLoginIp(IpUtil.client(request));
 			user.setShareUserId(shareUserId);
 
-			userService.add(user);
+			dtsUserDao.add(user);
 
 		} else {
 			user.setLastLoginTime(new Date());
 			user.setLastLoginIp(IpUtil.client(request));
-			if (userService.updateById(user) == 0) {
+			if (dtsUserDao.updateById(user) == 0) {
 				return ResponseUtil.updatedDataFailed();
 			}
 		}
@@ -299,13 +299,13 @@ public class WxAuthController {
 			return ResponseUtil.badArgument();
 		}
 
-		List<User> userList = userService.queryByUsername(username);
+		List<User> userList = dtsUserDao.queryByUsername(username);
 		if (userList.size() > 0) {
 			logger.error("请求账号注册出错:{}", WxResponseCode.AUTH_NAME_REGISTERED.desc());
 			return WxResponseUtil.fail(WxResponseCode.AUTH_NAME_REGISTERED);
 		}
 
-		userList = userService.queryByMobile(mobile);
+		userList = dtsUserDao.queryByMobile(mobile);
 		if (userList.size() > 0) {
 			logger.error("请求账号注册出错:{}", WxResponseCode.AUTH_MOBILE_REGISTERED.desc());
 			return WxResponseUtil.fail(WxResponseCode.AUTH_MOBILE_REGISTERED);
@@ -330,7 +330,7 @@ public class WxAuthController {
 			e.printStackTrace();
 			return WxResponseUtil.fail(WxResponseCode.AUTH_OPENID_UNACCESS);
 		}
-		userList = userService.queryByOpenid(openId);
+		userList = dtsUserDao.queryByOpenid(openId);
 		if (userList.size() > 1) {
 			return ResponseUtil.serious();
 		}
@@ -359,7 +359,7 @@ public class WxAuthController {
 		user.setStatus((byte) 0);
 		user.setLastLoginTime(new Date());
 		user.setLastLoginIp(IpUtil.client(request));
-		userService.add(user);
+		dtsUserDao.add(user);
 
 		// userInfo
 		UserInfo userInfo = new UserInfo();
@@ -414,7 +414,7 @@ public class WxAuthController {
 			return WxResponseUtil.fail(WxResponseCode.AUTH_CAPTCHA_UNMATCH);
 		}
 
-		List<User> userList = userService.queryByMobile(mobile);
+		List<User> userList = dtsUserDao.queryByMobile(mobile);
 
 		User user = null;
 		if (userList.size() > 1) {
@@ -431,7 +431,7 @@ public class WxAuthController {
 		String encodedPassword = encoder.encode(password);
 		user.setPassword(encodedPassword);
 
-		if (userService.updateById(user) == 0) {
+		if (dtsUserDao.updateById(user) == 0) {
 			logger.error("账号密码重置更新用户信息出错,id：{}", user.getId());
 			return ResponseUtil.updatedDataFailed();
 		}
@@ -463,9 +463,9 @@ public class WxAuthController {
 			return ResponseUtil.fail();
 		}
 		String phone = phoneNumberInfo.getPhoneNumber();
-		User user = userService.findById(userId);
+		User user = dtsUserDao.findById(userId);
 		user.setMobile(phone);
-		if (userService.updateById(user) == 0) {
+		if (dtsUserDao.updateById(user) == 0) {
 			logger.error("绑定手机号码,更新用户信息出错,id：{}", user.getId());
 			return ResponseUtil.updatedDataFailed();
 		}

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxCatalogController.java

@@ -7,8 +7,8 @@ import java.util.Map;
 
 import javax.validation.constraints.NotNull;
 
+import com.wwdz.ch.db.impl.CategoryDaoImpl;
 import com.wwdz.ch.db.domain.Category;
-import com.wwdz.ch.db.dao.impl.CategoryManagerImpl;
 import com.wwdz.ch.wx.service.HomeCacheManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ public class WxCatalogController {
 	private static final Logger logger = LoggerFactory.getLogger(WxCatalogController.class);
 
 	@Autowired
-	private CategoryManagerImpl categoryManager;
+	private CategoryDaoImpl categoryManager;
 
 	/**
 	 * 分类详情

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxCollectController.java

@@ -25,8 +25,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.CollectObsolete;
-import com.wwdz.ch.db.service.DtsCollectService;
-import com.wwdz.ch.db.service.ItemService;
 
 /**
  * 用户收藏服务
@@ -38,9 +36,9 @@ public class WxCollectController {
 	private static final Logger logger = LoggerFactory.getLogger(WxCollectController.class);
 
 	@Autowired
-	private DtsCollectService collectService;
+	private DtsCollectDao collectService;
 	@Autowired
-	private ItemService itemService;
+	private ItemOldDao itemService;
 
 	/**
 	 * 用户收藏列表

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxFeedbackController.java

@@ -16,8 +16,6 @@ import com.wwdz.ch.core.util.RegexUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.Feedback;
 import com.wwdz.ch.db.domain.User;
-import com.wwdz.ch.db.service.DtsFeedbackService;
-import com.wwdz.ch.db.service.DtsUserService;
 
 /**
  * 意见反馈服务
@@ -33,9 +31,9 @@ public class WxFeedbackController {
 	private static final Logger logger = LoggerFactory.getLogger(WxFeedbackController.class);
 
 	@Autowired
-	private DtsFeedbackService feedbackService;
+	private DtsFeedbackDao feedbackService;
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao userService;
 
 	private Object validate(Feedback feedback) {
 		String content = feedback.getContent();

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxFootprintController.java

@@ -7,8 +7,6 @@ import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.Item;
-import com.wwdz.ch.db.service.DtsFootprintService;
-import com.wwdz.ch.db.service.ItemService;
 import com.wwdz.ch.wx.annotation.LoginUser;
 import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
 import com.wwdz.ch.wx.service.FootPrintService;
@@ -31,9 +29,9 @@ public class WxFootprintController {
 	private static final Logger logger = LoggerFactory.getLogger(WxFootprintController.class);
 
 	@Autowired
-	private DtsFootprintService footprintService;
+	private DtsFootprintDao footprintService;
 	@Autowired
-	private ItemService itemService;
+	private ItemOldDao itemService;
 	@Autowired
 	private FootPrintService footPrintService;
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxGoodsController.java

@@ -9,12 +9,12 @@ import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.core.util.ZincUtil;
 import com.wwdz.ch.core.validator.Order;
 import com.wwdz.ch.core.validator.Sort;
-import com.wwdz.ch.db.dao.impl.CategoryManagerImpl;
+import com.wwdz.ch.db.dao.dts.*;
+import com.wwdz.ch.db.impl.CategoryDaoImpl;
 import com.wwdz.ch.db.domain.Category;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.SearchHistory;
-import com.wwdz.ch.db.service.*;
 import com.wwdz.ch.wx.annotation.LoginUser;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
@@ -44,34 +44,34 @@ public class WxGoodsController {
 	private static final Logger logger = LoggerFactory.getLogger(WxGoodsController.class);
 
 	@Autowired
-	private ItemService itemService;
+	private ItemOldDao itemService;
 
 	@Autowired
-	private DtsGoodsProductService productService;
+	private DtsGoodsProductDao productService;
 
 	@Autowired
-	private DtsIssueService goodsIssueService;
+	private DtsIssueDao goodsIssueService;
 
 	@Autowired
-	private DtsGoodsAttributeService goodsAttributeService;
+	private DtsGoodsAttributeDao goodsAttributeService;
 
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao userService;
 
 	@Autowired
-	private DtsCollectService collectService;
+	private DtsCollectDao collectService;
 
 	@Autowired
-	private DtsFootprintService footprintService;
+	private DtsFootprintDao footprintService;
 
 	@Autowired
-	private CategoryManagerImpl categoryManager;
+	private CategoryDaoImpl categoryManager;
 
 	@Autowired
-	private DtsSearchHistoryService searchHistoryService;
+	private DtsSearchHistoryDao searchHistoryService;
 
 	@Autowired
-	private DtsGoodsSpecificationService goodsSpecificationService;
+	private DtsGoodsSpecificationDao goodsSpecificationService;
 
 
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxHomeController.java

@@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.validation.constraints.NotNull;
 
-import com.wwdz.ch.db.dao.impl.CategoryManagerImpl;
+import com.wwdz.ch.db.impl.CategoryDaoImpl;
 import com.wwdz.ch.wx.annotation.LoginUser;
 import com.wwdz.ch.wx.service.HomeCacheManager;
 import org.slf4j.Logger;
@@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.ResponseUtil;
-import com.wwdz.ch.db.service.ItemService;
 
 /**
  * 首页服务
@@ -37,11 +36,11 @@ public class WxHomeController {
 	private static final Logger logger = LoggerFactory.getLogger(WxHomeController.class);
 
 	@Autowired
-	private ItemService goodsService;
+	private ItemOldDao goodsService;
 
 
 	@Autowired
-	private CategoryManagerImpl categoryManager;
+	private CategoryDaoImpl categoryManager;
 
 
 	private final static ArrayBlockingQueue<Runnable> WORK_QUEUE = new ArrayBlockingQueue<>(9);

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxSearchController.java

@@ -22,8 +22,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.Keyword;
 import com.wwdz.ch.db.domain.SearchHistory;
-import com.wwdz.ch.db.service.DtsKeywordService;
-import com.wwdz.ch.db.service.DtsSearchHistoryService;
 
 /**
  * 商品搜索服务
@@ -37,9 +35,9 @@ public class WxSearchController {
 	private static final Logger logger = LoggerFactory.getLogger(WxSearchController.class);
 
 	@Autowired
-	private DtsKeywordService keywordsService;
+	private DtsKeywordDao keywordsService;
 	@Autowired
-	private DtsSearchHistoryService searchHistoryService;
+	private DtsSearchHistoryDao searchHistoryService;
 
 	/**
 	 * 搜索页面信息

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxStorageController.java

@@ -30,7 +30,6 @@ import com.wwdz.ch.core.storage.StorageService;
 import com.wwdz.ch.core.util.CharUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.Storage;
-import com.wwdz.ch.db.service.DtsStorageService;
 
 /**
  * 对象存储服务
@@ -46,7 +45,7 @@ public class WxStorageController {
 	private StorageService storageService;
 
 	@Autowired
-	private DtsStorageService DtsStorageService;
+	private DtsStorageDao DtsStorageDao;
 
 	private ExecutorService threadPool = Executors.newFixedThreadPool(20);
 
@@ -60,7 +59,7 @@ public class WxStorageController {
 
 		do {
 			key = CharUtil.getRandomString(20) + suffix;
-			storageInfo = DtsStorageService.findByKey(key);
+			storageInfo = DtsStorageDao.findByKey(key);
 		} while (storageInfo != null);
 
 		return key;
@@ -139,7 +138,7 @@ public class WxStorageController {
 	public ResponseEntity<Resource> fetch(@PathVariable String key) {
 		// logger.info("【请求开始】访问存储对象,请求参数,key:{}", key);
 
-		Storage DtsStorage = DtsStorageService.findByKey(key);
+		Storage DtsStorage = DtsStorageDao.findByKey(key);
 		if (key == null) {
 			return ResponseEntity.notFound().build();
 		}
@@ -167,7 +166,7 @@ public class WxStorageController {
 	@GetMapping("/download/{key:.+}")
 	public ResponseEntity<Resource> download(@PathVariable String key) {
 		// logger.info("【请求开始】访问存储对象,请求参数,key:{}", key);
-		Storage DtsStorage = DtsStorageService.findByKey(key);
+		Storage DtsStorage = DtsStorageDao.findByKey(key);
 		if (key == null) {
 			return ResponseEntity.notFound().build();
 		}

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserController.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.UserAccountObsolete;
-import com.wwdz.ch.db.service.DtsAccountService;
+import com.wwdz.ch.db.dao.dts.DtsAccountDao;
 import com.wwdz.ch.wx.annotation.LoginUser;
 import com.wwdz.ch.wx.constant.CacheCodeConstants;
 import com.wwdz.ch.wx.entity.request.KlDataRequestDto;
@@ -35,7 +35,7 @@ public class WxUserController {
     private static final Logger logger = LoggerFactory.getLogger(WxUserController.class);
 
     @Autowired
-    private DtsAccountService accountService;
+    private DtsAccountDao accountService;
 
     @Autowired
     private UserService userService;

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserFormId.java

@@ -17,8 +17,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserFormidObsolete;
-import com.wwdz.ch.db.service.DtsUserFormIdService;
-import com.wwdz.ch.db.service.DtsUserService;
 
 @RestController
 @RequestMapping("/wx/formid")
@@ -27,10 +25,10 @@ public class WxUserFormId {
 	private static final Logger logger = LoggerFactory.getLogger(WxUserFormId.class);
 
 	@Autowired
-	private DtsUserService userService;
+	private DtsUserDao userService;
 
 	@Autowired
-	private DtsUserFormIdService formIdService;
+	private DtsUserFormIdDao formIdService;
 
 	/**
 	 * 创建微信访问fromID