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 c3f6aeb..45b5f27 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 @@ -66,6 +66,7 @@ public interface VvProductDao extends BaseMapper { @OrderBy(VvProductEntity.id_) + @ExludeColumn({VvProductEntity.real_sale_count}) List selectIndexVvProduct(IPage page, @IF @LIKE String title, @IF Integer frontPage, diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuDao.java index 911b30f..fb73617 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuDao.java @@ -50,4 +50,11 @@ public interface VvSkuDao extends BaseMapper { int updateVvSkuStockSaleCountById(@Sub Integer stock, @Plus Integer realSaleCount,@Plus Integer showSaleCount, @By Long skuId); + + + @ExludeColumn({ + VvSkuEntity.real_sale_count, + VvSkuEntity.origin_price + }) + List selectAppSkuByProductId(Long productId); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuPropertyValueDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuPropertyValueDao.java index 358ace0..9043a1c 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuPropertyValueDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuPropertyValueDao.java @@ -7,8 +7,9 @@ package com.heyu.api.data.dao.vv; * @author quyixiao * @since 2025-08-21 */ -import com.heyu.api.data.entity.vv.VvSkuPropertyValueEntity; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.heyu.api.data.entity.vv.VvSkuPropertyValueEntity; import com.lz.mybatis.plugin.annotations.IN; import com.lz.mybatis.plugin.annotations.Realy; import org.apache.ibatis.annotations.Mapper; @@ -42,7 +43,6 @@ public interface VvSkuPropertyValueDao extends BaseMapper selectVvSkuPropertyValueByProductId(Long productId); @Realy diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java index f38348a..aa72c03 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java @@ -67,6 +67,7 @@ public interface VvTradeOrderDao extends BaseMapper { void updateByBuerIdAndIds(String status,@By Long buyerId,@By List ids); - List selectVvTradeOrderByTradeOrderIds(@IN List id); + + } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java index 7eb3e1b..9b6ee70 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java @@ -119,6 +119,11 @@ public interface VvTradeOrderLineDao extends BaseMapper @OrderBy(VvTradeOrderLineEntity.id_) @GroupBy(VvTradeOrderLineEntity.trade_order_id) + @ExludeColumn({ + VvTradeOrderLineEntity.profit_amount, + VvTradeOrderLineEntity.settle_status, + VvTradeOrderLineEntity.is_delete + }) List selectByAppCondition(IPage page, @IF @IN List tradeOrderIds, @IF String status, diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java index 12b2a1e..51372be 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java @@ -124,8 +124,6 @@ public class OrderController { vvOrderRequest.getCreateTimestampSort()); - SanUtils.setNull(list,VvTradeOrderLineEntity::getProfitAmount); - List trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber); Map vvPackageEntityMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(trackNumbers)) { 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 afa3148..12b8b1c 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 @@ -11,7 +11,6 @@ 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.R; -import com.heyu.api.data.utils.SanUtils; import com.heyu.api.utils.ISelect; import com.heyu.api.utils.PPageUtils; import lombok.extern.slf4j.Slf4j; @@ -21,7 +20,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Slf4j @RestController @@ -76,15 +78,6 @@ public class AppIndexPageController { } }); - - - List vvProductEntities = pageUtils.getRows(); - - SanUtils.setNull(vvProductEntities, VvProductEntity::getRealSaleCount); - - - - return R.ok().setData(pageUtils); } @@ -134,12 +127,6 @@ public class AppIndexPageController { vvSkuDTOS.add(vvSkuDTO); } - SanUtils.setNull(vvSkuDTOS, - VvSkuDTO::getRealSaleCount, - VvSkuDTO::getOriginPrice - ); - - vvProductDTO.setVvSkuList(vvSkuDTOS); List vvProductPropertyEntities = vvProductPropertyDao.selectVvProductPropertyByProductId(vvProductDetailRequest.getProductId()); 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 17db16e..c3603ea 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 @@ -149,6 +149,7 @@ public class AppOrderController { } Map skuEntityMap = new HashMap<>(); + List vvSkuEntities = vvSkuDao.selectVvSkuBySkuIds(skuIds); for (VvSkuEntity vvSkuEntity : vvSkuEntities) {