Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/zzjs

zzjs-service/src/main/java/com/miaxis/feign/service/IFilmService.java

@@ -4,6 +4,7 @@ package com.miaxis.feign.service;
 import com.miaxis.common.config.FeignConfig;
 import com.miaxis.feign.dto.Film;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,10 +16,11 @@ import org.springframework.web.bind.annotation.RequestParam;
  * 电影接口测试
  */
 @FeignClient(name="filmService",
-        url = "http://movieapi-test.taototo.cn",configuration = FeignConfig.class)
+        url = "http://movieapi2-test.taototo.cn",configuration = FeignConfig.class)
 @Component
 public interface IFilmService {
-    @PostMapping(value = "/movieapi/movie-info/get-city-list")
+    @PostMapping(value = "/movieapi/movie-info/get-city-list",
+            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     String geFilmInfo(Film film);
 
 

zzjs-service/src/main/resources/mapper/product/ProductTypeInfoMapper.xml

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         py.status
         from product_type_info py
         LEFT JOIN file_info f on f.file_id = py.product_icon
+        where py.status = 0
         ORDER BY weight DESC
     </select>