修改

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -276,6 +276,11 @@ public class CorpsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "付款方式")
 	private String paymentType;
+	/**
+	 * 客户类型
+	 */
+	@ApiModelProperty(value = "客户类型")
+	private String corpType;
 
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsType.java

@@ -126,6 +126,11 @@ public class CorpsType implements Serializable {
 	@ApiModelProperty(value = "父级名称")
 	@TableField(exist = false)
 	private String parentName;
+	/**
+	 * 客户类型
+	 */
+	@ApiModelProperty(value = "客户类型")
+	private String corpType;
 
 
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -249,6 +249,12 @@ public class PriceBank implements Serializable {
 	 */
 		@ApiModelProperty(value = "推荐理由")
 		private String referrerReason;
+	/**
+	 * 英文描述
+	 */
+		@ApiModelProperty(value = "英文描述")
+		@TableField(exist = false)
+		private String cnameDescription;
 
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -45,6 +45,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="payment_type" property="paymentType"/>
+        <result column="corp_type" property="corpType"/>
     </resultMap>
 
 
@@ -61,6 +62,9 @@
         <if test="CorpsDesc.code!=null and CorpsDesc.code != ''">
             and code like CONCAT(CONCAT('%', #{CorpsDesc.code}), '%')
         </if>
+        <if test="CorpsDesc.corpType!=null and CorpsDesc.corpType != ''">
+            and corp_type = #{CorpsDesc.corpType}
+        </if>
         <if test="CorpsDesc.cname!=null and CorpsDesc.cname != ''">
             and cname like CONCAT(CONCAT('%', #{CorpsDesc.cname}), '%')
         </if>

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.xml

@@ -19,6 +19,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="corp_type" property="corpType"/>
     </resultMap>
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
         <id column="id" property="id"/>
@@ -65,6 +66,9 @@
             <if test="corpsType.id!=null">
                 and dept.id = #{corpsType.id}
             </if>
+            <if test="corpsType.corpType!=null and corpsType.corpType != ''">
+                and corp_type = #{corpsType.corpType}
+            </if>
             <if test="corpsType.cname!=null and corpsType.cname != ''">
                 and dept.cname like concat(concat('%',  #{corpsType.cname}),'%')
             </if>

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -94,12 +95,14 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getDateValidityEnd()),PriceBank::getEndTime,priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
-	/*	if (CollectionUtils.isNotEmpty(pages.getRecords())){
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
-				GoodsType goodsType = goodsDescClient.goodTypeId(item.getItemId());
-				item.setGoodsTypeName(goodsType.getCname());
+				R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
+				if (goodsDesc != null && goodsDesc.getData() != null){
+					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
+				}
 			});
-		}*/
+		}
 		return R.data(pages);
 	}
 
@@ -126,6 +129,14 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
+				if (goodsDesc != null && goodsDesc.getData() != null){
+					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

blade-service/trade-purchase/pom.xml

@@ -87,6 +87,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-mocha-item-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -2,6 +2,7 @@ package com.trade.purchase.order.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -35,6 +36,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.mocha.feign.IPriceBankClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.system.user.entity.User;
@@ -70,6 +72,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private IStockGoodsClient stockGoodsClient;
 	private OrderItemsMapper orderItemsMapper;
 	private IOrderFreightService orderFreightService;
+	private IPriceBankClient priceBankClient;
 
 
 
@@ -344,6 +347,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setUpdateTime(new Date());
 		submitDto.setUpdateUser(SecureUtil.getUserId());
 		baseMapper.updateById(submitDto);
+		Order order = baseMapper.selectById(submitDto.getId());//获取元报价单信息
+		BeanUtil.copy(order,submitDto);
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = this.getOrderItems(submitDto.getId(),SecureUtil.getUserId());
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
@@ -487,10 +492,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
 		if (CollectionUtils.isNotEmpty(list)){
 			list.stream().forEach(item ->{
-				OrderItems orderItems = new OrderItems();
-				orderItems.setId(item.getSrcId());
-				orderItems.setPurchaseAmount(item.getPurchaseAmount());
-				orderItemsService.updateById(orderItems);
+				priceBankClient.updatePrice(item.getItemId(),item.getPrice(),SecureUtil.getTenantId(),item.getCorpId(),item.getItemType(),OrderTypeEnum.PURCHASE.getType(),order.getTradeType());
 			});
 		}
 		vo.setItemsVOList(list.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
@@ -546,12 +548,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			BigDecimal reduce = list.stream().map(OrderFreight::getOceanFreight).reduce(BigDecimal.ZERO, BigDecimal::add);
 			submitDto.setReferenceOceanFreight(reduce);
 		}
-		baseMapper.updateById(submitDto);//更新原询价单信息
+		baseMapper.updateById(submitDto);//更新原报价单信息
+		Order order = baseMapper.selectById(submitDto.getId());//获取元报价单信息
+		BeanUtil.copy(order,submitDto);
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = this.getOrderItems(submitDto.getId(),SecureUtil.getUserId());
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
-			submitDto.setItemsVOList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
+			submitDto.setOrderItemsList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
 		}
+
+
 		return R.data(submitDto);
 	}