提交修改
This commit is contained in:
parent
f55ccaf182
commit
6010d3237a
@ -66,6 +66,7 @@ public interface VvProductDao extends BaseMapper<VvProductEntity> {
|
|||||||
|
|
||||||
|
|
||||||
@OrderBy(VvProductEntity.id_)
|
@OrderBy(VvProductEntity.id_)
|
||||||
|
@ExludeColumn({VvProductEntity.real_sale_count})
|
||||||
List<VvProductEntity> selectIndexVvProduct(IPage page,
|
List<VvProductEntity> selectIndexVvProduct(IPage page,
|
||||||
@IF @LIKE String title,
|
@IF @LIKE String title,
|
||||||
@IF Integer frontPage,
|
@IF Integer frontPage,
|
||||||
|
|||||||
@ -50,4 +50,11 @@ public interface VvSkuDao extends BaseMapper<VvSkuEntity> {
|
|||||||
|
|
||||||
|
|
||||||
int updateVvSkuStockSaleCountById(@Sub Integer stock, @Plus Integer realSaleCount,@Plus Integer showSaleCount, @By Long skuId);
|
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);
|
||||||
}
|
}
|
||||||
@ -7,8 +7,9 @@ package com.heyu.api.data.dao.vv;
|
|||||||
* @author quyixiao
|
* @author quyixiao
|
||||||
* @since 2025-08-21
|
* @since 2025-08-21
|
||||||
*/
|
*/
|
||||||
import com.heyu.api.data.entity.vv.VvSkuPropertyValueEntity;
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
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.IN;
|
||||||
import com.lz.mybatis.plugin.annotations.Realy;
|
import com.lz.mybatis.plugin.annotations.Realy;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
@ -42,7 +43,6 @@ public interface VvSkuPropertyValueDao extends BaseMapper<VvSkuPropertyValueEnti
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
List<VvSkuPropertyValueEntity> selectVvSkuPropertyValueByProductId(Long productId);
|
List<VvSkuPropertyValueEntity> selectVvSkuPropertyValueByProductId(Long productId);
|
||||||
|
|
||||||
@Realy
|
@Realy
|
||||||
|
|||||||
@ -67,6 +67,7 @@ public interface VvTradeOrderDao extends BaseMapper<VvTradeOrderEntity> {
|
|||||||
void updateByBuerIdAndIds(String status,@By Long buyerId,@By List<Long> ids);
|
void updateByBuerIdAndIds(String status,@By Long buyerId,@By List<Long> ids);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IN List<Long> id);
|
List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IN List<Long> id);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -119,6 +119,11 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
|
|||||||
|
|
||||||
@OrderBy(VvTradeOrderLineEntity.id_)
|
@OrderBy(VvTradeOrderLineEntity.id_)
|
||||||
@GroupBy(VvTradeOrderLineEntity.trade_order_id)
|
@GroupBy(VvTradeOrderLineEntity.trade_order_id)
|
||||||
|
@ExludeColumn({
|
||||||
|
VvTradeOrderLineEntity.profit_amount,
|
||||||
|
VvTradeOrderLineEntity.settle_status,
|
||||||
|
VvTradeOrderLineEntity.is_delete
|
||||||
|
})
|
||||||
List<VvTradeOrderLineEntity> selectByAppCondition(IPage page,
|
List<VvTradeOrderLineEntity> selectByAppCondition(IPage page,
|
||||||
@IF @IN List<Long> tradeOrderIds,
|
@IF @IN List<Long> tradeOrderIds,
|
||||||
@IF String status,
|
@IF String status,
|
||||||
|
|||||||
@ -124,8 +124,6 @@ public class OrderController {
|
|||||||
vvOrderRequest.getCreateTimestampSort());
|
vvOrderRequest.getCreateTimestampSort());
|
||||||
|
|
||||||
|
|
||||||
SanUtils.setNull(list,VvTradeOrderLineEntity::getProfitAmount);
|
|
||||||
|
|
||||||
List<String> trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber);
|
List<String> trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber);
|
||||||
Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
|
Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
|
||||||
if (CollectionUtils.isNotEmpty(trackNumbers)) {
|
if (CollectionUtils.isNotEmpty(trackNumbers)) {
|
||||||
|
|||||||
@ -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.dto.vv.VvSkuDTO;
|
||||||
import com.heyu.api.data.entity.vv.*;
|
import com.heyu.api.data.entity.vv.*;
|
||||||
import com.heyu.api.data.utils.R;
|
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.ISelect;
|
||||||
import com.heyu.api.utils.PPageUtils;
|
import com.heyu.api.utils.PPageUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
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.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
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
|
@Slf4j
|
||||||
@RestController
|
@RestController
|
||||||
@ -76,15 +78,6 @@ public class AppIndexPageController {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
List<VvProductEntity> vvProductEntities = pageUtils.getRows();
|
|
||||||
|
|
||||||
SanUtils.setNull(vvProductEntities, VvProductEntity::getRealSaleCount);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return R.ok().setData(pageUtils);
|
return R.ok().setData(pageUtils);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,12 +127,6 @@ public class AppIndexPageController {
|
|||||||
vvSkuDTOS.add(vvSkuDTO);
|
vvSkuDTOS.add(vvSkuDTO);
|
||||||
}
|
}
|
||||||
|
|
||||||
SanUtils.setNull(vvSkuDTOS,
|
|
||||||
VvSkuDTO::getRealSaleCount,
|
|
||||||
VvSkuDTO::getOriginPrice
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
vvProductDTO.setVvSkuList(vvSkuDTOS);
|
vvProductDTO.setVvSkuList(vvSkuDTOS);
|
||||||
|
|
||||||
List<VvProductPropertyEntity> vvProductPropertyEntities = vvProductPropertyDao.selectVvProductPropertyByProductId(vvProductDetailRequest.getProductId());
|
List<VvProductPropertyEntity> vvProductPropertyEntities = vvProductPropertyDao.selectVvProductPropertyByProductId(vvProductDetailRequest.getProductId());
|
||||||
|
|||||||
@ -149,6 +149,7 @@ public class AppOrderController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Map<Long, VvSkuEntity> skuEntityMap = new HashMap<>();
|
Map<Long, VvSkuEntity> skuEntityMap = new HashMap<>();
|
||||||
|
|
||||||
List<VvSkuEntity> vvSkuEntities = vvSkuDao.selectVvSkuBySkuIds(skuIds);
|
List<VvSkuEntity> vvSkuEntities = vvSkuDao.selectVvSkuBySkuIds(skuIds);
|
||||||
|
|
||||||
for (VvSkuEntity vvSkuEntity : vvSkuEntities) {
|
for (VvSkuEntity vvSkuEntity : vvSkuEntities) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user