xzx.git - Gitblit

			@@ -11,7 +11,7 @@


			#log
			project.log.path=xzx/logs
			project.log.path=/xzx/logs
			logstash.server.url=localhost:4560

			#spring

			@@ -28,4 +28,7 @@

			@ApiModelProperty(value = "库存")
			private Integer stock;

			@ApiModelProperty(value = "是否抢购 1-是 2-否")
			private Integer isQg;
			}

			@@ -52,10 +52,10 @@
			and a.id=#{record.id}
			</if>
			<if test="record.isQg != null and record.isQg != ''">
			and a.is_qg=#{record.isQg} and now() > a.qg_end_time
			and a.is_qg=#{record.isQg} and a.qg_end_time > now()
			</if>
			<if test="record.cateId != null and record.cateId != ''">
			and (a.category_id = #{record.cateId} or a.category in (select id from xzx_score_goods_category where parent_id=#{record.cateId}))
			and (a.category_id = #{record.cateId} or a.category_id in (select id from xzx_score_goods_category where parent_id=#{record.cateId}))
			</if>
			</where>
			group by a.id

	gc-core/src/main/resources/application.properties	2 ●●●●● patch \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java	3 ●●●●● patch \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml	4 ●●●●● patch \| view \| raw \| blame \| history