|
|
|
@ -36,6 +36,7 @@ import org.springframework.util.ObjectUtils; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.*; |
|
|
|
import java.util.concurrent.CopyOnWriteArrayList; |
|
|
|
import java.util.regex.Matcher; |
|
|
|
import java.util.regex.Pattern; |
|
|
|
|
|
|
|
@ -493,6 +494,11 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
@Override |
|
|
|
public Page<SaleNoWorkerVO> getSaleByCompanyId(SalePageQuery salePageQuery) { |
|
|
|
final Page<SaleNoWorkerVO> page = new Page<>(salePageQuery.getPageNum(), salePageQuery.getPageSize()); |
|
|
|
//结束时间-1天
|
|
|
|
if(StringUtils.isNotEmpty(salePageQuery.getEndDate())){ |
|
|
|
String endDate = DateUtil.addDay(salePageQuery.getEndDate(), 1); |
|
|
|
salePageQuery.setEndDate(endDate); |
|
|
|
} |
|
|
|
final Page<SaleNoWorkerVO> saleNoWorkerVOPage = saleMapper.getSaleByCompanyId(page, salePageQuery); |
|
|
|
return saleNoWorkerVOPage; |
|
|
|
} |
|
|
|
@ -554,10 +560,12 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<SaleDetailDTO> buyAi(String aiMsg) { |
|
|
|
public JSONObject buyAi(String aiMsg) { |
|
|
|
JSONObject returnJsonObject = new JSONObject(); |
|
|
|
// 叉转X 文本纠错 使用正则表达式替换单个或多个连续的“叉”字符
|
|
|
|
aiMsg = replaceAllX(aiMsg); |
|
|
|
final List<SaleDetailDTO> saleDetailDTOS = new ArrayList<>(); |
|
|
|
final CopyOnWriteArrayList<String> aiNotRecognitionList = new CopyOnWriteArrayList<>(); |
|
|
|
// shopId从缓存中设置
|
|
|
|
final String shopId = securityUtil.getShopId(); |
|
|
|
try { |
|
|
|
@ -595,6 +603,36 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
final List<SaleDetailQueryDTO> saleDetailQueryDTOS = new ArrayList<>(); |
|
|
|
final String attributeList = object.getString("attributeList"); |
|
|
|
final JSONArray attributeListJsonArray = JSON.parseArray(attributeList); |
|
|
|
// 获取商品分类及规格信息
|
|
|
|
final List<String> categoryIdList = new ArrayList<>(); |
|
|
|
categoryIdList.add(categoryId); |
|
|
|
final List<ProductCategoryVo> shopCategory = productCategoryService.getShopCategory(categoryIdList); |
|
|
|
final ProductCategoryVo productCategoryVo = shopCategory.get(0); |
|
|
|
final List<ProductAttributeOfAddVo> productAttributeOfAddVos = productCategoryVo.getProductAttributeOfAddVos(); |
|
|
|
final Map<String, ProductAttributeOfAddVo> productAttributeOfAddVoMap = new HashMap<>(); |
|
|
|
for (ProductAttributeOfAddVo productAttributeOfAddVo : productAttributeOfAddVos) { |
|
|
|
productAttributeOfAddVoMap.put(productAttributeOfAddVo.getAttributeName(), productAttributeOfAddVo); |
|
|
|
} |
|
|
|
//获取颜色及规格进行拼接
|
|
|
|
List<ProductAttributeValueVo> colorProductAttributeValueVoList = new ArrayList<>(); |
|
|
|
List<ProductAttributeValueVo> sizeProductAttributeValueVoList = new ArrayList<>(); |
|
|
|
if (productAttributeOfAddVoMap.containsKey("颜色")) { |
|
|
|
colorProductAttributeValueVoList = productAttributeOfAddVoMap.get("颜色").getProductAttributeValueVoList(); |
|
|
|
} |
|
|
|
// 将所有颜色放到一个集合中
|
|
|
|
final CopyOnWriteArrayList<String> colorList = new CopyOnWriteArrayList<>(); |
|
|
|
for (ProductAttributeValueVo productAttributeValueVo : colorProductAttributeValueVoList) { |
|
|
|
colorList.add(productAttributeValueVo.getValue()); |
|
|
|
} |
|
|
|
if (productAttributeOfAddVoMap.containsKey("尺码")) { |
|
|
|
sizeProductAttributeValueVoList = productAttributeOfAddVoMap.get("尺码").getProductAttributeValueVoList(); |
|
|
|
} |
|
|
|
// 将所有尺码放到一个集合中
|
|
|
|
final CopyOnWriteArrayList<String> sizeList = new CopyOnWriteArrayList<>(); |
|
|
|
for (ProductAttributeValueVo productAttributeValueVo : sizeProductAttributeValueVoList) { |
|
|
|
sizeList.add(productAttributeValueVo.getValue()); |
|
|
|
} |
|
|
|
|
|
|
|
for (int j = 0; j < attributeListJsonArray.size(); j++) { |
|
|
|
final JSONObject attributeListObject = attributeListJsonArray.getJSONObject(j); |
|
|
|
String color = attributeListObject.getString("color").toUpperCase(); |
|
|
|
@ -610,26 +648,8 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
size += '码'; |
|
|
|
} |
|
|
|
size = size.toUpperCase(); |
|
|
|
// if (color.contains("所有") && size.contains("所有")) {
|
|
|
|
|
|
|
|
if ("SYYS色".equals(color) && "SYCM码".equals(size)) { |
|
|
|
final List<String> categoryIdList = new ArrayList<>(); |
|
|
|
categoryIdList.add(categoryId); |
|
|
|
final List<ProductCategoryVo> shopCategory = productCategoryService.getShopCategory(categoryIdList); |
|
|
|
final ProductCategoryVo productCategoryVo = shopCategory.get(0); |
|
|
|
final List<ProductAttributeOfAddVo> productAttributeOfAddVos = productCategoryVo.getProductAttributeOfAddVos(); |
|
|
|
final Map<String, ProductAttributeOfAddVo> productAttributeOfAddVoMap = new HashMap<>(); |
|
|
|
for (ProductAttributeOfAddVo productAttributeOfAddVo : productAttributeOfAddVos) { |
|
|
|
productAttributeOfAddVoMap.put(productAttributeOfAddVo.getAttributeName(), productAttributeOfAddVo); |
|
|
|
} |
|
|
|
//获取颜色及规格进行拼接
|
|
|
|
List<ProductAttributeValueVo> colorProductAttributeValueVoList = new ArrayList<>(); |
|
|
|
List<ProductAttributeValueVo> sizeProductAttributeValueVoList = new ArrayList<>(); |
|
|
|
if (productAttributeOfAddVoMap.containsKey("颜色")) { |
|
|
|
colorProductAttributeValueVoList = productAttributeOfAddVoMap.get("颜色").getProductAttributeValueVoList(); |
|
|
|
} |
|
|
|
if (productAttributeOfAddVoMap.containsKey("尺码")) { |
|
|
|
sizeProductAttributeValueVoList = productAttributeOfAddVoMap.get("尺码").getProductAttributeValueVoList(); |
|
|
|
} |
|
|
|
for (ProductAttributeValueVo productAttributeValueVo : colorProductAttributeValueVoList) { |
|
|
|
for (ProductAttributeValueVo attributeValueVo : sizeProductAttributeValueVoList) { |
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
@ -645,71 +665,75 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
// 所有颜色,所有尺码
|
|
|
|
} |
|
|
|
if ("SYYS色".equals(color)) { |
|
|
|
// 所有颜色，固定尺码
|
|
|
|
final List<String> categoryIdList = new ArrayList<>(); |
|
|
|
categoryIdList.add(categoryId); |
|
|
|
final List<ProductCategoryVo> shopCategory = productCategoryService.getShopCategory(categoryIdList); |
|
|
|
final ProductCategoryVo productCategoryVo = shopCategory.get(0); |
|
|
|
final List<ProductAttributeOfAddVo> productAttributeOfAddVos = productCategoryVo.getProductAttributeOfAddVos(); |
|
|
|
final Map<String, ProductAttributeOfAddVo> productAttributeOfAddVoMap = new HashMap<>(); |
|
|
|
for (ProductAttributeOfAddVo productAttributeOfAddVo : productAttributeOfAddVos) { |
|
|
|
productAttributeOfAddVoMap.put(productAttributeOfAddVo.getAttributeName(), productAttributeOfAddVo); |
|
|
|
} |
|
|
|
//获取颜色及规格进行拼接
|
|
|
|
List<ProductAttributeValueVo> colorProductAttributeValueVoList = new ArrayList<>(); |
|
|
|
if (productAttributeOfAddVoMap.containsKey("颜色")) { |
|
|
|
colorProductAttributeValueVoList = productAttributeOfAddVoMap.get("颜色").getProductAttributeValueVoList(); |
|
|
|
} |
|
|
|
for (ProductAttributeValueVo productAttributeValueVo : colorProductAttributeValueVoList) { |
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
final String attribute = "{\"颜色\":\"" + productAttributeValueVo.getValue() + "\",\"尺码\":\"" + size + "\"}"; |
|
|
|
saleDetailQueryDTO.setAttributeList(attribute); |
|
|
|
saleDetailQueryDTO.setProductCount(productCount); |
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(attribute, null)); |
|
|
|
saleDetailDTO.setProductCount(saleDetailDTO.getProductCount() + productCount); |
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
|
if (sizeList.contains(size)) { |
|
|
|
// 所有颜色，固定尺码
|
|
|
|
for (ProductAttributeValueVo productAttributeValueVo : colorProductAttributeValueVoList) { |
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
final String attribute = "{\"颜色\":\"" + productAttributeValueVo.getValue() + "\",\"尺码\":\"" + size + "\"}"; |
|
|
|
saleDetailQueryDTO.setAttributeList(attribute); |
|
|
|
saleDetailQueryDTO.setProductCount(productCount); |
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(attribute, null)); |
|
|
|
saleDetailDTO.setProductCount(saleDetailDTO.getProductCount() + productCount); |
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
|
} |
|
|
|
} else { |
|
|
|
final String msg = "商品：" + product.getProductName() + "，尺码：" + size + "，不存在"; |
|
|
|
aiNotRecognitionList.add(msg); |
|
|
|
} |
|
|
|
|
|
|
|
continue; |
|
|
|
} |
|
|
|
if ("SYCM码".equals(size)) { |
|
|
|
// 所有尺码，固定颜色
|
|
|
|
final List<String> categoryIdList = new ArrayList<>(); |
|
|
|
categoryIdList.add(categoryId); |
|
|
|
final List<ProductCategoryVo> shopCategory = productCategoryService.getShopCategory(categoryIdList); |
|
|
|
final ProductCategoryVo productCategoryVo = shopCategory.get(0); |
|
|
|
final List<ProductAttributeOfAddVo> productAttributeOfAddVos = productCategoryVo.getProductAttributeOfAddVos(); |
|
|
|
final Map<String, ProductAttributeOfAddVo> productAttributeOfAddVoMap = new HashMap<>(); |
|
|
|
for (ProductAttributeOfAddVo productAttributeOfAddVo : productAttributeOfAddVos) { |
|
|
|
productAttributeOfAddVoMap.put(productAttributeOfAddVo.getAttributeName(), productAttributeOfAddVo); |
|
|
|
} |
|
|
|
//获取颜色及规格进行拼接
|
|
|
|
List<ProductAttributeValueVo> sizeProductAttributeValueVoList = new ArrayList<>(); |
|
|
|
if (productAttributeOfAddVoMap.containsKey("尺码")) { |
|
|
|
sizeProductAttributeValueVoList = productAttributeOfAddVoMap.get("尺码").getProductAttributeValueVoList(); |
|
|
|
} |
|
|
|
for (ProductAttributeValueVo attributeValueVo : sizeProductAttributeValueVoList) { |
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
final String attribute = "{\"颜色\":\"" + color + "\",\"尺码\":\"" + attributeValueVo.getValue() + "\"}"; |
|
|
|
saleDetailQueryDTO.setAttributeList(attribute); |
|
|
|
saleDetailQueryDTO.setProductCount(productCount); |
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(attribute, null)); |
|
|
|
saleDetailDTO.setProductCount(saleDetailDTO.getProductCount() + productCount); |
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
|
if (colorList.contains(color)) { |
|
|
|
// 所有尺码，固定颜色
|
|
|
|
for (ProductAttributeValueVo attributeValueVo : sizeProductAttributeValueVoList) { |
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
final String attribute = "{\"颜色\":\"" + color + "\",\"尺码\":\"" + attributeValueVo.getValue() + "\"}"; |
|
|
|
saleDetailQueryDTO.setAttributeList(attribute); |
|
|
|
saleDetailQueryDTO.setProductCount(productCount); |
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(attribute, null)); |
|
|
|
saleDetailDTO.setProductCount(saleDetailDTO.getProductCount() + productCount); |
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
|
} |
|
|
|
} else { |
|
|
|
final String msg = "商品：" + product.getProductName() + "，颜色：" + color + "，不存在"; |
|
|
|
aiNotRecognitionList.add(msg); |
|
|
|
} |
|
|
|
|
|
|
|
continue; |
|
|
|
} |
|
|
|
// 不包含所有按照获取的拼接
|
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
final String attribute = "{\"颜色\":\"" + color + "\",\"尺码\":\"" + size + "\"}"; |
|
|
|
saleDetailQueryDTO.setAttributeList(attribute); |
|
|
|
saleDetailQueryDTO.setProductCount(productCount); |
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(attribute, null)); |
|
|
|
saleDetailDTO.setProductCount(saleDetailDTO.getProductCount() + productCount); |
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
|
if (colorList.contains(color) && sizeList.contains(size)) { |
|
|
|
// 不包含所有按照获取的拼接
|
|
|
|
final SaleDetailQueryDTO saleDetailQueryDTO = new SaleDetailQueryDTO(); |
|
|
|
final String attribute = "{\"颜色\":\"" + color + "\",\"尺码\":\"" + size + "\"}"; |
|
|
|
saleDetailQueryDTO.setAttributeList(attribute); |
|
|
|
saleDetailQueryDTO.setProductCount(productCount); |
|
|
|
saleDetailQueryDTO.setStockCount(stockMap.getOrDefault(attribute, null)); |
|
|
|
saleDetailDTO.setProductCount(saleDetailDTO.getProductCount() + productCount); |
|
|
|
saleDetailQueryDTOS.add(saleDetailQueryDTO); |
|
|
|
} else { |
|
|
|
// 封装颜色和尺码可能不存在的情况封装到返回结果中去
|
|
|
|
if (!colorList.contains(color) && !sizeList.contains(size)) { |
|
|
|
// 颜色和尺码都不存在
|
|
|
|
final String msg = "商品：" + product.getProductName() + "，颜色：" + color + "，尺码：" + size + "，颜色及尺码都不存在"; |
|
|
|
aiNotRecognitionList.add(msg); |
|
|
|
} else if (!colorList.contains(color)) { |
|
|
|
// 颜色不存在
|
|
|
|
final String msg = "商品：" + product.getProductName() + "，颜色：" + color + "，不存在"; |
|
|
|
aiNotRecognitionList.add(msg); |
|
|
|
} else if (!sizeList.contains(size)) { |
|
|
|
final String msg = "商品：" + product.getProductName() + "，尺码：" + size + "，不存在"; |
|
|
|
aiNotRecognitionList.add(msg); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
saleDetailDTO.setStockLogList1(saleDetailQueryDTOS); |
|
|
|
saleDetailDTOS.add(saleDetailDTO); |
|
|
|
} else { |
|
|
|
// 没查到去找下一个
|
|
|
|
final String msg = "货号为：" + productSn + "的商品，不存在"; |
|
|
|
aiNotRecognitionList.add(msg); |
|
|
|
// 没查到去找下一个
|
|
|
|
continue; |
|
|
|
} |
|
|
|
@ -720,7 +744,9 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa |
|
|
|
} catch (InputRequiredException e) { |
|
|
|
throw new RuntimeException(e); |
|
|
|
} |
|
|
|
return saleDetailDTOS; |
|
|
|
returnJsonObject.put("data",saleDetailDTOS); |
|
|
|
returnJsonObject.put("aiNotRecognition",String.join(";", aiNotRecognitionList)); |
|
|
|
return returnJsonObject; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
wangfukang
2 years ago