xc-mall.git - Gitblit

			@@ -13,6 +13,7 @@
			<result property="goodsDetails" column="goods_details" />
			<result property="isSale" column="is_sale" />
			<result property="originalPrice" column="original_price" />
			<result property="staticPropPrice" column="staticPropPrice" />
			<result property="presentPrice" column="present_price" />
			<result property="categoryId" column="category_id" />
			<result property="volume" column="volume" />
			@@ -66,6 +67,7 @@
			c.stock sku_stock,
			c.sku_volume,
			c.original_price sku_original_price,
			a.original_price*a.static_prop staticPropPrice,
			c.present_price sku_present_price,
			c.style_id sku_style_id,
			c.goods_weight sku_goods_weight,
			@@ -90,6 +92,7 @@
			a.thumb,
			a.unit,
			a.original_price,
			a.original_price*a.static_prop staticPropPrice,
			a.present_price,
			a.level_one_price,
			a.level_two_price,
			@@ -106,7 +109,7 @@
			</if>
			min(b.id) skuId,
			min(b.present_price) price,
			sum(b.stock) stock,
			ifnull(sum(b.stock), a.stock) stock,
			sum(b.sku_volume) saleVolume
			from mall_goods a
			left join mall_goods_sku b on a.id=b.goods_id
			@@ -123,8 +126,11 @@
			<if test="record.isNormal != null and record.isNormal != ''">
			and a.is_normal = #{record.isNormal}
			</if>
			<if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
			<if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 1">
			and a.goods_type = #{record.goodsType} and a.present_price != 0
			</if>
			<if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 2">
			and a.goods_type = #{record.goodsType}
			</if>
			<if test="record.goodsType == 3">
			and a.present_price = 0
			@@ -337,6 +343,7 @@
			a.thumb,
			a.unit,
			a.original_price,
			a.original_price*a.static_prop staticPropPrice,
			a.present_price,
			a.score,
			a.is_hot,