From c0934ba746c2da2c947e7a69dd88eda26b204b55 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 14 Oct 2025 23:06:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/heyu/api/data/dao/vv/VvBuyerDao.java | 4 ++++ .../heyu/api/data/dao/vv/VvProductDao.java | 4 +++- .../api/data/entity/vv/VvBuyerEntity.java | 21 ++++++++++++++++- .../api/data/entity/vv/VvProductEntity.java | 21 ++++++++++++++++- .../java/com/test/xxx/MysqlMain_update.java | 2 +- .../request/vv/AppIndexPageRequest.java | 23 +++++++++++++++---- .../controller/vv/AppIndexPageController.java | 19 ++++++++++++++- 7 files changed, 84 insertions(+), 10 deletions(-) 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 fbf916b..f7612db 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 @@ -47,4 +47,8 @@ public interface VvBuyerDao extends BaseMapper { @IF @GE Long minCreateTimestamp, @IF @LE Long maxCreateTimestamp, @OrderBy @IF @Column(VvBuyerEntity.create_timestamp) String createTimestampSort); + + + @LIMIT + VvBuyerEntity selectVvBuyerIsTestById(Long id, Integer isTest); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvProductDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvProductDao.java index 45b5f27..6c97dc2 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvProductDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvProductDao.java @@ -74,9 +74,11 @@ public interface VvProductDao extends BaseMapper { @IF Integer appCategoryId1, @IF Integer appCategoryId2, @IF Integer appCategoryId3, + @IF Integer isTest, @IF @OrderBy(VvProductEntity.show_sale_price) String salePriceSort, @IF @OrderBy(VvProductEntity.show_sale_count) String saleCountSort, - @IF @OrderBy(VvProductEntity.create_timestamp) String createTimestampSort); + @IF @OrderBy(VvProductEntity.create_timestamp) String createTimestampSort + ); List selectVvProductByProductIds(@IN List id); diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java index d271bf7..148a8ef 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvBuyerEntity.java @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *买家信息 * @author quyixiao -* @since 2025-08-23 +* @since 2025-10-14 */ @Data @@ -30,6 +30,7 @@ private static final long serialVersionUID = 1L; public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号 public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 买家创建时间 public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 买家修改时间 + public final static String is_test = CLASS_NAME + "is_test"; // 是否是测试账号 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -49,6 +50,8 @@ private static final long serialVersionUID = 1L; private Long createTimestamp; //买家修改时间 private Long modifyTimestamp; + //是否是测试账号 + private Integer isTest; /** * * @return @@ -184,6 +187,21 @@ private static final long serialVersionUID = 1L; this.modifyTimestamp = modifyTimestamp; } + /** + * 是否是测试账号 + * @return + */ + public Integer getIsTest() { + return isTest; + } + /** + * 是否是测试账号 + * @param isTest + */ + public void setIsTest(Integer isTest) { + this.isTest = isTest; + } + @Override public String toString() { return "VvBuyerEntity{" + @@ -196,6 +214,7 @@ private static final long serialVersionUID = 1L; ",buyerPhone=" + buyerPhone + ",createTimestamp=" + createTimestamp + ",modifyTimestamp=" + modifyTimestamp + + ",isTest=" + isTest + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvProductEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvProductEntity.java index 090c7e4..594ef5c 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvProductEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvProductEntity.java @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *商品表 * @author quyixiao -* @since 2025-08-26 +* @since 2025-10-14 */ @Data @@ -45,6 +45,7 @@ private static final long serialVersionUID = 1L; public final static String admin_category_id4 = CLASS_NAME + "admin_category_id4"; // admin4级类目 public final static String admin_category_id5 = CLASS_NAME + "admin_category_id5"; // admin5级类目 public final static String seller_id = CLASS_NAME + "seller_id"; // 商家id + public final static String is_test = CLASS_NAME + "is_test"; // 是否是测试单 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -94,6 +95,8 @@ private static final long serialVersionUID = 1L; private String adminCategoryId5; //商家id private Long sellerId; + //是否是测试单 + private Integer isTest; /** * * @return @@ -454,6 +457,21 @@ private static final long serialVersionUID = 1L; this.sellerId = sellerId; } + /** + * 是否是测试单 + * @return + */ + public Integer getIsTest() { + return isTest; + } + /** + * 是否是测试单 + * @param isTest + */ + public void setIsTest(Integer isTest) { + this.isTest = isTest; + } + @Override public String toString() { return "VvProductEntity{" + @@ -481,6 +499,7 @@ private static final long serialVersionUID = 1L; ",adminCategoryId4=" + adminCategoryId4 + ",adminCategoryId5=" + adminCategoryId5 + ",sellerId=" + sellerId + + ",isTest=" + isTest + "}"; } } \ 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 156f1d6..4b23bde 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 @@ -49,7 +49,7 @@ public class MysqlMain_update { List list = new ArrayList(); - String a = "vv_buyer_address"; + String a = "vv_buyer"; for (String s : a.split(",")) { list.add(new TablesBean(s)); } 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 409d277..6086dd4 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 @@ -12,24 +12,20 @@ public class AppIndexPageRequest { private int pageSize = 10; - /*** * 商品名称 */ private String productName; - //一级类目id private Integer categoryId1; //二级类目 private Integer categoryId2; //三级类目 private Integer categoryId3; - //是否是首页 - private Integer frontPage; - //销售价格 + //销售价格，传ASC 或 DESC private String salePriceSort; // 按真实销量排序，传ASC 或 DESC @@ -39,10 +35,27 @@ public class AppIndexPageRequest { */ private String createTimestampSort; + + /*** + * 如果是内部用户，可传 1,如果不是内部用户，你就传0 + */ + private Integer isTest = 0 ; + + + /*** + * 买家id + */ + private Long buyerId; + + + + //是否是首页 + private Integer frontPage; /*** * 状态 */ private String status ; + } 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 117a0fc..91bad15 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 @@ -10,6 +10,7 @@ import com.heyu.api.data.dto.vv.VvProductDTO; import com.heyu.api.data.dto.vv.VvProductPropertyDTO; import com.heyu.api.data.dto.vv.VvSkuDTO; import com.heyu.api.data.entity.vv.*; +import com.heyu.api.data.utils.NumberUtil; import com.heyu.api.data.utils.R; import com.heyu.api.utils.ISelect; import com.heyu.api.utils.PPageUtils; @@ -52,13 +53,28 @@ public class AppIndexPageController { @Autowired private VvProductPropertyValueDao vvProductPropertyValueDao; + + @Autowired + private VvBuyerDao vvBuyerDao ; + + + /*** - * 列表 + * 列表 /app/index/page/list */ @RequestMapping("/page/list") public R list(@RequestBody AppIndexPageRequest vvProductRequest) { vvProductRequest.setFrontPage(1); vvProductRequest.setStatus(ProductStatusEnums.online.getStatus()); + + if(NumberUtil.equals(vvProductRequest.getIsTest() ,1)){ + Long buyerId = vvProductRequest.getBuyerId(); + VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerIsTestById(buyerId, 1); + if(vvBuyerEntity == null){ + return R.error("非内部用户"); + } + } + PPageUtils pageUtils = PPageUtils.startPage(vvProductRequest.getPageNum(), vvProductRequest.getPageSize()) .doSelect(new ISelect() { @Override @@ -70,6 +86,7 @@ public class AppIndexPageController { vvProductRequest.getCategoryId1(), vvProductRequest.getCategoryId2(), vvProductRequest.getCategoryId3(), + vvProductRequest.getIsTest(), vvProductRequest.getSalePriceSort(), vvProductRequest.getSaleCountSort(), vvProductRequest.getCreateTimestampSort()