贸易修改

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/feign/IPriceItemClient.java

@@ -19,7 +19,7 @@ public interface IPriceItemClient {
 	String API_PREFIX = "/client";
 	String UPDATE_PRICE_ITEM = API_PREFIX + "/updatePriceItem";
 	String GET_MARKET_PRICE = API_PREFIX + "/getMarketPrice";
-	String GET_PURCHASE_PRICE = API_PREFIX + "/getPURCHAEPrice";
+	String GET_PURCHASE_PRICE = API_PREFIX + "/getPurchasePrice";
 
 	/**
 	 * 修改价格管理的销售价格
@@ -35,16 +35,16 @@ public interface IPriceItemClient {
 
 	/**
 	 * 获取商品销售价格
-	 * @param priceItem
+	 * @param code
 	 * @return
 	 */
 	@GetMapping(GET_MARKET_PRICE)
-	R getMarketPrice(PriceItem priceItem);
+	R getMarketPrice(@RequestParam("code") String code);
 	/**
 	 * 获取商品采购价格
-	 * @param priceItem
+	 * @param code
 	 * @return
 	 */
 	@GetMapping(GET_PURCHASE_PRICE)
-	R getPURCHAEPrice(PriceItem priceItem);
+	R getPurchasePrice(@RequestParam("code") String code);
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/feign/PriceItemClient.java

@@ -46,39 +46,23 @@ public class PriceItemClient implements IPriceItemClient{
 
 	/**
 	 * 根据商品编码获取销售价格信息
-	 * @param priceItem
+	 * @param code
 	 * @return
 	 */
 	@Override
 	@GetMapping(GET_MARKET_PRICE)
-	public R getMarketPrice(PriceItem priceItem) {
-		List<BigDecimal> bigDecimalList = new ArrayList<>();
-		List<PriceItem> list = priceItemService.list(new QueryWrapper<PriceItem>().eq("code", priceItem.getCode()).eq("tenant_id", SecureUtil.getTenantId())
-			.eq("is_deleted", 0));
-		if (CollectionUtils.isNotEmpty(list)){
-			bigDecimalList = list.stream().map(PriceItem::getSalesPrice).collect(Collectors.toList());
-		}else {
-			bigDecimalList.add(new BigDecimal(BigInteger.ZERO));
-		}
-		return R.data(bigDecimalList);
+	public R getMarketPrice(String code) {
+		return R.data(priceItemService.getMarketPrice(SecureUtil.getTenantId(),code));
 	}
 
 	/**
 	 * 获取商品采购价格
-	 * @param priceItem
+	 * @param code
 	 * @return
 	 */
 	@Override
 	@GetMapping(GET_PURCHASE_PRICE)
-	public R getPURCHAEPrice(PriceItem priceItem) {
-		List<BigDecimal> bigDecimalList = new ArrayList<>();
-		List<PriceItem> list = priceItemService.list(new QueryWrapper<PriceItem>().eq("code", priceItem.getCode()).eq("tenant_id", SecureUtil.getTenantId())
-			.eq("is_deleted", 0));
-		if (CollectionUtils.isNotEmpty(list)){
-			bigDecimalList = list.stream().map(PriceItem::getPurchasePrice).collect(Collectors.toList());
-		}else {
-			bigDecimalList.add(new BigDecimal(BigInteger.ZERO));
-		}
-		return R.data(bigDecimalList);
+	public R getPurchasePrice(String code) {
+		return R.data(priceItemService.getPurchasePrice(SecureUtil.getTenantId(),code));
 	}
 }

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

@@ -16,11 +16,13 @@
  */
 package org.springblade.mocha.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.mocha.entity.PriceItem;
 import org.springblade.mocha.vo.PriceItemVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 价格管理明细表 Mapper 接口
@@ -39,4 +41,21 @@ public interface PriceItemMapper extends BaseMapper<PriceItem> {
 	 */
 	List<PriceItemVO> selectPriceItemPage(IPage page, PriceItemVO priceItem);
 
+	/**
+	 * 	/**获取商品销售价格
+	 * @param tenantId
+	 * @param code
+	 * @return
+	 */
+	List<Map<String,Object>> getMarketPrice(@Param("tenantId") String tenantId,
+											@Param("code") String code);
+	/**
+	 *获取商品采购价格
+	 * @param tenantId
+	 * @param code
+	 * @return
+	 */
+	List<Map<String,Object>> getPurchasePrice(@Param("tenantId") String tenantId,
+											@Param("code") String code);
+
 }

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

@@ -36,5 +36,21 @@
     <select id="selectPriceItemPage" resultMap="priceItemResultMap">
         select * from basic_price_item where is_deleted = 0
     </select>
+    <select id="getMarketPrice" resultType="map">
+        select
+        DISTINCT
+        IFNULL(sales_price,0) AS salesPrice
+        from basic_price_item where is_deleted = 0
+        and tenant_id = #{tenantId}
+        and code = #{code}
+    </select>
+    <select id="getPurchasePrice" resultType="map">
+        select
+        DISTINCT
+	    IFNULL(purchase_price,0) AS purchasePrice
+	    from basic_price_item where is_deleted = 0
+        and tenant_id = #{tenantId}
+        and code = #{code}
+    </select>
 
 </mapper>

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

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 价格管理明细表 服务类
@@ -72,5 +73,19 @@ public interface IPriceItemService extends IService<PriceItem> {
 	 * @return
 	 */
 	R updatePriceItem(String code, BigDecimal price, String tenantId);
+	/**
+	 * 	/**获取商品销售价格
+	 * @param tenantId
+	 * @param code
+	 * @return
+	 */
+	List<Map<String,Object>> getMarketPrice(String tenantId, String code);
+	/**
+	 *获取商品采购价格
+	 * @param tenantId
+	 * @param code
+	 * @return
+	 */
+	List<Map<String,Object>> getPurchasePrice(String tenantId,String code);
 
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/PriceItemServiceImpl.java

@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 价格管理明细表 服务实现类
@@ -170,4 +171,14 @@ public class PriceItemServiceImpl extends ServiceImpl<PriceItemMapper, PriceItem
 		queryWrapper.eq(PriceItem::getTenantId,tenantId);
 		return R.data(baseMapper.update(priceItem,queryWrapper));
 	}
+
+	@Override
+	public List<Map<String, Object>> getMarketPrice(String tenantId, String code) {
+		return baseMapper.getMarketPrice(tenantId,code);
+	}
+
+	@Override
+	public List<Map<String, Object>> getPurchasePrice(String tenantId, String code) {
+		return baseMapper.getPurchasePrice(tenantId,code);
+	}
 }