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-08-29 13:22:45 +08:00
parent f55ccaf182
commit 6010d3237a
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvProductDao.java
View File

@ -66,6 +66,7 @@ public interface VvProductDao extends BaseMapper<VvProductEntity> {
@OrderBy(VvProductEntity.id_)
@ExludeColumn({VvProductEntity.real_sale_count})
List<VvProductEntity> selectIndexVvProduct(IPage page,
@IF @LIKE String title,
@IF Integer frontPage,

7
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuDao.java
View File

@ -50,4 +50,11 @@ public interface VvSkuDao extends BaseMapper<VvSkuEntity> {
int updateVvSkuStockSaleCountById(@Sub Integer stock, @Plus Integer realSaleCount,@Plus Integer showSaleCount, @By Long skuId);
@ExludeColumn({
VvSkuEntity.real_sale_count,
VvSkuEntity.origin_price
})
List<VvSkuEntity> selectAppSkuByProductId(Long productId);
}

4
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSkuPropertyValueDao.java
View File

@ -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<VvSkuPropertyValueEnti
List<VvSkuPropertyValueEntity> selectVvSkuPropertyValueByProductId(Long productId);
@Realy

3
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java
View File

@ -67,6 +67,7 @@ public interface VvTradeOrderDao extends BaseMapper<VvTradeOrderEntity> {
void updateByBuerIdAndIds(String status,@By Long buyerId,@By List<Long> ids);
List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IN List<Long> id);
}

5
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java
View File

@ -119,6 +119,11 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
@OrderBy(VvTradeOrderLineEntity.id_)
@GroupBy(VvTradeOrderLineEntity.trade_order_id)
@ExludeColumn({
VvTradeOrderLineEntity.profit_amount,
VvTradeOrderLineEntity.settle_status,
VvTradeOrderLineEntity.is_delete
})
List<VvTradeOrderLineEntity> selectByAppCondition(IPage page,
@IF @IN List<Long> tradeOrderIds,
@IF String status,

2
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java
View File

@ -124,8 +124,6 @@ public class OrderController {
vvOrderRequest.getCreateTimestampSort());
SanUtils.setNull(list,VvTradeOrderLineEntity::getProfitAmount);
List<String> trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber);
Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(trackNumbers)) {

21
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java
View File

@ -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<VvProductEntity> 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<VvProductPropertyEntity> vvProductPropertyEntities = vvProductPropertyDao.selectVvProductPropertyByProductId(vvProductDetailRequest.getProductId());

1
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -149,6 +149,7 @@ public class AppOrderController {
}
Map<Long, VvSkuEntity> skuEntityMap = new HashMap<>();
List<VvSkuEntity> vvSkuEntities = vvSkuDao.selectVvSkuBySkuIds(skuIds);
for (VvSkuEntity vvSkuEntity : vvSkuEntities) {