# update

src/main/java/com/gogirl/application/product/serve/impl/BaseProduceServiceImpl.java

@@ -19,6 +19,7 @@ import com.gogirl.infrastructure.mapper.product.serve.BaseFeaturesMapper;
 import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
 import com.gogirl.infrastructure.mapper.product.serve.PraiseRecordMapper;
 import com.gogirl.shared.product.serve.QueryProducePageRequest;
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -46,6 +47,23 @@ public class BaseProduceServiceImpl extends ServiceImpl<BaseProduceMapper, BaseP
         return baseProduce;
     }
 
+    private static final List<String> customerServeFliter = Lists.newArrayList(
+            "日式女士基础修手",
+            "日式女士基础修脚",
+            " 日式男士基础修手",
+            " 日式男士修脚",
+            " 日式女士精致修手",
+            " 高级会员免费卸甲（手部）",
+            " 特级会员免费修手",
+            " 高级会员免费卸甲（脚部）",
+            " 免费睫毛卸除（会员福利）",
+            " 贵族会员免费手部基础护理",
+            " 10天内售后补睫毛",
+            " 睫毛（卸除）",
+            " 精细日式卸甲（手部）",
+            " 精细日式卸甲（脚部）",
+            " 复杂日式卸甲",
+            );
 
     @Override
     public IPage<BaseProduce> queryProducePage(QueryProducePageRequest request) {

src/main/java/com/gogirl/application/product/serve/impl/BaseServeServiceImpl.java

@@ -29,7 +29,8 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
         Integer departmentId = SessionUtils.getDepartmentId();
         param.setDepartmentId(departmentId);
 
-        IPage<BaseServe> result = baseServeMapper.listServeForPage(page, param);
+
+        IPage<BaseServe> result = baseServeMapper.listServeForPage(page, param,SessionUtils.getSourceFrom());
         List<Integer> serveIdList = result.getRecords().stream().map(BaseServe::getId).collect(Collectors.toList());
 
 

src/main/java/com/gogirl/infrastructure/mapper/product/serve/BaseServeMapper.java

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface BaseServeMapper extends BaseMapper<BaseServe> {
 
-    IPage<BaseServe> listServeForPage(@Param("page") IPage<BaseServe> page, @Param("baseServe") BaseServe baseServe);
+    IPage<BaseServe> listServeForPage(@Param("page") IPage<BaseServe> page,
+                                      @Param("baseServe") BaseServe baseServe,
+                                      @Param("sourceFrom") String sourceFrom);
 
 }

src/main/resources/mapper/product/BaseServeMapper.xml

@@ -68,6 +68,25 @@
         <if test="baseServe.departmentId != null ">
             and t3.store_id = #{baseServe.departmentId}
         </if>
+        <if test="sourceFrom!=null and sourceFrom !=''">
+              and ser.name not in (
+            '日式女士基础修手',
+            '日式女士基础修脚',
+            '日式男士基础修手',
+            '日式男士修脚',
+            '日式女士精致修手',
+            '高级会员免费卸甲（手部）',
+            '特级会员免费修手',
+            '高级会员免费卸甲（脚部）',
+            '免费睫毛卸除（会员福利）',
+            '贵族会员免费手部基础护理',
+            '10天内售后补睫毛',
+            '睫毛（卸除）',
+            '精细日式卸甲（手部）',
+            '精细日式卸甲（脚部）',
+            '复杂日式卸甲'
+            )
+        </if>
         and has_purchase_show=1
         order by purchase_show_index desc
     </select>