20230405 15:42

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IGoodsDescClient.java

@@ -32,6 +32,7 @@ public interface IGoodsDescClient {
 	String TERRAC_ECODE = API_PREFIX + "terraceCode";
 	String GET_TERRAC_ECODE = API_PREFIX + "getTerraceCode";
 	String GET_GOODS_DESC_DETIAL = API_PREFIX+ "getGoodsDescDetail";
+	String GET_GOODS_DESC = API_PREFIX+ "getGoodsDesc";
 	String GET_GOODS_DESC_BY_CNAME = API_PREFIX+ "getGoodsDescByCname";
 	String GOODS_ITEMSID = API_PREFIX+ "selectItemsIdGoods";
 	String GOODS_ALL = API_PREFIX+ "selectGoodsDescAll";
@@ -167,6 +168,16 @@ public interface IGoodsDescClient {
 	@GetMapping(GET_GOODS_DESC_DETIAL)
 	GoodsDesc getGoodsDescDetail(@RequestParam("Id") Long Id);
 
+	/**
+	 * 根据商品id租户号获取商品信息
+	 *
+	 * @param Id  商品id
+	 * @param tenantId  租户号
+	 * @return
+	 */
+	@GetMapping(GET_GOODS_DESC)
+	GoodsDesc getGoodsDesc(@RequestParam("Id") Long Id, @RequestParam("tenantId") String tenantId);
+
 
 	/**
 	 * 获取商品信息

blade-service/blade-client/src/main/java/org/springblade/client/goods/feign/GoodsDescClient.java

@@ -197,6 +197,18 @@ public class GoodsDescClient implements IGoodsDescClient {
 	}
 
 	/**
+	 * 根据商品id租户号获取商品信息
+	 *
+	 * @param id  商品id
+	 * @param tenantId  租户号
+	 * @return
+	 */
+	@Override
+	public GoodsDesc getGoodsDesc(Long id, String tenantId) {
+		return goodsDescService.getGoodsDesc(id, tenantId);
+	}
+
+	/**
 	 * 获取商品信息
 	 *
 	 * @param cname 商品名

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

@@ -111,6 +111,15 @@ public interface IGoodsDescService extends IService<GoodsDesc> {
 	 */
 	GoodsDescVO selectGoodsMessage(Long id);
 
+	/**
+	 * 根据商品id租户号获取商品信息
+	 *
+	 * @param id  商品id
+	 * @param tenantId  租户号
+	 * @return
+	 */
+	GoodsDescVO getGoodsDesc(Long id, String tenantId);
+
 	void modify(GoodsDesc goodsDesc);
 
 	/**

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -235,6 +235,27 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	}
 
 	@Override
+	public GoodsDescVO getGoodsDesc(Long id, String tenantId) {
+		GoodsDescVO goodsDescVO = baseMapper.selectGoodsMessage(id, tenantId);
+		if (ObjectUtils.isNotNull(goodsDescVO)) {
+			GoodsType goodsType = goodsTypeService.getById(goodsDescVO.getGoodsTypeId());
+			if (ObjectUtils.isNotNull(goodsType)) {
+				goodsDescVO.setGoodsTypeId(goodsType.getId() + "");
+				goodsDescVO.setGoodsTypeName(goodsType.getCname());
+			}
+			List<GoodsFiles> filesList = goodsFilesMapper.selectList(new LambdaQueryWrapper<GoodsFiles>()
+				.eq(GoodsFiles::getPid, id)
+				.eq(GoodsFiles::getIsDeleted, 0)
+			);
+			if (filesList.size() > 0) {
+				goodsDescVO.setUrl(filesList.get(0).getUrl());
+			}
+		}
+
+		return goodsDescVO;
+	}
+
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void modify(GoodsDesc goodsDesc) {
 		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1415,7 +1415,7 @@ public class ExportOrderController extends BladeController {
 				}
 			}
 			if (ObjectUtils.isNotNull(orderItems_.getItemId())) {
-				GoodsDesc goodsDesc = goodsDescClient.getGoodsDescDetail(orderItems_.getItemId());
+				GoodsDesc goodsDesc = goodsDescClient.getGoodsDesc(orderItems_.getItemId(), AuthUtil.getTenantId());
 				if (ObjectUtils.isNotNull(goodsDesc)) {
 					orderItems_.setCname(goodsDesc.getCname());
 					orderItems_.setCode(goodsDesc.getCode());

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

@@ -539,6 +539,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (order.getTradeType().equals(OrderTypeEnum.EXPORT.getType())) {
 			this.numToEnglish(order);
 		}
+		order.setStatus(baseMapper.selectById(order.getId()).getStatus());
 		return R.data(order);
 	}