轮胎商城：小程序优化后品牌接口需要增加图片地址

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -47,7 +47,9 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 配件批发品牌表控制器
@@ -363,6 +365,26 @@ public class BrandDescController extends BladeController {
 			lambdaQueryWrapper.eq(PjBrandDesc::getSalesCompanyId, AuthUtil.getDeptId());//公司
 		}
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
+		if (!list.isEmpty()) {
+			List<Long> idList = list.stream().map(PjBrandDesc::getId).collect(Collectors.toList());
+			List<PjBrandFiles> brandFilesList = brandFilesService.list(new LambdaQueryWrapper<PjBrandFiles>()
+				.eq(PjBrandFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(PjBrandFiles::getIsDeleted, 0)
+				.in(PjBrandFiles::getPid, idList)
+				.eq(PjBrandFiles::getVersion, 0));
+			for (PjBrandDesc item : list) {
+				if (!brandFilesList.isEmpty()) {
+					List<PjBrandFiles> brandFiles = brandFilesList.stream().filter(e -> e.getPid().equals(item.getId())).collect(Collectors.toList());
+					if (!brandFiles.isEmpty()) {
+						item.setBrandFilesList(brandFiles);
+					} else {
+						item.setBrandFilesList(new ArrayList<>());
+					}
+				} else {
+					item.setBrandFilesList(new ArrayList<>());
+				}
+			}
+		}
 		return R.data(list);
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -4869,6 +4869,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						//计算成本
 						goodsName.append(goodsDesc.getCname()).append(",");
 						retrieval.append(goodsDesc.getCnameInt()).append(",");
+						if(ObjectUtils.isNull(item.getSendNum())){
+							item.setSendNum(new BigDecimal("0.00"));
+						}
 						if (new BigDecimal("0.00").compareTo(item.getSendNum()) == 0){
 							item.setCostprie(item.getGoodsNum().multiply(inventoryCostPrice));
 							item.setCostpriePrice(inventoryCostPrice);