diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java index 24604ef..2fe2028 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java @@ -53,4 +53,15 @@ public interface VvPromoterAwardLineDao extends BaseMapper selectByAppCondition(IPage page, + @IF Long promoterBuyerId, + @IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long minCreateTimestamp, + @IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long maxCreateTimestamp, + @OrderBy @IF @Column(VvPromoterAwardLineEntity.create_timestamp) String createTimestampSort); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java index 4ec6430..ae493af 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java @@ -55,4 +55,14 @@ public interface VvPromoterDao extends BaseMapper { + + @OrderBy(VvBuyerEntity.id_) + List selectAppByCondition(IPage page, + @IF Long promoterBuyerId, + @IF @Column(VvPromoterEntity.create_timestamp) Long minCreateTimestamp, + @IF @Column(VvPromoterEntity.create_timestamp) Long maxCreateTimestamp, + @OrderBy @IF @Column(VvPromoterEntity.create_timestamp) String createTimestampSort); + + + } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java index 90fbfd9..72b64c0 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *推广者获得奖品名细子单 * @author quyixiao -* @since 2025-10-25 +* @since 2025-10-28 */ @Data @@ -41,6 +41,7 @@ private static final long serialVersionUID = 1L; public final static String trade_order_line_id = CLASS_NAME + "trade_order_line_id"; // 子订单id public final static String status_ = CLASS_NAME + "status"; // create 创建, canceled 取消 , arrive，到账 public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间戳 + public final static String promoter_award_id = CLASS_NAME + "promoter_award_id"; // 推荐id // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -82,6 +83,8 @@ private static final long serialVersionUID = 1L; private String status; //创建时间戳 private Long createTimestamp; + //推荐id + private Long promoterAwardId; /** * * @return @@ -382,6 +385,21 @@ private static final long serialVersionUID = 1L; this.createTimestamp = createTimestamp; } + /** + * 推荐id + * @return + */ + public Long getPromoterAwardId() { + return promoterAwardId; + } + /** + * 推荐id + * @param promoterAwardId + */ + public void setPromoterAwardId(Long promoterAwardId) { + this.promoterAwardId = promoterAwardId; + } + @Override public String toString() { return "VvPromoterAwardLineEntity{" + @@ -405,6 +423,7 @@ private static final long serialVersionUID = 1L; ",tradeOrderLineId=" + tradeOrderLineId + ",status=" + status + ",createTimestamp=" + createTimestamp + + ",promoterAwardId=" + promoterAwardId + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 67374f7..3193bf2 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -48,7 +48,7 @@ public class MysqlMain_update { } List list = new ArrayList(); - list.add(new TablesBean("vv_product_property_value")); + list.add(new TablesBean("vv_promoter_award_line")); Map map = MysqlUtil2ShowCreateTable.getComments(); 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 800def1..911886e 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,11 +1,11 @@ package com.heyu.api.alibaba.request.mm; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class VvAppCategoryRequest extends VVBaseRequest { +public class VvAppCategoryRequest extends AppBaseRequest { /*** * 父亲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 f73e443..10046ac 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,10 +1,10 @@ package com.heyu.api.alibaba.request.mm; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class VvAppLoginRequest extends VVBaseRequest { +public class VvAppLoginRequest extends AppBaseRequest { /*** 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 d7a860e..9d58232 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,10 +1,10 @@ package com.heyu.api.alibaba.request.mm; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class VvAppLogisticsRequest extends VVBaseRequest { +public class VvAppLogisticsRequest extends AppBaseRequest { 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 67ada32..5c18984 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,11 +1,11 @@ package com.heyu.api.alibaba.request.mm; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class VvProductDetailRequest extends VVBaseRequest { +public class VvProductDetailRequest extends AppBaseRequest { /*** 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 0881afb..49205a9 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,11 +1,11 @@ package com.heyu.api.alibaba.request.mm.order; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class AppDeliveredDTO extends VVBaseRequest { +public class AppDeliveredDTO extends AppBaseRequest { /*** 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 ddb072d..eaf7015 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,13 +3,13 @@ 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 com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; import java.util.List; @Data -public class VvTradeOrderDTO extends VVBaseRequest { +public class VvTradeOrderDTO extends AppBaseRequest { 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 d324268..d6a0afd 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,11 +1,11 @@ package com.heyu.api.alibaba.request.mm.order.resp; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class VvTradeOrderDeleteDTO extends VVBaseRequest { +public class VvTradeOrderDeleteDTO extends AppBaseRequest { /*** 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 5b5a261..73c6587 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,11 +1,11 @@ package com.heyu.api.alibaba.request.mm.reverse; -import com.heyu.api.alibaba.request.vv.VVBaseRequest; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @Data -public class AppliyReverseCloseRequest extends VVBaseRequest { +public class AppliyReverseCloseRequest extends AppBaseRequest { 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 c3a112b..1674350 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,13 +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 com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; import java.util.List; @Data -public class AppliyReverseProveRequest extends VVBaseRequest { +public class AppliyReverseProveRequest extends AppBaseRequest { /*** 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 176fb4a..a2631cc 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,14 +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 com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data -public class AppliyReverseRequest extends VVBaseRequest { +public class AppliyReverseRequest extends AppBaseRequest { /*** * 物流单号 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/AppBaseRequest.java similarity index 67% rename from api-third/src/main/java/com/heyu/api/alibaba/request/vv/VVBaseRequest.java rename to api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBaseRequest.java index ad7212b..377b131 100644 --- 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/AppBaseRequest.java @@ -1,6 +1,17 @@ package com.heyu.api.alibaba.request.vv; -public class VVBaseRequest { + +import lombok.Data; + +@Data +public class AppBaseRequest { + + + + private Integer pageNum = 1 ; + + + private Integer pageSize = 10 ; /*** 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 d58ef7e..6e94ddf 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,14 +4,9 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppBuyerAddressRequest extends VVBaseRequest { +public class AppBuyerAddressRequest extends AppBaseRequest { - private int pageNum = 1; - - - private int pageSize = 10; - } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java new file mode 100644 index 0000000..c87d421 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java @@ -0,0 +1,12 @@ +package com.heyu.api.alibaba.request.vv; + + +import lombok.Data; + +@Data +public class AppBuyerRequest extends AppBaseRequest { + + + + +} 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 0764a9b..51e1c7a 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,7 +8,7 @@ import java.util.ArrayList; import java.util.List; @Data -public class AppCommentAdd extends VVBaseRequest { +public class AppCommentAdd extends AppBaseRequest { 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 9abdfba..f7d009d 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 extends VVBaseRequest { +public class AppCommentDelete extends AppBaseRequest { /*** 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 a0dcc35..0dbdfa1 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,12 +4,8 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppCommentRequest extends VVBaseRequest{ +public class AppCommentRequest extends AppBaseRequest { - private int pageNum = 1; - - - private int pageSize = 10; /*** * 订单id 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 cc4a792..3cd5334 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,7 +4,7 @@ import com.alibaba.fastjson.JSON; import lombok.Data; @Data -public class AppCommentUseful extends VVBaseRequest{ +public class AppCommentUseful extends AppBaseRequest { /*** * 评论id 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 05001ec..48acda6 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,14 +4,9 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppIndexPageRequest extends VVBaseRequest { +public class AppIndexPageRequest extends AppBaseRequest { - private int pageNum = 1; - - - private int pageSize = 10; - /*** * 商品名称 */ 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 218f906..4a7771d 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,12 +6,8 @@ import lombok.Data; import java.util.List; @Data -public class AppOrderRequest extends VVBaseRequest{ +public class AppOrderRequest extends AppBaseRequest { - private int pageNum = 1; - - - private int pageSize = 10; /*** diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java new file mode 100644 index 0000000..3f7da58 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java @@ -0,0 +1,22 @@ +package com.heyu.api.alibaba.request.vv; + + +import lombok.Data; + +@Data +public class AppPromoterLineRequest extends AppBaseRequest { + + + //推广者买家id + private Long promoterBuyerId; + + //创建时间撮 + private Long minCreateTimestamp; + // 创建时间最小值 + private Long maxCreateTimestamp; + /*** + * 按创建时间排序,，传 ASC 或 DESC + */ + private String createTimestampSort; + +} diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java new file mode 100644 index 0000000..d72560c --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java @@ -0,0 +1,19 @@ +package com.heyu.api.alibaba.request.vv; + + +import lombok.Data; + +@Data +public class AppPromoterRequest extends AppBaseRequest { + + + //创建时间撮 + private Long minCreateTimestamp; + // 创建时间最小值 + private Long maxCreateTimestamp; + /*** + * 按创建时间排序,，传 ASC 或 DESC + */ + private String createTimestampSort; + +} 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 5ced0d3..a46cac5 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 extends VVBaseRequest { +public class AppShippingCartDeleteRequest extends AppBaseRequest { /** 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 daf884f..054d601 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,13 +4,9 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class AppShippingCartRequest extends VVBaseRequest { +public class AppShippingCartRequest extends AppBaseRequest { - private Integer pageNum = 1; - - private Integer pageSize = 10 ; - //商品标题 private String productName; 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/AppShoppingCartAddRequest.java similarity index 69% rename from api-third/src/main/java/com/heyu/api/alibaba/request/vv/VvShoppingCartAddRequest.java rename to api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShoppingCartAddRequest.java index 19515a0..02f215e 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/AppShoppingCartAddRequest.java @@ -3,7 +3,7 @@ package com.heyu.api.alibaba.request.vv; import lombok.Data; @Data -public class VvShoppingCartAddRequest extends VVBaseRequest{ +public class AppShoppingCartAddRequest extends AppBaseRequest { //sku_id diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerController.java new file mode 100644 index 0000000..36d0b67 --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerController.java @@ -0,0 +1,37 @@ +package com.heyu.api.controller.vv; + + +import com.heyu.api.alibaba.request.vv.AppBuyerRequest; +import com.heyu.api.common.annotation.Describe; +import com.heyu.api.data.dao.vv.VvBuyerDao; +import com.heyu.api.data.entity.vv.VvBuyerEntity; +import com.heyu.api.data.utils.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Slf4j +@RestController +@RequestMapping("/app/buyer") +public class AppBuyerController { + + + @Autowired + private VvBuyerDao vvBuyerDao; + + /*** + * 列表 + * /app/buyer/info + */ + @Describe("我的信息") + @RequestMapping("/info") + public R list(@RequestBody AppBuyerRequest request) { + VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(request.getBuyerId()); + return R.ok().setData(vvBuyerEntity); + } + + +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java new file mode 100644 index 0000000..5d8f4e9 --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java @@ -0,0 +1,51 @@ +package com.heyu.api.controller.vv; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.heyu.api.alibaba.request.mm.VvPromoterLineRequest; +import com.heyu.api.common.annotation.Describe; +import com.heyu.api.data.dao.vv.VvPromoterAwardLineDao; +import com.heyu.api.data.utils.R; +import com.heyu.api.utils.ISelect; +import com.heyu.api.utils.PPageUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/app/promoter/award") +public class AppPromoterAwardLineController { + + + @Autowired + private VvPromoterAwardLineDao vvPromoterAwardLineDao; + + /*** + * 奖励 列表 + * http://localhost:8888/app/promoter/award/list + */ + @Describe("我的奖励列表") + @RequestMapping("/list") + public R list(@RequestBody VvPromoterLineRequest vvPromoterRequest) { + PPageUtils pageUtils = PPageUtils.startPage(vvPromoterRequest.getPageNum(), vvPromoterRequest.getPageSize()) + .doSelect(new ISelect() { + @Override + public List doSelect(IPage page) { + return vvPromoterAwardLineDao.selectByAppCondition(page, + vvPromoterRequest.getPromoterBuyerId(), + vvPromoterRequest.getMinCreateTimestamp(), + vvPromoterRequest.getMaxCreateTimestamp(), + vvPromoterRequest.getCreateTimestampSort() + ); + } + }); + + return R.ok().setData(pageUtils); + } + +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java new file mode 100644 index 0000000..c5ad9d2 --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java @@ -0,0 +1,50 @@ + +package com.heyu.api.controller.vv; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.heyu.api.alibaba.request.vv.AppPromoterRequest; +import com.heyu.api.common.annotation.Describe; +import com.heyu.api.data.dao.vv.VvPromoterDao; +import com.heyu.api.data.utils.R; +import com.heyu.api.utils.ISelect; +import com.heyu.api.utils.PPageUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/app/promoter") +public class AppPromoterController { + + + @Autowired + private VvPromoterDao vvPromoterDao; + + /*** + * 列表 + * http://localhost:8888/app/promoter/list + */ + @Describe("我推荐的好友") + @RequestMapping("/list") + public R list(@RequestBody AppPromoterRequest request) { + PPageUtils pageUtils = PPageUtils.startPage(request.getPageNum(), request.getPageSize()) + .doSelect(new ISelect() { + @Override + public List doSelect(IPage page) { + return vvPromoterDao.selectAppByCondition(page, + request.getBuyerId(), + request.getMinCreateTimestamp(), + request.getMaxCreateTimestamp(), + request.getCreateTimestampSort() + ); + } + }); + return R.ok().setData(pageUtils); + } +} \ No newline at end of file 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 ed0f577..c64dc02 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 @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.alibaba.request.vv.AppShoppingCartAddRequest; import com.heyu.api.common.annotation.Describe; import com.heyu.api.data.dao.vv.*; import com.heyu.api.data.dto.vv.VvShoppingCartDTO; @@ -101,7 +101,7 @@ public class AppShoppingCartController { */ @Describe("加购物车") @RequestMapping("/addOrUpdate") - public R add(@RequestBody VvShoppingCartAddRequest VvShoppingCartAddRequest) { + public R add(@RequestBody AppShoppingCartAddRequest VvShoppingCartAddRequest) { VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(VvShoppingCartAddRequest.getBuyerId()); VvShoppingCartEntity vvShoppingCartEntity = new VvShoppingCartEntity();