category

yangfan
1 parent b8edb715
Showing 15 changed files with 273 additions and 40 deletions
src/main/java/com/diligrp/xtrade/product/controllor/CategoryController.java
src/main/java/com/diligrp/xtrade/product/controllor/ShopController.java
src/main/java/com/diligrp/xtrade/product/dao/CategoryDao.java
src/main/java/com/diligrp/xtrade/product/dao/ShopDao.java
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryQueryDto.java
src/main/java/com/diligrp/xtrade/product/domain/dto/ShopDto.java
src/main/java/com/diligrp/xtrade/product/domain/dto/ShopQueryDto.java
src/main/java/com/diligrp/xtrade/product/domain/entity/ShopDo.java
src/main/java/com/diligrp/xtrade/product/service/CategoryService.java
src/main/java/com/diligrp/xtrade/product/service/ShopService.java
src/main/java/com/diligrp/xtrade/product/service/impl/CategoryServiceImpl.java
src/main/java/com/diligrp/xtrade/product/service/impl/ShopServiceImpl.java
src/main/resources/bootstrap.yml
src/main/resources/mapping/com/diligrp/xtrade/product/CategoryDao.xml
src/main/resources/mapping/com/diligrp/xtrade/product/ShopDao.xml
 package com.diligrp.xtrade.product.controllor;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.diligrp.xtrade.product.domain.dto.CategoryDto;
+import com.diligrp.xtrade.product.domain.entity.CategoryDo;
 import com.diligrp.xtrade.product.service.CategoryService;
 import com.diligrp.xtrade.shared.domain.Message;
@@ -16,7 +21,7 @@ import com.diligrp.xtrade.shared.domain.Message;
  * @date 2020年4月20日
  */
 @RestController
