diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java
index 4d0c0d60..f3b08e5d 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/ReturnSaleController.java
@@ -33,6 +33,7 @@ import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -79,6 +80,9 @@ public class ReturnSaleController {
@Autowired
private CustomerService customerService;
+ @Autowired
+ private ProductService productService;
+
/*@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@@ -117,47 +121,59 @@ public class ReturnSaleController {
.groupBy("product_id");
final List
list = returnDetailService.selectByCondition1(queryWrapper);
final List saleDetailDTOS = new ArrayList<>();
- for (String productId : list) {
- final QueryWrapper queryPWrapper = new QueryWrapper<>();
- queryPWrapper.eq("return_sale_id", id).eq("product_id", productId);
- final List saleDetailList = returnDetailService.list(queryPWrapper);
- final List saleDetailQueryDTOS = new ArrayList<>();
- final SaleDetailDTO saleDetailDTO = new SaleDetailDTO();
-
- // 查询商品所有的库存
- final List stockList = stockService.getProductStock(productId);
- final Map stockMap = new HashMap<>();
- for (Stock stock : stockList) {
- stockMap.put(stock.getAttributeList(), stock.getStockCount());
- }
+ Map productMap = new HashMap<>();
+ // 获取商品
+ if(list != null && !list.isEmpty()){
+ final List productList = productService.getProductList(list);
+ // 将商品封装为map,key为商品id,value为商品信息
+ productMap = productList.stream().collect(Collectors.toMap(Product::getId, product -> product));
+ }
+ if (list != null) {
+ for (String productId : list) {
+ final QueryWrapper queryPWrapper = new QueryWrapper<>();
+ queryPWrapper.eq("return_sale_id", id).eq("product_id", productId);
+ final List saleDetailList = returnDetailService.list(queryPWrapper);
+ final List saleDetailQueryDTOS = new ArrayList<>();
+ final SaleDetailDTO saleDetailDTO = new SaleDetailDTO();
+
+ // 查询商品所有的库存
+ final List stockList = stockService.getProductStock(productId);
+ final Map stockMap = new HashMap<>();
+ for (Stock stock : stockList) {
+ stockMap.put(stock.getAttributeList(), stock.getStockCount());
+ }
- for (ReturnDetail returnDetail : saleDetailList) {
- saleDetailDTO.setProductId(productId);
- saleDetailDTO.setProductName(returnDetail.getProductName());
- saleDetailDTO.setUnit(returnDetail.getUnit());
- saleDetailDTO.setShopId(returnSale.getShopId());
- saleDetailDTO.setCategoryId(returnDetail.getCategoryId());
- saleDetailDTO.setSaleId(returnDetail.getSaleId());
- saleDetailDTO.setPrice(returnDetail.getPrice());
- saleDetailDTO.setWholesalePrice(returnDetail.getWholesalePrice());
- saleDetailDTO.setPurchasePrice(returnDetail.getPurchasePrice());
- saleDetailDTO.setDiscount(returnDetail.getDiscount());
- saleDetailDTO.setDiscountAmount(returnDetail.getDiscountAmount());
- saleDetailDTO.setRealPrice(returnDetail.getRealPrice());
- saleDetailDTO.setProductPicture(returnDetail.getProductPicture());
- saleDetailDTO.setProductSn(returnDetail.getProductSn());
-
- final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO();
- saleDetailQueryDTO.setAttributeList(returnDetail.getAttributeList());
- saleDetailQueryDTO.setProductCount(returnDetail.getProductCount());
-
- saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(saleDetailQueryDTO.getAttributeList(), null));
-
-
- saleDetailQueryDTOS.add(saleDetailQueryDTO);
+ for (ReturnDetail returnDetail : saleDetailList) {
+ saleDetailDTO.setProductId(productId);
+ saleDetailDTO.setProductName(returnDetail.getProductName());
+ saleDetailDTO.setUnit(returnDetail.getUnit());
+ saleDetailDTO.setShopId(returnSale.getShopId());
+ saleDetailDTO.setCategoryId(returnDetail.getCategoryId());
+ saleDetailDTO.setSaleId(returnDetail.getSaleId());
+ saleDetailDTO.setPrice(returnDetail.getPrice());
+ saleDetailDTO.setWholesalePrice(returnDetail.getWholesalePrice());
+ saleDetailDTO.setPurchasePrice(returnDetail.getPurchasePrice());
+ saleDetailDTO.setDiscount(returnDetail.getDiscount());
+ saleDetailDTO.setDiscountAmount(returnDetail.getDiscountAmount());
+ saleDetailDTO.setRealPrice(returnDetail.getRealPrice());
+ saleDetailDTO.setProductPicture(returnDetail.getProductPicture());
+ saleDetailDTO.setProductSn(returnDetail.getProductSn());
+
+ // 获取商品的专属分类值
+ if(productMap.containsKey(productId)){
+ saleDetailDTO.setAttrId(productMap.get(productId).getAttrId());
+ }
+ final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO();
+ saleDetailQueryDTO.setAttributeList(returnDetail.getAttributeList());
+ saleDetailQueryDTO.setProductCount(returnDetail.getProductCount());
+
+ saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(saleDetailQueryDTO.getAttributeList(), null));
+
+ saleDetailQueryDTOS.add(saleDetailQueryDTO);
+ }
+ saleDetailDTO.setStockLogList1(saleDetailQueryDTOS);
+ saleDetailDTOS.add(saleDetailDTO);
}
- saleDetailDTO.setStockLogList1(saleDetailQueryDTOS);
- saleDetailDTOS.add(saleDetailDTO);
}
saleReturnVO.setSaleDetailDTOList(saleDetailDTOS);
//增加客户信息明细
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java
index 732128f8..56571e61 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/ReturnDetail.java
@@ -1,10 +1,12 @@
package cc.hiver.mall.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.persistence.Transient;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -78,5 +80,10 @@ public class ReturnDetail implements Serializable {
@ApiModelProperty(value = "货号")
private String productSn;
+ @Transient
+ @TableField(exist = false)
+ @ApiModelProperty(value = "商品专属分类id")
+ private String attrId;
+
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/PurchaseServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/PurchaseServiceImpl.java
index b43a6f9e..2b3e2332 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/PurchaseServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/PurchaseServiceImpl.java
@@ -177,6 +177,7 @@ public class PurchaseServiceImpl extends ServiceImpl i
purchaseDetail.setWholesalePrice(product.getWholesalePrice());
purchaseDetail.setPurchasePrice(product.getPurchasePrice());
purchaseDetail.setCustomerCategoryRule(product.getCustomerCategoryRule());
+ purchaseDetail.setAttrId(product.getAttrId());
}
}
purchaseVo.setPurchaseDetails(purchaseDetails);