PLF 5 سال پیش
والد
کامیت
1ff341b211
2فایلهای تغییر یافته به همراه4 افزوده شده و 12 حذف شده
  1. 0 7
      pom.xml
  2. 4 5
      src/main/java/com/caimei/controller/search/SearchController.java

+ 0 - 7
pom.xml

@@ -90,13 +90,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.caimei</groupId>
-            <artifactId>caimei-search-moudle</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
     </dependencies>
 
     <profiles>

+ 4 - 5
src/main/java/com/caimei/controller/search/SearchController.java

@@ -8,7 +8,6 @@ import com.caimei.entity.CmMallProductLadderPrice;
 import com.caimei.entity.CmMallProductSearchHistory;
 import com.caimei.service.search.SearchService;
 import com.caimei.utils.AppUtils;
-import com.caimei.vo.WxJsonModel;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,7 +36,7 @@ public class SearchController {
      */
     @ResponseBody
     @RequestMapping("/product")
-    public WxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
+    public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
                                      Integer pageSize, HttpServletRequest request) {
         CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
         String openID = (String) jsonModel.getData();
@@ -57,7 +56,7 @@ public class SearchController {
             }
         }
         CmMallPage<CmMallOrganizeProducts> productsPage = new CmMallPage<>(list);
-        return WxJsonModel.newInstance().success(productsPage);
+        return CmWxJsonModel.newInstance().success(productsPage);
     }
 
     /**
@@ -65,10 +64,10 @@ public class SearchController {
      */
     @ResponseBody
     @RequestMapping("/record")
-    public WxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
+    public CmWxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
         CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
         String openID = (String) jsonModel.getData();
         List<CmMallProductSearchHistory> historyList = searchService.findProductRecord(organizeID, openID);
-        return WxJsonModel.newInstance().success(historyList);
+        return CmWxJsonModel.newInstance().success(historyList);
     }
 }