-@RequestMapping("category/")
+@RequestMapping("sapi/category/")
 public class CategoryController {
 	@Autowired
@@ -30,8 +35,8 @@ public class CategoryController {
 	 * @return
 	 * @throws
 	 */
-	@RequestMapping("insert")
-	public Message<Object> insert(CategoryDto categoryDTO){
+	@RequestMapping("save")
+	public Message<Object> insert(@Validated @RequestBody CategoryDto categoryDTO){
 		categoryService.insert(categoryDTO);
 		return Message.builder().success();
 	}
@@ -44,7 +49,7 @@ public class CategoryController {
 	 * @throws
 	 */
 	@RequestMapping("update")
-	public Message<Object> update(CategoryDto categoryDTO){
+	public Message<Object> update(@Validated @RequestBody CategoryDto categoryDTO){
 		categoryService.update(categoryDTO);
 		return Message.builder().success();
 	}
@@ -74,4 +79,18 @@ public class CategoryController {
 		categoryService.delectById(id);
 		return Message.builder().success();
 	}
+	
+	/**
+	 * 
+	 * @Title selectCategoryChild
+	 * @Description TODO
+	 * @param id
+	 * @return
+	 * @throws
+	 */
+	@RequestMapping("selectCategoryChild/{cateCode}")
+	public Message<?> selectCategoryChild(@PathVariable String cateCode){
+		List<CategoryDo> categoryDos = categoryService.selectCateChild(cateCode);
+		return Message.builder().success(categoryDos);
+	}
 }
@@ -3,10 +3,13 @@ package com.diligrp.xtrade.product.controllor;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.diligrp.xtrade.product.domain.dto.ShopQueryDto;
 import com.diligrp.xtrade.product.domain.dto.ShopDto;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 import com.diligrp.xtrade.product.service.ShopService;
@@ -34,7 +37,7 @@ public class ShopController {
 	 * @throws
 	 */
 	@RequestMapping("save")
-	public Message<?> save(ShopDto shop){
+	public Message<?> save(@Validated @RequestBody ShopDto shop){
 		shopService.insert(shop);
 		return Message.builder().success();
 	}
@@ -48,7 +51,7 @@ public class ShopController {
 	 * @throws
 	 */
 	@RequestMapping("get/{shopId}")
-	public Message<ShopDo> get(@PathVariable Long shopId){
+	public Message<?> get(@PathVariable Long shopId){
 		return Message.builder().success(shopService.selectByShopId(shopId));
 	}
@@ -65,4 +68,17 @@ public class ShopController {
 		List<ShopDo> shopDos = shopService.selectShopByMerId(merId);
 		return Message.builder().success(shopDos);
 	}
+	
+	/**
+	 * 
+	 * @Title selectShop
+	 * @Description 店铺搜索
+	 * @param shop
+	 * @return
+	 * @throws
+	 */
+	@RequestMapping("selectShop")
+	public Message<?> selectShop(@Validated @RequestBody ShopQueryDto shop){
+		return null;
+	}
 }
 package com.diligrp.xtrade.product.dao;
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
+import com.diligrp.xtrade.product.domain.dto.CategoryQueryDto;
 import com.diligrp.xtrade.product.domain.entity.CategoryDo;
@@ -18,7 +21,26 @@ public interface CategoryDao {
 	void update(CategoryDo category);
-	CategoryDo selectEntityById(Integer id);
+	CategoryDo selectEntityById(Long id);
 	void delect(Long id);
+	
+	/**
+	 * 
+	 * @Title selectList
+	 * @Description 品类条件查询
+	 * @param categoryQueryDto
+	 * @return
+	 * @throws
+	 */
+	List<CategoryDo> selectList(CategoryQueryDto categoryQueryDto);
+	/**
+	 * 
+	 * @Title selectCateChild
+	 * @Description 根据品类编码获取全部下级品类
+	 * @param cateCode 品类编码
+	 * @return
+	 * @throws
+	 */
+	List<CategoryDo> selectCateChild(String cateCode);
 }
@@ -4,6 +4,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
+import com.diligrp.xtrade.product.domain.dto.ShopQueryDto;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 /**
  * 
@@ -22,4 +23,7 @@ public interface ShopDao {
 	ShopDo selectByShopId(Long shopId);
 	List<ShopDo> selectByMerId(Long merId);
+	
+	List<ShopDo> selectShop(ShopQueryDto shopQueryDto);
+	
 }
+package com.diligrp.xtrade.product.domain.dto;
+
+
+/**
+ * @ClassName: CategoryDto
+ * @Description 品类传输
+ * @author yangfan
+ * @date 2020年4月16日
+ */
+public class CategoryQueryDto{
+	
+	/**
+	 * 品类名称
+	 */
+	private String cname;
+	/**
+	 * 拼音缩写
+	 */
+	private String shortName;
+	/**
+	 * 品类状态
+	 */
+	private Integer status;
+
+	/**
+	 * 品类有效期
+	 */
+	private Integer validDay;
+	/**
+	 * 类型
+	 */
+	private Long type;
+	/**
+	 * 品类等级
+	 */
+	private Integer level;
+	
+	private Integer currentPage;
+	
+	public String getCname() {
+		return cname;
+	}
+	public void setCname(String cname) {
+		this.cname = cname;
+	}
+	public String getShortName() {
+		return shortName;
+	}
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getValidDay() {
+		return validDay;
+	}
+	public void setValidDay(Integer validDay) {
+		this.validDay = validDay;
+	}
+	public Long getType() {
+		return type;
+	}
+	public void setType(Long type) {
+		this.type = type;
+	}
+	public Integer getLevel() {
+		return level;
+	}
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+	public Integer getCurrentPage() {
+		return currentPage;
+	}
+	public void setCurrentPage(Integer currentPage) {
+		this.currentPage = currentPage;
+	}
+	
+}
@@ -39,12 +39,12 @@ public class ShopDto {
 	/**
 	 * 是否自营
 	 */
-	private Integer isSelfShop;
+	private Integer selfShop;
 	/**
 	 * 主营业务
 	 */
-	private String mainBusiness;
+	private String mainBiz;
 	/**
 	 * 地址
@@ -96,20 +96,22 @@ public class ShopDto {
 		this.status = status;
 	}
-	public Integer getIsSelfShop() {
-		return isSelfShop;
+
+	public Integer getSelfShop() {
+		return selfShop;
 	}
-	public void setIsSelfShop(Integer isSelfShop) {
-		this.isSelfShop = isSelfShop;
+	public void setSelfShop(Integer selfShop) {
+		this.selfShop = selfShop;
 	}
-	public String getMainBusiness() {
-		return mainBusiness;
+
+	public String getMainBiz() {
+		return mainBiz;
 	}
-	public void setMainBusiness(String mainBusiness) {
-		this.mainBusiness = mainBusiness;
+	public void setMainBiz(String mainBiz) {
+		this.mainBiz = mainBiz;
 	}
 	public String getAddress() {
+package com.diligrp.xtrade.product.domain.dto;
+
+import java.time.LocalDateTime;
+
+/**
+ * @ClassName: QueryShopDto
+ * @Description TODO(用一句话描述该文件做什么)
+ * @author yangfan
+ * @date 2020年4月22日
+ */
+public class ShopQueryDto {
+	
+	private String shopName;
+	private Long merId;
+	private LocalDateTime createdTime;
+	public String getShopName() {
+		return shopName;
+	}
+	public void setShopName(String shopName) {
+		this.shopName = shopName;
+	}
+	public Long getMerId() {
+		return merId;
+	}
+	public void setMerId(Long merId) {
+		this.merId = merId;
+	}
+	public LocalDateTime getCreatedTime() {
+		return createdTime;
+	}
+	public void setCreatedTime(LocalDateTime createdTime) {
+		this.createdTime = createdTime;
+	}
+	
+}
@@ -31,10 +31,10 @@ public class ShopDo extends BaseDo {
 	private Integer status;
 	//是否自营
-	private Integer isSelfShop;
+	private Integer selfShop;
 	//主营业务
-	private String mainBusiness;
+	private String mainBiz;
 	//地址
 	private String address;
@@ -82,20 +82,22 @@ public class ShopDo extends BaseDo {
 		this.status = status;
 	}
-	public Integer getIsSelfShop() {
-		return isSelfShop;
+	
+
+	public Integer getSelfShop() {
+		return selfShop;
 	}
-	public void setIsSelfShop(Integer isSelfShop) {
-		this.isSelfShop = isSelfShop;
+	public void setSelfShop(Integer selfShop) {
+		this.selfShop = selfShop;
 	}
-	public String getMainBusiness() {
-		return mainBusiness;
+	public String getMainBiz() {
+		return mainBiz;
 	}
-	public void setMainBusiness(String mainBusiness) {
-		this.mainBusiness = mainBusiness;
+	public void setMainBiz(String mainBiz) {
+		this.mainBiz = mainBiz;
 	}
 	public String getAddress() {
@@ -4,6 +4,7 @@ import java.util.List;
 import com.diligrp.xtrade.product.domain.dto.CategoryDto;
+import com.diligrp.xtrade.product.domain.dto.CategoryQueryDto;
 import com.diligrp.xtrade.product.domain.entity.CategoryDo;
@@ -23,9 +24,19 @@ public interface CategoryService {
 	/**
 	 * @Title selectList
 	 * @Description 条件查询
-	 * @param category
+	 * @param CategoryQueryDto
 	 * @return
 	 * @throws
 	 */
-	List<CategoryDo> selectList(CategoryDto category);
+	List<CategoryDo> selectList(CategoryQueryDto category);
+	
+	/**
+	 * 
+	 * @Title selectCateChild
+	 * @Description 根据品类catecode获取下级品类
+	 * @param cateCode
+	 * @return
+	 * @throws
+	 */
+	List<CategoryDo> selectCateChild(String cateCode);
 }
@@ -3,6 +3,7 @@ package com.diligrp.xtrade.product.service;
 import java.util.List;
 import com.diligrp.xtrade.product.domain.dto.ShopDto;
+import com.diligrp.xtrade.product.domain.dto.ShopQueryDto;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 public interface ShopService {
@@ -43,4 +44,14 @@ public interface ShopService {
 	 * @throws
 	 */
 	List<ShopDo> selectShopByMerId(Long merId);
+	
+	/**
+	 * 
+	 * @Title selectShop
+	 * @Description 商铺查询
+	 * @param shopQuery
+	 * @return
+	 * @throws
+	 */
+	List<ShopDo> selectShop(ShopQueryDto shopQuery);
 }
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import com.diligrp.xtrade.product.dao.CategoryDao;
 import com.diligrp.xtrade.product.domain.dto.CategoryDto;
+import com.diligrp.xtrade.product.domain.dto.CategoryQueryDto;
 import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
 import com.diligrp.xtrade.product.domain.entity.CategoryDo;
 import com.diligrp.xtrade.product.service.CategoryService;
@@ -34,6 +35,7 @@ public class CategoryServiceImpl implements CategoryService {
 		BeanUtils.copyProperties(category, categoryDo);
 		long id = keyGeneratorManager.getKeyGenerator(IKeyGeneratorKeys.CATEGORY_SEQUENCE).nextId();
 		String cateCode = ""+id;
+		//cateCode 生成 子级品类继承上级品类cateCode 父code_子code 
 		if (StringUtils.isNotBlank(category.getParentId())) {
 			CategoryDo pCategoryDo =  selectEntityById(Long.valueOf(category.getParentId()));
 			cateCode = String.format("%s_%d", pCategoryDo.getCateCode(),id);
@@ -51,20 +53,22 @@ public class CategoryServiceImpl implements CategoryService {
 	@Override
 	public void delectById(Long id) {
-		// TODO Auto-generated method stub
-
+		categoryDao.delect(id);
 	}
 	@Override
 	public CategoryDo selectEntityById(Long id) {
-		// TODO Auto-generated method stub
-		return null;
+		return categoryDao.selectEntityById(id);
+	}
+
+	@Override
+	public List<CategoryDo> selectList(CategoryQueryDto categoryQueryDto) {
+		return categoryDao.selectList(categoryQueryDto);
 	}
 	@Override
-	public List<CategoryDo> selectList(CategoryDto category) {
-		// TODO Auto-generated method stub
-		return null;
+	public List<CategoryDo> selectCateChild(String cateCode) {
+		return categoryDao.selectCateChild(cateCode);
 	}
 }
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import com.diligrp.xtrade.product.dao.ShopDao;
 import com.diligrp.xtrade.product.domain.dto.ShopDto;
+import com.diligrp.xtrade.product.domain.dto.ShopQueryDto;
 import com.diligrp.xtrade.product.domain.emuns.IKeyGeneratorKeys;
 import com.diligrp.xtrade.product.domain.entity.ShopDo;
 import com.diligrp.xtrade.product.service.ShopService;
@@ -48,4 +49,10 @@ public class ShopServiceImpl implements ShopService {
 		return shops;
 	}
+	@Override
+	public List<ShopDo> selectShop(ShopQueryDto shopQuery) {
+		List<ShopDo> shops = shopDao.selectShop(shopQuery);
+		return shops;
+	}
+
 }
@@ -20,5 +20,5 @@ spring:
     active: dev
 mybatis:
-    mapper-locations: classpath:mapping/com/diligrp/xtrade/product/*Dao.xml
+    mapper-locations: classpath:mapping/com/diligrp/xtrade/*product/*Dao.xml
     type-aliases-package: com.diligrp.xtrade.*.domain.entity
 \ No newline at end of file
@@ -51,7 +51,15 @@
 			UPDATE `category` SET status = 2 WHERE id = #{id};
 		]]>
 	</update>
-	
+	<select id="selectCateChild" parameterType="string">
+		<![CDATA[
+			SELECT 
+		]]>
+			<include refid="QUERY_COLUMN_LIST"/>
+		<![CDATA[
+			 FROM `category` WHERE cate_code LIKE CONCAT(#{cateCode},"%");
+		]]>
+	</select>
@@ -5,7 +5,7 @@
  	<sql id="QUERY_COLUMN_LIST">
 		<![CDATA[
 		`id`, `shop_id` AS shopId, `shop_name` AS shopName, `address`, `mer_id` AS merId, `type`, `status`,
-		`main_business` AS mainBusiness, `self_shop` AS selfShop,`description`,`created_time` AS createdTime, `modified_time`AS modifiedTime
+		`main_biz` AS mainBiz, `self_shop` AS selfShop,`description`,`created_time` AS createdTime, `modified_time`AS modifiedTime
 		]]>
 	</sql>
 	<sql id="UPDATE_COLUMN_SET">
@@ -15,7 +15,7 @@
 			<if test="merId != null"><![CDATA[mer_id = #{merId},]]></if>
 			<if test="type != null"><![CDATA[type = #{type},]]></if>
 			<if test="status != null"><![CDATA[status = #{status},]]></if>
-			<if test="mainBusiness != null"><![CDATA[main_business = #{mainBusiness},]]></if>
+			<if test="mainBiz != null"><![CDATA[main_biz = #{mainBiz},]]></if>
 			<if test="selfShop != null"><![CDATA[self_shop = #{selfShop},]]></if>
 			<if test="description != null"><![CDATA[description = #{description},]]></if>
 			<![CDATA[modify_date = now()]]>
@@ -50,4 +50,13 @@
 			FROM `xt_shop` WHERE mer_id = #{merId}
 		]]>
 	</select>
+	<select id="selectShop" parameterType="long" resultType="com.diligrp.xtrade.product.domain.dto.ShopQueryDto">
+		<![CDATA[
+			SELECT 
+		]]>
+			<include refid="QUERY_COLUMN_LIST" />
+		<![CDATA[
+			FROM `xt_shop` WHERE mer_id = #{merId}
+		]]>
+	</select>
 </mapper>
 \ No newline at end of file