BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：销售/出库 返回是否标准尺码；

pull/1121/head
liujiang 2025-09-28 15:15:20 +08:00
parent 388d0b68f0
commit f14e468492
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java
View File

@ -16,7 +16,6 @@ import java.util.List;
*/
@Data
@ApiModel
public class StoreSaleResVO {
@ApiModelProperty(value = "是否为返单:true 是返单 false 不是返单")
@ -64,6 +63,8 @@ public class StoreSaleResVO {
private String colorName;
@ApiModelProperty(value = "尺码")
private Integer size;
@ApiModelProperty(value = "是否是标准尺码")
private Integer standard;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "销售条码")

4
xkt/src/main/java/com/ruoyi/xkt/dto/storeSale/StoreSaleResDTO.java
View File

@ -15,7 +15,7 @@ import java.util.List;
* @date 2025/3/27 15:12
*/
@Data
@Accessors(chain = true)
public class StoreSaleResDTO {
@ApiModelProperty(value = "是否为返单:true 是返单 false 不是返单")
@ -63,6 +63,8 @@ public class StoreSaleResDTO {
private String colorName;
@ApiModelProperty(value = "尺码")
private Integer size;
@ApiModelProperty(value = "是否是标准尺码")
private Integer standard;
@ApiModelProperty(value = "商品货号")
private String prodArtNum;
@ApiModelProperty(value = "销售条码")

18
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreSaleServiceImpl.java
View File

@ -56,6 +56,7 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
final StoreSaleRefundRecordDetailMapper refundRecordDetailMapper;
final IStoreProductStockService storeProdStockService;
final StoreProductMapper storeProdMapper;
final StoreProductColorSizeMapper prodColorSizeMapper;
/**
* 获取当前档口客户的销售业绩
@ -383,14 +384,21 @@ public class StoreSaleServiceImpl implements IStoreSaleService {
if (!SecurityUtils.isAdmin() && !SecurityUtils.isStoreManagerOrSub(storeSale.getStoreId())) {
throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR);
}
StoreSaleResDTO storeSaleDTO = BeanUtil.toBean(storeSale, StoreSaleResDTO.class);
StoreSaleResDTO storeSaleDTO = BeanUtil.toBean(storeSale, StoreSaleResDTO.class).setStoreSaleId(storeSaleId);
// 查询销售出库明细
List<StoreSaleDetail> saleDetailList = this.storeSaleDetailMapper.selectList(new LambdaQueryWrapper<StoreSaleDetail>()
.eq(StoreSaleDetail::getStoreSaleId, storeSaleId).eq(StoreSaleDetail::getDelFlag, Constants.UNDELETED));
List<StoreProduct> storeProdList = this.storeProdMapper.selectByIds(saleDetailList.stream().map(StoreSaleDetail::getStoreProdId).collect(Collectors.toList()));
Map<Long, StoreProduct> storeProdMap = storeProdList.stream().collect(Collectors.toMap(StoreProduct::getId, x -> x));
storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> BeanUtil.toBean(x, StoreSaleResDTO.SSDetailDTO.class)).collect(Collectors.toList()));
return storeSaleDTO;
// 获取有哪些是标准尺码
List<StoreProductColorSize> standardSizeList = this.prodColorSizeMapper.selectList(new LambdaQueryWrapper<StoreProductColorSize>()
.in(StoreProductColorSize::getStoreProdId, saleDetailList.stream().map(StoreSaleDetail::getStoreProdId).collect(Collectors.toList()))
.eq(StoreProductColorSize::getDelFlag, Constants.UNDELETED));
Map<Long, Map<Integer, Integer>> sizeMap = standardSizeList.stream().collect(Collectors
.groupingBy(StoreProductColorSize::getStoreProdId, Collectors
.toMap(StoreProductColorSize::getSize, StoreProductColorSize::getStandard, (v1, v2) -> v2)));
return storeSaleDTO.setDetailList(saleDetailList.stream().map(x -> {
Map<Integer, Integer> tempSizeMap = sizeMap.getOrDefault(x.getStoreProdId(), new HashMap<>());
return BeanUtil.toBean(x, StoreSaleResDTO.SSDetailDTO.class).setStandard(tempSizeMap.get(x.getSize()));
}).collect(Collectors.toList()));
}
/**