diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerDao.java index 17afdec..dd5faf4 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvBuyerDao.java @@ -54,5 +54,5 @@ public interface VvBuyerDao extends BaseMapper { @LIMIT - VvBuyerEntity selectVvBuyerInfo(String buyerName, String buyerWeixin, String buyerPhone); + VvBuyerEntity selectVvBuyerInfo(String buyerName,@OR String buyerWeixin,@OR String buyerPhone); } \ No newline at end of file diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java index 56b85be..4f7f3ec 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java @@ -25,7 +25,7 @@ public class AppIndexPageRequest { private Integer categoryId3; - //销售价格,传ASC 或 DESC + //销售价格,传ASC 升序 或 DESC private String salePriceSort; // 按真实销量排序,传ASC 或 DESC diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/UploadOssController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java similarity index 69% rename from api-web/api-interface/src/main/java/com/heyu/api/controller/mm/UploadOssController.java rename to api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java index be56629..22e8b1a 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/UploadOssController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java @@ -1,10 +1,9 @@ -package com.heyu.api.controller.mm; +package com.heyu.api.controller.vv; import com.heyu.api.data.utils.R; import com.heyu.api.oss.OssFileUploadService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,33 +18,25 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/mm/upload") -public class UploadOssController { +@RequestMapping("/app/upload") +public class AppUploadOssController { @Autowired private OssFileUploadService ossFileUploadService; /** - *post man 配置 + * post man 配置 * https://blog.csdn.net/maowendi/article/details/80537304 - * - * - * http://localhost:8888/mm/upload/file + *

+ *

+ * http://localhost:8888/app/upload/file file */ @PostMapping("/file") - public R uploadFile(HttpServletRequest request, HttpServletResponse response ,@RequestParam("file") MultipartFile file) { - - String userName = ObjectUtils.toString(request.getParameter("userPhone"), ""); - - String type = ObjectUtils.toString(request.getParameter("type"), ""); - + public R uploadFile(HttpServletRequest request, HttpServletResponse response, @RequestParam("file") MultipartFile file) { List> data = ossFileUploadService.uploadImages(new MultipartFile[]{file}); return R.ok().setData(data); } - - - }