Merge branch 'master' of http://git3.nong12.com/xtrade/order-service.git

zhangxing
2 parents 699e884e 482e60c7
Showing 3 changed files with 28 additions and 14 deletions
src/main/resources/mapping/com/diligrp/xtrade/product/CategoryDao.xml
src/main/resources/mapping/com/diligrp/xtrade/product/MerchantDao.xml
src/main/resources/mapping/com/diligrp/xtrade/product/ShopDao.xml
@@ -20,6 +20,15 @@
 			<if test="validDay != null"><![CDATA[valid_day = #{validDay},]]></if>
 		</set>
 	</sql>
+	<sql id="QUERY_WHERE_CLAUSE">
+		<where>
+			<if test="cname != null and cname != ''"><![CDATA[AND cname = #{cname}]]></if>
+			<if test="status != null and status != ''"><![CDATA[AND status = #{status}]]></if>
+			<if test="cateLevel != null "><![CDATA[AND cate_level = #{cateLevel}]]></if>
+			<if test="shortName != null and shortName != ''"><![CDATA[AND short_name = #{shortName}]]></if>
+			<if test="cateCode != null and cateCode != ''"><![CDATA[AND cate_code = #{cateCode}]]></if>
+		</where>
+	</sql>
 	<insert id="insert" parameterType="com.diligrp.xtrade.product.domain.entity.CategoryDo">
 		<![CDATA[
 			INSERT INTO `category`(`id`, `cateCode`, `cname`, `short_name`, `status`, `level`, `type`, `icon`, `image`, `valid_day`, `created_time`, `modified_time`, `market_id`) VALUES
@@ -44,7 +53,6 @@
 			modify_date = now()
 			WHERE id = #{id}
 		]]>
-		
 	</update>
 	<update id="delect" parameterType="long">
 		<![CDATA[
@@ -60,7 +68,4 @@
 			 FROM `category` WHERE cate_code LIKE CONCAT(#{cateCode},"%");
 		]]>
 	</select>
-	
-	
-	
 </mapper>
 \ No newline at end of file
@@ -53,12 +53,7 @@
             <if test="description != null and description != ''">
                 `description` = #{description},
             </if>
-            <if test="createdTime != null">
-                created_time = #{createdTime},
-            </if>
-            <if test="modifiedTime != null">
-                modified_time = #{modifiedTime},
-            </if>
+            modified_time = now(),
         </set>
     </sql>
@@ -119,7 +114,7 @@
         insert into xt_merchant(mer_id, mer_name, market_id, account_id, account_name, type, status, description,
                                 created_time, modified_time)
         values (#{merId}, #{merName}, #{marketId}, #{accountId}, #{accountName}, #{type}, #{status}, #{description},
-                #{createdTime}, #{modifiedTime})
+                now(), now())
     </insert>
     <!--通过主键修改数据-->
@@ -21,6 +21,19 @@
 			<![CDATA[modify_date = now()]]>
 		</set>
 	</sql>
+	<sql id="QUERY_WHERE_CLAUSE">
+		<where>
+			<if test="shopId != null and shopId != ''"><![CDATA[AND shop_id = #{shopId}]]></if>
+			<if test="shopName != null and shopName != ''"><![CDATA[AND shop_name like  CONCAT('%','${shopName}','%' )]]></if>
+			<if test="address != null and address != ''"><![CDATA[AND address = #{address}]]></if>
+			<if test="merId != null and merId != ''"><![CDATA[AND mer_id = #{merId}]]></if>
+			<if test="type != null and type != ''"><![CDATA[AND type = #{type}]]></if>
+			<if test="status != null and status != ''"><![CDATA[AND status = #{status}]]></if>
+			<if test="mainBiz != null and mainBiz != ''"><![CDATA[AND main_biz = #{mainBiz}]]></if>
+			<if test="selfShop != null and selfShop != ''"><![CDATA[AND self_shop = #{selfShop}]]></if>
+		</where>
+	</sql>
+	
 	<insert id="insert" parameterType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
 			INSERT INTO `xt_shop`(`id`, `shop_id`, `shop_name`, `self_shop`, `mer_id`, `main_biz`, `type`, `status`, `address`, `description`, `created_time`, `modified_time`)
@@ -39,7 +52,7 @@
 	<update id="update" parameterType="com.diligrp.xtrade.product.domain.entity.ShopDo"> 
 		<![CDATA[UPDATE `xt_shop`]]>
 		<include refid="UPDATE_COLUMN_SET" />
-		<![CDATA[WHERE mer_id = #{merId}]]>
+		<![CDATA[WHERE shop_id = #{shopId}]]>
 	</update>
  	<select id="selectByMerId" parameterType="long" resultType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
@@ -50,13 +63,14 @@
 			FROM `xt_shop` WHERE mer_id = #{merId}
 		]]>
 	</select>
-	<select id="selectShop" parameterType="long" resultType="com.diligrp.xtrade.product.domain.dto.ShopQueryDto">
+	<select id="selectShop" parameterType="com.diligrp.xtrade.product.domain.dto.ShopQueryDto" resultType="com.diligrp.xtrade.product.domain.entity.ShopDo">
 		<![CDATA[
 			SELECT 
 		]]>
 			<include refid="QUERY_COLUMN_LIST" />
 		<![CDATA[
-			FROM `xt_shop` WHERE mer_id = #{merId}
+			FROM `xt_shop` 
 		]]>
+			<include refid="QUERY_WHERE_CLAUSE" />
 	</select>
 </mapper>
 \ No newline at end of file