商品api修改

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

@@ -28,7 +28,7 @@ public interface IGoodsDescClient {
 	 * @return
 	 */
 	@GetMapping(GOODSD_ESCMESSAGE)
-	R<GoodsDesc> selectGoodsMessage(@RequestParam("Id") Long Id);
+	R<GoodsDescVO> selectGoodsMessage(@RequestParam("Id") Long Id);
 
 	/**
 	 * 获取所有商品基础信息

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

@@ -37,7 +37,7 @@ public class GoodsDescClient implements IGoodsDescClient {
 	 */
 	@Override
 	@GetMapping(GOODSD_ESCMESSAGE)
-	public R<GoodsDesc> selectGoodsMessage(Long id) {
+	public R<GoodsDescVO> selectGoodsMessage(Long id) {
 		return R.data(goodsDescService.selectGoodsMessage(id));
 	}
 

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

@@ -52,6 +52,6 @@ public interface GoodsDescMapper extends BaseMapper<GoodsDesc> {
 	 * @param Id
 	 * @return
 	 */
-	GoodsDesc selectGoodsMessage(@Param("Id") Long Id);
+	GoodsDescVO selectGoodsMessage(@Param("Id") Long Id);
 
 }

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

@@ -76,7 +76,7 @@ public interface IGoodsDescService extends IService<GoodsDesc> {
 	 * @param Id
 	 * @return
 	 */
-	GoodsDesc selectGoodsMessage(Long Id);
+	GoodsDescVO selectGoodsMessage(Long Id);
 
 	void modify(GoodsDesc goodsDesc);
 }

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

@@ -169,7 +169,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	}
 
 	@Override
-	public GoodsDesc selectGoodsMessage(Long Id) {
+	public GoodsDescVO selectGoodsMessage(Long Id) {
 		return baseMapper.selectGoodsMessage(Id);
 	}
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.deliver.goods.entity.Delivery;
@@ -87,7 +88,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			deliveryItemsList.stream().forEach(item ->{
 				if (item.getItemId() != null){
 					//获取商品编码,名称,规格编码,规格型号
-					R<GoodsDesc> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
 					if (goodsMessage.isSuccess() && goodsMessage.getData() != null){
 						item.setCode(goodsMessage.getData().getCode());
 						item.setCname(goodsMessage.getData().getCname());

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

@@ -22,6 +22,7 @@ import lombok.AllArgsConstructor;
 import org.aspectj.weaver.ast.Or;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.Order;
@@ -96,7 +97,7 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 			orderItemsList.stream().forEach(item ->{
 				if (item.getItemId() != null){
 					//获取商品编码,名称,规格编码,规格型号
-					R<GoodsDesc> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
 					if (goodsMessage.isSuccess() && goodsMessage.getData() != null){
 						item.setCode(goodsMessage.getData().getCode());
 						item.setCname(goodsMessage.getData().getCname());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -365,7 +365,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		orderItemsList.forEach(item -> {
 			if (item.getItemId() != null) {
 				//获取商品编码,名称,规格编码,规格型号
-				R<GoodsDesc> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+				R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
 				if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
 					Optional<GoodsDescVO> first = goodsDescVOList.stream().filter(goods -> Objects.equals(goods.getId(), item.getItemId()))
 						.findFirst();