category

yangfan
1 parent 72bdd6c6
Showing 4 changed files with 60 additions and 106 deletions
src/main/java/com/diligrp/xtrade/product/domain/dto/CategoryDto.java
src/main/java/com/diligrp/xtrade/product/domain/entity/CategoryDo.java
src/main/java/com/diligrp/xtrade/product/domain/entity/ShopDo.java
src/main/resources/mapping/com/diligrp/xtrade/product/CategoryDao.xml
 package com.diligrp.xtrade.product.domain.dto;
-import com.diligrp.xtrade.shared.domain.BaseDo;
 /**
  * @ClassName: CategoryDto
@@ -10,9 +9,9 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
  */
 public class CategoryDto{
 	/**
-	 * 快捷简码
+	 * 品类id
 	 */
-	private String categoryId;
+	private String cateId;
 	/**
 	 * 品类名称
 	 */
@@ -49,11 +48,12 @@ public class CategoryDto{
 	 * 品类等级
 	 */
 	private Integer level;
-	public String getCategoryId() {
-		return categoryId;
+	
+	public String getCateId() {
+		return cateId;
 	}
-	public void setCategoryId(String categoryId) {
-		this.categoryId = categoryId;
+	public void setCateId(String cateId) {
+		this.cateId = cateId;
 	}
 	public String getCname() {
 		return cname;
@@ -10,9 +10,9 @@ import com.diligrp.xtrade.shared.domain.BaseDo;
  */
 public class CategoryDo extends BaseDo{
 	/**
-	 * 快捷简码
+	 * 品类id
 	 */
-	private String categoryId;
+	private String cateId;
 	/**
 	 * 品类名称
 	 */
@@ -49,11 +49,12 @@ public class CategoryDo extends BaseDo{
 	 * 品类等级
 	 */
 	private Integer level;
-	public String getCategoryId() {
-		return categoryId;
+	
+	public String getCateId() {
+		return cateId;
 	}
-	public void setCategoryId(String categoryId) {
-		this.categoryId = categoryId;
+	public void setCateId(String cateId) {
+		this.cateId = cateId;
 	}
 	public String getCname() {
 		return cname;
@@ -6,6 +6,13 @@ package com.diligrp.xtrade.product.domain.entity;
 import com.diligrp.xtrade.shared.domain.BaseDo;
+/**
+ * 
+ * @ClassName: ShopDo
+ * @Description TODO(用一句话描述该文件做什么)
+ * @author yangfan
+ * @date 2020年4月21日
+ */
 public class ShopDo extends BaseDo {
 	//商户id
@@ -35,110 +42,46 @@ public class ShopDo extends BaseDo {
 	//描述
 	private String description;
-	public ShopDo(){
+	public Long getMerId() {
+		return merId;
 	}
-	public ShopDo(Long shopId, Integer type){
-		this.shopId = shopId;
-		this.type = type;
+	public void setMerId(Long merId) {
+		this.merId = merId;
 	}
-	/**
-	 * 获取 门店编码
-	 * @return
-	 */
-	public Long getShopId(){
+	public Long getShopId() {
 		return shopId;
 	}
-	
-	/**
-	 * 设置 门店编码
-	 * @param shopId
-	 */
-	public void setShopId(Long shopId){
+
+	public void setShopId(Long shopId) {
 		this.shopId = shopId;
 	}
-	/**
-	 * 获取 门店名称
-	 * @return
-	 */
-	public String getShopName(){
+	public String getShopName() {
 		return shopName;
 	}
-	
-	/**
-	 * 设置 门店名称
-	 * @param shopName
-	 */
-	public void setShopName(String shopName){
+
+	public void setShopName(String shopName) {
 		this.shopName = shopName;
 	}
-	/**
-	 * 获取 门店地址
-	 * @return
-	 */
-	public String getAddress(){
-		return address;
-	}
-	
-	/**
-	 * 设置 门店地址
-	 * @param address
-	 */
-	public void setAddress(String address){
-		this.address = address;
+	public Integer getType() {
+		return type;
 	}
-	/**
-	 * 获取 所属商户编码
-	 * @return
-	 */
-	public Long getMerId(){
-		return merId;
-	}
-	
-	/**
-	 * 设置 所属商户编码
-	 * @param merId
-	 */
-	public void setMerId(Long merId){
-		this.merId = merId;
+	public void setType(Integer type) {
+		this.type = type;
 	}
-	/**
-	 * 获取 门店状态
-	 * @return
-	 */
-	public Integer getStatus(){
+	public Integer getStatus() {
 		return status;
 	}
-	
-	/**
-	 * 设置 门店状态
-	 * @param status
-	 */
-	public void setStatus(Integer status){
+
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
-	/**
-	 * 获取 门店描述
-	 * @return
-	 */
-	public String getDescription(){
-		return description;
-	}
-	
-	/**
-	 * 设置 门店描述
-	 * @param description
-	 */
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
 	public Integer getIsSelfShop() {
 		return isSelfShop;
 	}
@@ -147,14 +90,6 @@ public class ShopDo extends BaseDo {
 		this.isSelfShop = isSelfShop;
 	}
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
 	public String getMainBusiness() {
 		return mainBusiness;
 	}
@@ -162,4 +97,22 @@ public class ShopDo extends BaseDo {
 	public void setMainBusiness(String mainBusiness) {
 		this.mainBusiness = mainBusiness;
 	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	
 }
 \ No newline at end of file
@@ -5,12 +5,12 @@
 	<!-- etrade_product 所有查询列 -->
 	<sql id="QUERY_COLUMN_LIST">
-		<![CDATA[`id`, `category_id` AS categoryId, `cname`, `short_name` AS shortName, `status`, `level`, `type`, `icon`, `image`, `valid_day` AS validDay, `created_time` AS createdTime, `modified_time` AS modifiedTime, `market_id` AS marketId]]>
+		<![CDATA[`id`, `cate_id` AS cateId, `cname`, `short_name` AS shortName, `status`, `level`, `type`, `icon`, `image`, `valid_day` AS validDay, `created_time` AS createdTime, `modified_time` AS modifiedTime, `market_id` AS marketId]]>
 	</sql>
 	<sql id="UPDATE_COLUMN_SET">
 		<set>
 			<if test="cname != null"><![CDATA[cname = #{cname},]]></if>
-			<if test="categoryId != null"><![CDATA[category_id = #{categoryId},]]></if>
+			<if test="categoryId != null"><![CDATA[cate_id = #{cateId},]]></if>
 			<if test="status != null"><![CDATA[status = #{status},]]></if>
 			<if test="hasChild != null"><![CDATA[has_child = #{hasChild},]]></if>
 			<if test="shortName != null"><![CDATA[short_name = #{shortName},]]></if>
@@ -22,8 +22,8 @@
 	</sql>
 	<insert id="insert" parameterType="com.diligrp.xtrade.product.domain.entity.CategoryDo">
 		<![CDATA[
-			INSERT INTO `category`(`id`, `category_id`, `cname`, `short_name`, `status`, `level`, `type`, `icon`, `image`, `valid_day`, `created_time`, `modified_time`, `market_id`) VALUES
-			 (#{id}, #{categoryId}, #{sname}, #{shortName}, #{status}, #{level}, #{type}, #{icon}, #{image}, #{validDay}, now(), now(), #{marketId});
+			INSERT INTO `category`(`id`, `cate_id`, `cname`, `short_name`, `status`, `level`, `type`, `icon`, `image`, `valid_day`, `created_time`, `modified_time`, `market_id`) VALUES
+			 (#{id}, #{cateId}, #{sname}, #{shortName}, #{status}, #{level}, #{type}, #{icon}, #{image}, #{validDay}, now(), now(), #{marketId});
 		]]>
 	</insert>
 	<select id="selectEntityById" parameterType="long">