quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-10-28 09:40:33 +08:00
parent 517fcd0d42
commit 6141dece9b
32 changed files with 277 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterAwardLineDao.java
View File

@ -53,4 +53,15 @@ public interface VvPromoterAwardLineDao extends BaseMapper<VvPromoterAwardLineEn
@IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @Column(VvPromoterAwardLineEntity.create_timestamp) Long maxCreateTimestamp,
@OrderBy @IF @Column(VvPromoterAwardLineEntity.create_timestamp) String createTimestampSort);
@OrderBy(VvPromoterAwardLineEntity.id_)
List<VvPromoterAwardLineEntity> 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);
}

10
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterDao.java
View File

@ -55,4 +55,14 @@ public interface VvPromoterDao extends BaseMapper<VvPromoterEntity> {
@OrderBy(VvBuyerEntity.id_)
List<VvPromoterEntity> 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);
}

21
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvPromoterAwardLineEntity.java
View File

@ -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 +
"}";
}
}

2
api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java
View File

@ -48,7 +48,7 @@ public class MysqlMain_update {
}
List<TablesBean> list = new ArrayList<TablesBean>();
list.add(new TablesBean("vv_product_property_value"));
list.add(new TablesBean("vv_promoter_award_line"));
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppCategoryRequest.java
View File

@ -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

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLoginRequest.java
View File

@ -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 {
/***

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java
View File

@ -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 {

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvProductDetailRequest.java
View File

@ -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 {
/***

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java
View File

@ -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 {
/***

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java
View File

@ -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<VvTradeOrderLineDTO> vvTradeOrderLineDTOList;

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java
View File

@ -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 {
/***

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseCloseRequest.java
View File

@ -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 {

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseProveRequest.java
View File

@ -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 {
/***

4
api-third/src/main/java/com/heyu/api/alibaba/request/mm/reverse/AppliyReverseRequest.java
View File

@ -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 {
/***
* 物流单号

13
api-third/src/main/java/com/heyu/api/alibaba/request/vv/VVBaseRequest.java → api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBaseRequest.java
View File

@ -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 ;
/***

7
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerAddressRequest.java
View File

@ -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;
}

12
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppBuyerRequest.java Normal file
View File

@ -0,0 +1,12 @@
package com.heyu.api.alibaba.request.vv;
import lombok.Data;
@Data
public class AppBuyerRequest extends AppBaseRequest {
}

2
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentAdd.java
View File

@ -8,7 +8,7 @@ import java.util.ArrayList;
import java.util.List;
@Data
public class AppCommentAdd extends VVBaseRequest {
public class AppCommentAdd extends AppBaseRequest {

2
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentDelete.java
View File

@ -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 {
/***

6
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentRequest.java
View File

@ -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

2
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppCommentUseful.java
View File

@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
import lombok.Data;
@Data
public class AppCommentUseful extends VVBaseRequest{
public class AppCommentUseful extends AppBaseRequest {
/***
* 评论id

7
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppIndexPageRequest.java
View File

@ -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;
/***
* 商品名称
*/

6
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java
View File

@ -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;
/***

22
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterLineRequest.java Normal file
View File

@ -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;
}

19
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppPromoterRequest.java Normal file
View File

@ -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;
}

2
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartDeleteRequest.java
View File

@ -6,7 +6,7 @@ import lombok.Data;
import java.util.List;
@Data
public class AppShippingCartDeleteRequest extends VVBaseRequest {
public class AppShippingCartDeleteRequest extends AppBaseRequest {
/**

6
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShippingCartRequest.java
View File

@ -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;

2
api-third/src/main/java/com/heyu/api/alibaba/request/vv/VvShoppingCartAddRequest.java → api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppShoppingCartAddRequest.java
View File

@ -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

37
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppBuyerController.java Normal file
View File

@ -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);
}
}

51
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterAwardLineController.java Normal file
View File

@ -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);
}
}

50
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterController.java Normal file
View File

@ -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);
}
}

4
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java
View File

@ -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();