Commit 594df1f2 by huluobin

update

parent 17581c57
...@@ -73,7 +73,9 @@ public class MallProduct { ...@@ -73,7 +73,9 @@ public class MallProduct {
private BigDecimal bargainPrice; private BigDecimal bargainPrice;
@ApiModelProperty("是否开启特价 1-是 2否") @ApiModelProperty("是否开启特价 1-是 2否")
private Integer isBargainPrice; private Integer isBargainPrice;
private String serialCategoryName; private String serialCategoryName;
private String modelName; private String modelName;
@TableField(exist = false) @TableField(exist = false)
private List<MallCategory> mallCategoryList; private List<MallCategory> mallCategoryList;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<select id="queryServeFeatures" resultType="com.gogirl.domain.product.serve.BaseFeatures"> <select id="queryServeFeatures" resultType="com.gogirl.domain.product.serve.BaseFeatures">
select t1.* from base_features t1 select t1.* from base_features t1
INNER JOIN features_mapping t2 on t1.id = t2.features_id INNER JOIN features_mapping t2 on t1.id = t2.features_id
left join base_serve bs on t2.data_id = bs.id left join base_serve bs on t2.data_id = bs.id and bs.`status` =1
where t2.data_type = 1 where t2.data_type = 1
<if test="serveTypeId != null"> <if test="serveTypeId != null">
and bs.type_id=#{serveTypeId} and bs.type_id=#{serveTypeId}
......
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<if test="colorSystemId !=null "> <if test="colorSystemId !=null ">
and t3.color_system_id =#{colorSystemId} and t3.color_system_id =#{colorSystemId}
</if> </if>
and t1.`status` =1
<choose> <choose>
<when test="sort == 1 "> <when test="sort == 1 ">
order by t1.sales_num desc order by t1.sales_num desc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment