Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

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

@@ -209,12 +209,31 @@ public class PriceBank implements Serializable {
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		@TableLogic
 		private Integer isDeleted;
-		/**
-	 	* 商品类别中文名
-		 */
+	/**
+	 * 汇率
+	 */
+		@ApiModelProperty(value = "汇率")
+		private BigDecimal exchangeRate;
+	/**
+	 * 美元价格
+	 */
+		@ApiModelProperty(value = "美元价格")
+		private BigDecimal greenback;
+	/**
+	 * 税率
+	 */
+		@ApiModelProperty(value = "税率")
+		private BigDecimal taxRate;
+	/**
+	 * 商品类别中文名
+	*/
 		@ApiModelProperty(value = "商品类别中文名")
-		@TableField(exist = false)
 		private String goodsTypeName;
+	/**
+	 * 采购金额
+	 */
+		@ApiModelProperty(value = "采购金额")
+		private BigDecimal purchaseAmount;
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -360,5 +360,15 @@ public class OrderItems implements Serializable {
 	@ApiModelProperty(value = "配件信息")
 	@TableField(exist = false)
 	private List<OrderParts> partsList;
+	/**
+	 * 配件描述
+	 */
+	@ApiModelProperty(value = "配件描述")
+	private String partsDescribe;
+	/**
+	 * 配件价格描述
+	 */
+	@ApiModelProperty(value = "配件价格描述")
+	private String partsPriceDescribe;
 
 }

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

@@ -86,12 +86,12 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getStatusTime()),PriceBank::getEndTime,priceBank.getStatusTime());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		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());
 			});
-		}
+		}*/
 		return R.data(pages);
 	}
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/mapper/PriceBankMapper.xml

@@ -5,7 +5,6 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="priceBankResultMap" type="org.springblade.mocha.entity.PriceBank">
         <id column="id" property="id"/>
-        <result column="pid" property="pid"/>
         <result column="item_id" property="itemId"/>
         <result column="code" property="code"/>
         <result column="cname" property="cname"/>
@@ -37,6 +36,11 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="good_nature" property="goodNature"/>
+        <result column="exchange_rate" property="exchangeRate"/>
+        <result column="greenback" property="greenback"/>
+        <result column="goods_type_name" property="goodsTypeName"/>
+        <result column="tax_rate" property="taxRate"/>
+        <result column="purchase_amount" property="purchaseAmount"/>
     </resultMap>
 
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -58,6 +58,8 @@
         <result column="priority_referrer" property="priorityReferrer"/>
         <result column="referrer_reason" property="referrerReason"/>
         <result column="corp_name" property="corpName"/>
+        <result column="parts_describe" property="partsDescribe"/>
+        <result column="parts_price_describe" property="partsPriceDescribe"/>
     </resultMap>