diff --git a/api-common/src/main/java/com/heyu/api/common/annotation/Describe.java b/api-common/src/main/java/com/heyu/api/common/annotation/Describe.java new file mode 100644 index 0000000..65841e9 --- /dev/null +++ b/api-common/src/main/java/com/heyu/api/common/annotation/Describe.java @@ -0,0 +1,19 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.heyu.api.common.annotation; + +import java.lang.annotation.*; + +@Target({ElementType.TYPE, ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface Describe { + + + String value() default ""; + + +} diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java index 9bc0079..800def1 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java @@ -1,10 +1,11 @@ package com.heyu.api.alibaba.request.mm; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class VvAppCategoryRequest { +public class VvAppCategoryRequest extends VVBaseRequest { /*** * 父亲id diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java index c3f8f77..f73e443 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java @@ -1,14 +1,11 @@ package com.heyu.api.alibaba.request.mm; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class VvAppLoginRequest { +public class VvAppLoginRequest extends VVBaseRequest { - /*** - * 买家id，当前登录的买家id - */ - private Long buyerId ; /*** * 目标买家信息 ，如 buyer_name， buyer_weixin， buyer_phone diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java index c6c073d..d7a860e 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java @@ -1,14 +1,11 @@ package com.heyu.api.alibaba.request.mm; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class VvAppLogisticsRequest { +public class VvAppLogisticsRequest extends VVBaseRequest { - /*** - * 买家id，当前登录的买家id - */ - private Long buyerId ; /*** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java index 2106ec3..67ada32 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java @@ -1,10 +1,11 @@ package com.heyu.api.alibaba.request.mm; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class VvProductDetailRequest { +public class VvProductDetailRequest extends VVBaseRequest { /*** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java index 61fd754..0881afb 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java @@ -1,10 +1,11 @@ package com.heyu.api.alibaba.request.mm.order; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class AppDeliveredDTO { +public class AppDeliveredDTO extends VVBaseRequest { /*** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java index 72162e0..ddb072d 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java @@ -3,16 +3,15 @@ package com.heyu.api.alibaba.request.mm.order.resp; import com.alibaba.fastjson.JSON; import com.google.common.collect.Lists; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; import java.util.List; @Data -public class VvTradeOrderDTO { +public class VvTradeOrderDTO extends VVBaseRequest { - private Long buyerId; - private List vvTradeOrderLineDTOList; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java index 42ae469..d324268 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java @@ -1,10 +1,11 @@ package com.heyu.api.alibaba.request.mm.order.resp; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class VvTradeOrderDeleteDTO { +public class VvTradeOrderDeleteDTO extends VVBaseRequest { /*** @@ -13,11 +14,6 @@ public class VvTradeOrderDeleteDTO { private String trackNumber; - /*** - * 买家id - */ - private Long buyerId ; - } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java index 6d29833..5b5a261 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java @@ -1,10 +1,11 @@ package com.heyu.api.alibaba.request.mm.reverse; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; @Data -public class AppliyReverseCloseRequest { +public class AppliyReverseCloseRequest extends VVBaseRequest { diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java index 01b1c4a..c3a112b 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java @@ -2,12 +2,13 @@ package com.heyu.api.alibaba.request.mm.reverse; import com.heyu.api.alibaba.request.mm.order.ResourceDTO; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; import java.util.List; @Data -public class AppliyReverseProveRequest { +public class AppliyReverseProveRequest extends VVBaseRequest { /*** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java index 705feef..176fb4a 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java @@ -2,13 +2,14 @@ package com.heyu.api.alibaba.request.mm.reverse; import com.heyu.api.alibaba.request.mm.order.ResourceDTO; +import com.heyu.api.alibaba.request.vv.VVBaseRequest; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data -public class AppliyReverseRequest { +public class AppliyReverseRequest extends VVBaseRequest { /*** * 物流单号 diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java index f256096..d58ef7e 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppBuyerAddressRequest { +public class AppBuyerAddressRequest extends VVBaseRequest { private int pageNum = 1; @@ -13,9 +13,5 @@ public class AppBuyerAddressRequest { private int pageSize = 10; - /*** - * 买家id - */ - private Long buyerId; } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java index 8f0146a..0764a9b 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java @@ -8,13 +8,10 @@ import java.util.ArrayList; import java.util.List; @Data -public class AppCommentAdd { +public class AppCommentAdd extends VVBaseRequest { - //买家id - private Long buyerId; - //商品评论的内容 private String productComment; diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java index 11af939..9abdfba 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppCommentDelete { +public class AppCommentDelete extends VVBaseRequest { /*** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java index e30c705..a0dcc35 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppCommentRequest { +public class AppCommentRequest extends VVBaseRequest{ private int pageNum = 1; @@ -18,10 +18,6 @@ public class AppCommentRequest { - - //买家id - private Long buyerId; - /*** * 排序 */ diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java index 9f2c40f..cc4a792 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java @@ -4,17 +4,14 @@ import com.alibaba.fastjson.JSON; import lombok.Data; @Data -public class AppCommentUseful { +public class AppCommentUseful extends VVBaseRequest{ /*** * 评论id */ private Long commentId; - /*** - * 买家id - */ - private Long buyerId; + /*** 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 4f7f3ec..05001ec 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 @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppIndexPageRequest { +public class AppIndexPageRequest extends VVBaseRequest { private int pageNum = 1; @@ -44,11 +44,6 @@ public class AppIndexPageRequest { private Integer isTest = 0 ; - /*** - * 买家id - */ - private Long buyerId; - /*** * 状态 */ diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java index 03c92cc..218f906 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java @@ -6,17 +6,14 @@ import lombok.Data; import java.util.List; @Data -public class AppOrderRequest { +public class AppOrderRequest extends VVBaseRequest{ private int pageNum = 1; private int pageSize = 10; - /*** - * 买家id - */ - private Long buyerId; + /*** * 订单号id */ diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java index 4b8cf6f..5ced0d3 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; @Data -public class AppShippingCartDeleteRequest { +public class AppShippingCartDeleteRequest extends VVBaseRequest { /** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java index 039f3c2..daf884f 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java @@ -4,7 +4,7 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppShippingCartRequest { +public class AppShippingCartRequest extends VVBaseRequest { private Integer pageNum = 1; @@ -15,10 +15,7 @@ public class AppShippingCartRequest { //商品标题 private String productName; - /*** - * 买家id - */ - private Long buyerId; + diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VVBaseRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VVBaseRequest.java new file mode 100644 index 0000000..ad7212b --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VVBaseRequest.java @@ -0,0 +1,18 @@ +package com.heyu.api.alibaba.request.vv; + +public class VVBaseRequest { + + + /*** + * 买家id，当前登录的买家id + */ + private Long buyerId ; + + public Long getBuyerId() { + return buyerId; + } + + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; + } +} diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VvShoppingCartAddRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VvShoppingCartAddRequest.java index f926f0d..19515a0 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VvShoppingCartAddRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/VvShoppingCartAddRequest.java @@ -3,10 +3,9 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class VvShoppingCartAddRequest { +public class VvShoppingCartAddRequest extends VVBaseRequest{ + - //买家id - private Long buyerId; //sku_id private Long skuId; //数量 diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java index a029e05..1941294 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerAddressManagerController.java @@ -4,6 +4,7 @@ package com.heyu.api.controller.vv; import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.enums.BuyerAddressEnums; import com.heyu.api.alibaba.request.vv.AppBuyerAddressRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvBuyerAddressDao; import com.heyu.api.data.dao.vv.VvBuyerDao; import com.heyu.api.data.entity.vv.VvBuyerAddressEntity; @@ -35,6 +36,7 @@ public class AppBuyerAddressManagerController { /*** * 列表 */ + @Describe("买家地址列表") @RequestMapping("/list") public R list(@RequestBody AppBuyerAddressRequest appBuyerAddressRequest) { @@ -52,7 +54,7 @@ public class AppBuyerAddressManagerController { return R.ok().setData(pageUtils); } - + @Describe("买家地址插入或修改") @RequestMapping("/insertOrUpdate") public R inserOrUpdate(@RequestBody VvBuyerAddressEntity vvBuyerAddressEntity) { VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvBuyerAddressEntity.getBuyerId()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCategoryController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCategoryController.java index 20dc6ae..816019f 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCategoryController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCategoryController.java @@ -2,6 +2,7 @@ package com.heyu.api.controller.vv; import com.heyu.api.alibaba.request.mm.VvAppCategoryRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvAppCategoryDao; import com.heyu.api.data.dto.vv.VvAppCategoryCategoryDTO; import com.heyu.api.data.entity.vv.VvAppCategoryEntity; @@ -31,6 +32,7 @@ public class AppCategoryController { * http://localhost:8888/app/category/list */ @RequestMapping("/list") + @Describe("app类目列表") public R list(@RequestBody VvAppCategoryRequest vvCategoryRequest) { List vvCategoryEntities = vvAppCategoryDao.selectVvCategoryAll(); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java index 0885860..5df1498 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppCommentController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.enums.CommentStatusEnums; import com.heyu.api.alibaba.request.mm.order.resp.PropertyNameValue; import com.heyu.api.alibaba.request.vv.*; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dto.vv.VvCommentDTO; import com.heyu.api.data.entity.vv.*; @@ -63,6 +64,7 @@ public class AppCommentController { * 列表 */ @RequestMapping("/list") + @Describe("评论列表") public R list(@RequestBody AppCommentRequest appCommentRequest) { PPageUtils pageUtils = null; @@ -146,6 +148,7 @@ public class AppCommentController { /*** * /app/comment/add */ + @Describe("添加评论") @RequestMapping("/add") public R add(@RequestBody AppCommentAdd appCommentRequest) { List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberGroupBySkuId(appCommentRequest.getTrackNumber()); @@ -215,6 +218,7 @@ public class AppCommentController { /*** * */ + @Describe("评论是否有用") @RequestMapping("/useful") public R useful(@RequestBody AppCommentUseful appCommentRequest) { VvCommentUserfulEntity vvCommentUserful = vvCommentUserfulDao.selectVvCommentUserfulByCommentIdBuyerId(appCommentRequest.getCommentId(), appCommentRequest.getBuyerId()); @@ -249,6 +253,7 @@ public class AppCommentController { /*** * 删除 */ + @Describe("删除评论") @RequestMapping("/delete") public R list(@RequestBody AppCommentDelete appCommentRequest) { vvCommentDao.deleteVvCommentById(appCommentRequest.getCommentId()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java index 92edb98..2ca940e 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.heyu.api.alibaba.request.mm.VvProductDetailRequest; import com.heyu.api.alibaba.request.mm.enums.ProductStatusEnums; import com.heyu.api.alibaba.request.vv.AppIndexPageRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dto.vv.VvProductDTO; import com.heyu.api.data.dto.vv.VvProductPropertyDTO; @@ -63,6 +64,7 @@ public class AppIndexPageController { * 列表 /app/index/page/list */ @RequestMapping("/page/list") + @Describe("商品首页列表") public R list(@RequestBody AppIndexPageRequest vvProductRequest) { vvProductRequest.setFrontPage(1); vvProductRequest.setStatus(ProductStatusEnums.online.getStatus()); @@ -99,6 +101,7 @@ public class AppIndexPageController { // /app/index/product/detail + @Describe("商品详情页") @RequestMapping("/product/detail") public R detail(@RequestBody VvProductDetailRequest vvProductDetailRequest) { VvProductDTO vvProductDTO = new VvProductDTO(); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLoginController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLoginController.java index 9a42f80..20c20b8 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLoginController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLoginController.java @@ -3,6 +3,7 @@ package com.heyu.api.controller.vv; import com.alibaba.fastjson.JSON; import com.heyu.api.alibaba.request.mm.VvAppLoginRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvBuyerDao; import com.heyu.api.data.dto.BuyerDTO; import com.heyu.api.data.entity.vv.VvBuyerEntity; @@ -28,6 +29,7 @@ public class AppLoginController { // http://localhost:8888/app/target/login @RequestMapping("/login") + @Describe("目标用户登录") public R login(@RequestBody VvAppLoginRequest request) { VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerIsTestById(request.getBuyerId(), 1); if (vvBuyerEntity == null) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java index 2dbf2b5..a916e30 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java @@ -3,6 +3,7 @@ package com.heyu.api.controller.vv; import com.alibaba.fastjson.JSON; import com.heyu.api.alibaba.request.mm.VvAppLogisticsRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.VvPackageDao; import com.heyu.api.data.dao.vv.VvTradeOrderLineDao; import com.heyu.api.data.dto.vv.KuaiDi100DTO; @@ -35,6 +36,7 @@ public class AppLogisticsController { // http://localhost:8888/app/logistics/query + @Describe("物流查询") @RequestMapping("/query") public R query(@RequestBody VvAppLogisticsRequest request) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 39f9ab6..0696074 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -8,6 +8,7 @@ import com.heyu.api.alibaba.request.mm.order.AppDeliveredDTO; import com.heyu.api.alibaba.request.mm.order.VvTradeOrderLineTrackNumberDTO; import com.heyu.api.alibaba.request.mm.order.resp.*; import com.heyu.api.alibaba.request.vv.AppOrderRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.entity.vv.*; import com.heyu.api.data.utils.BigDecimalUtil; @@ -68,6 +69,7 @@ public class AppOrderController { * 列表 * todo quyixiao */ + @Describe("订单列表") @RequestMapping("/list") public R list(@RequestBody AppOrderRequest vvOrderRequest) { PPageUtils pageUtils = PPageUtils.startPage(vvOrderRequest.getPageNum(), vvOrderRequest.getPageSize()) @@ -166,6 +168,7 @@ public class AppOrderController { /*** * 订单添加 */ + @Describe("添加订单") @RequestMapping("/add") public R add(@RequestBody VvTradeOrderDTO vvOrderRequest) { List vvTradeOrderLineEntityList = new ArrayList<>(); @@ -298,6 +301,7 @@ public class AppOrderController { return R.ok("订单创建成功"); } + @Describe("删除订单") @RequestMapping("/delete") public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) { List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvOrderRequest.getTrackNumber()); @@ -310,6 +314,7 @@ public class AppOrderController { /*** * 订单 妥投 /app/order/delivered */ + @Describe("订单确认收货") @RequestMapping("/delivered") public R topack(@RequestBody AppDeliveredDTO vvDeliveredDTO) { List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvDeliveredDTO.getTrackNumber()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOssAuthController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOssAuthController.java index 23477ed..910a20b 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOssAuthController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOssAuthController.java @@ -1,6 +1,7 @@ package com.heyu.api.controller.vv; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.annotation.NotIntercept; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +17,7 @@ public class AppOssAuthController { // // https://api.1024api.com/api-interface/auth // http://localhost:8888/auth + @Describe("图片认证接口") @RequestMapping("/auth") public int auth(HttpServletRequest request, HttpServletResponse response) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java index ab3a4cb..53079f5 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppReverseController.java @@ -7,6 +7,7 @@ import com.heyu.api.alibaba.request.mm.order.ResourceDTO; import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseCloseRequest; import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseProveRequest; import com.heyu.api.alibaba.request.mm.reverse.AppliyReverseRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.entity.vv.*; import com.heyu.api.data.utils.BigDecimalUtil; @@ -52,6 +53,7 @@ public class AppReverseController { * @param appliyReverseRequest * @return */ + @Describe("逆向订单创建") @RequestMapping("/add") public R add(@RequestBody AppliyReverseRequest appliyReverseRequest) { @@ -149,6 +151,7 @@ public class AppReverseController { * 退货退款 ： /app/reverse/tracknumber * */ + @Describe("逆向订单更新订单号") @RequestMapping("/upload/tracknumber") public R uploadTracknumber(@RequestBody AppliyReverseProveRequest appliyReverseRequest) { VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderById(appliyReverseRequest.getReverseOrderId()); @@ -178,6 +181,7 @@ public class AppReverseController { } + @Describe("逆向订单关闭") @RequestMapping("/close") public R close(@RequestBody AppliyReverseCloseRequest appliyReverseRequest) { diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java index 21b8e55..ed0f577 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java @@ -7,6 +7,7 @@ import com.heyu.api.alibaba.request.mm.order.resp.PropertyNameValue; import com.heyu.api.alibaba.request.vv.AppShippingCartDeleteRequest; import com.heyu.api.alibaba.request.vv.AppShippingCartRequest; import com.heyu.api.alibaba.request.vv.VvShoppingCartAddRequest; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dto.vv.VvShoppingCartDTO; import com.heyu.api.data.entity.vv.*; @@ -52,6 +53,7 @@ public class AppShoppingCartController { /*** * 列表 /app/shipping/cart/list */ + @Describe("购物车列表") @RequestMapping("/list") public R list(@RequestBody AppShippingCartRequest appShippingCartRequest) { PPageUtils pageUtils = PPageUtils.startPage(appShippingCartRequest.getPageNum(), appShippingCartRequest.getPageSize()) @@ -97,6 +99,7 @@ public class AppShoppingCartController { /*** * 更新 或 添加 ，如数量更新 /app/shipping/cart/addOrUpdate */ + @Describe("加购物车") @RequestMapping("/addOrUpdate") public R add(@RequestBody VvShoppingCartAddRequest VvShoppingCartAddRequest) { VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(VvShoppingCartAddRequest.getBuyerId()); @@ -140,6 +143,7 @@ public class AppShoppingCartController { /*** * 列表 */ + @Describe("删除购买车中商品") @RequestMapping("/delete") public R delete(AppShippingCartDeleteRequest appShippingCartDeleteRequest) { vvShoppingCartDao.deleteVvShoppingCartByIds(appShippingCartDeleteRequest.getShoppingCartIds()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java index 6b3717d..9884d51 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java @@ -1,6 +1,7 @@ package com.heyu.api.controller.vv; +import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.utils.R; import com.heyu.api.oss.OssFileUploadService; import lombok.extern.slf4j.Slf4j; @@ -33,8 +34,9 @@ public class AppUploadOssController { * http://localhost:8888/app/upload/file file */ // todo + @Describe("app 上传图片") @PostMapping("/file") - public R uploadFile(HttpServletRequest request, HttpServletResponse response,@RequestParam("files") MultipartFile[] files) { + public R uploadFile(HttpServletRequest request, HttpServletResponse response, @RequestParam("files") MultipartFile[] files) { List> data = ossFileUploadService.uploadImages(files); return R.ok().setData(data); }