Merge branch 'develop' of http://git.huaperfect.com/without_auth/meibuyu-rpc into develop

# Conflicts:
#	src/Service/Interfaces/Supply/SupplyServiceInterface.php

src/Service/Interfaces/DatacenterNew/RateServiceInterface.php

@@ -27,4 +27,25 @@ interface RateServiceInterface
      * @author Zero
      */
     public function getRateList(array $codes=[],  array $month = []);
+
+
+    /**
+     * 获取对应品名对应的毛利率
+     * @param $productNameIds array 品名 ID
+     * @param $year string 年份
+     * @param string $month 月份，默认是当月
+     * @param bool $keyed 返回是否要按照 porudctNameIds 作为 key
+     * @return array
+     */
+    public function getGrossRateByProductNameIds($productNameIds, $year, $month = '', $keyed = true): array;
+
+
+    /***
+     * 根据 currency code 和策略获取对应月份或者日期的汇率。
+     * @param string $currencyCode
+     * @param string $month
+     * @param string $day
+     * @return mixed
+     */
+    function getRateByCurrencyCodeAndSetting(string $currencyCode, string $month = '', string $day = '');
 }
\ No newline at end of file

src/Service/Interfaces/Order/OrderLogisticsServiceInterface.php

+<?php
+/**
+ * 订单物流部分
+ *
+ * @author zhangdongying
+ * @date   2023-11-17
+ */
+declare(strict_types=1);
+
+namespace Meibuyu\Rpc\Service\Interfaces\Order;
+
+interface OrderLogisticsServiceInterface
+{
+    /**
+     * 同步渠道信息
+     *
+     * @param array $channel 渠道信息，['channel_id'=>1,'channel_name'=>'','logistics_id'=>2,'ship_type_id'=>3]
+     * @return bool
+     */
+    public function syncChannel(array $channel): bool;
+}
\ No newline at end of file

src/Service/Interfaces/ProductDevelop/SpecimenServiceInterface.php

@@ -38,4 +38,12 @@ interface SpecimenServiceInterface
      * @author chentianyu
      */
     public function batchProductReturnListNew($params);
+
+
+
+    /**
+     * 写入新品开发日志
+     */
+    public function insertProductDevelopLog($params);
+    
 }
\ No newline at end of file

src/Service/Interfaces/Supply/SupplyServiceInterface.php

@@ -7,8 +7,6 @@
 namespace Meibuyu\Rpc\Service\Interfaces\Supply;
 
 
-use App\Model\Supplier;
-
 interface SupplyServiceInterface
 {
 
@@ -105,4 +103,13 @@ interface SupplyServiceInterface
      */
     public function getPurchaseValueAddedInvoicingListByRelatedIds($ids);
 
+
+    /**
+     * 获取供应商列表（通过供应商ID）
+     *
+     * @param array $ids 供应商ID数组
+     * @param array $columns 字段数组
+     * @return array keyBy('id')
+     */
+    public function getSupplierListByIds(array $ids, array $columns = ['*']): array;
 }
\ No newline at end of file