达沃特修改,商品所属公司多选，导入订单明细添加返回字段

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -164,7 +164,7 @@ public class GoodsDescController extends BladeController {
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
 		if (StringUtils.isNotEmpty(artsVision)){
-			goodsDescLambdaQueryWrapper.and(i -> i.eq(GoodsDesc::getArtsVision,artsVision).or().isNull(GoodsDesc::getArtsVision));
+			goodsDescLambdaQueryWrapper.and(i -> i.like(GoodsDesc::getArtsVision,artsVision).or().isNull(GoodsDesc::getArtsVision));
 		}
 		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
 		Page<GoodsDesc> page = new Page<>(current, size);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -120,6 +120,9 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 				orderItems.setItemId(goods.getData().getId());//商品id
 				orderItems.setTypeno(goods.getData().getTypeno());//商品规格
 				orderItems.setItemType(goods.getData().getTypeno());//商品规格
+				orderItems.setIntegralMultiples(goods.getData().getIntegralMultiples());//积分倍数
+				orderItems.setBrandItem(goods.getData().getBrandItem());//花纹
+				orderItems.setSize(goods.getData().getSize());//尺寸
 				orderItems.setPriceCategory("一般");//价格类别
 				orderItems.setCorpId(goods.getData().getCorpId());//供应id
 				orderItems.setCorpName(goods.getData().getCorpName());//供应商名称

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -472,7 +472,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional
 	public R createMarket(Order order) {
 		// 先获取订单明细有多少个供应商
-		List<OrderItems> orderItemsList = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", order.getId()).eq("is_deleted", 0).groupBy("corp_id"));
+		List<OrderItems> orderItemsList = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", order.getId()).eq("good_type", 0).eq("is_deleted", 0).groupBy("corp_id"));
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
 			orderItemsList.forEach(item -> {
 				Order selectById = baseMapper.selectById(order.getId());