yh

app/libs/controller/common/class.OverallController.php

@@ -119,8 +119,9 @@ class OverallController  extends AbstractApiController {
     }
 
     /**
-     * @api POST 同步全量跨境托管订单
+     * @api POST 同步商品
      * @param string searchKeyword 商品ID
+     * @param int mallId 店铺ID
      */
     public function syncGoodsSingle() {
         // TODO 同步接口
@@ -136,5 +137,22 @@ class OverallController  extends AbstractApiController {
         $consigneeInfo = $this->areaService->parseAddressInfo($_POST['addressStr'], $_POST['isMatchTown']);
         return $this->setData(['consigneeInfo' => $consigneeInfo])->renderSuccess();
     }
+
+    /**
+     * @api GET 检查同步结果
+     * @param array authMallIds 授权店铺id【不传默认当前授权登录店铺】
+     */
+    public function checkRsyncDataFinished() {
+        $data = [];
+        $data['isSyncingGoods'] = false;
+        $data['isSyncingOrder'] = false;
+        $data['isSyncingFulfillmentOrder'] = false;
+        $data['isSyncingFdsOrder'] = false;
+        $data['syncingGoodsMallIds'] = [];
+        $data['syncingOrderMallIds'] = [];
+        $data['syncingFulfillmentOrderMallIds'] = [];
+        $data['syncingFdsOrderMallIds'] = [];
+        return $this->renderSuccess($data);
+    }
 }
 

app/libs/controller/order/class.OrderPrintController.php

@@ -49,7 +49,8 @@ class OrderPrintController extends AbstractApiController {
      * @param string isExclude 区域搜索是否为排除，示例：0
      * @param string buyerMemo 买家备注
      * @param string sellerMemo 商家备注
-     * @param int[] sellerFlag 商家备注标签
+     * @param string remark 商家备注或买家备注
+     * @param int[] sellerFlag 商家备注标签(1/2/3/4/5)
      * @param int hasBuyerMemo 是否有留言(0/1)
      * @param int hasSellerMemo 是否有备注(0/1)
      * @param int hasSellerNote 是否有本地备注(0/1)

app/libs/daos/Order/OpOrderDao.php

@@ -279,6 +279,10 @@ class OpOrderDao extends AbstractDao {
 			$whereConditions[] = $this->prepare("AND o.`buyer_memo` = ''");
 		}
 
+        if (!empty($filter['remark'])) {
+			$whereConditions[] = $this->prepare("AND (o.`buyer_memo` LIKE %ss or o.`remark` LIKE %ss)", $filter['remark']);
+		}
+
         if (!empty($filter['sellerNote'])) {
             $whereConditions[] = $this->prepare("AND ooe.`seller_note` LIKE %ss", $filter['sellerNote']);
         }

app/libs/services/Order/OrderPrintService.php

@@ -299,6 +299,10 @@ class OrderPrintService extends AbstractService {
 		if (!empty($data['buyerMemo'])) {
 			$condition['buyerMemo'] = trim($data['buyerMemo']);
 		}
+
+		if (!empty($data['remark'])) {
+			$condition['remark'] = trim($data['remark']);
+		}
 		
 		if (array_key_exists($data['pExpressStatus'], OrderPrintConst::getAllKuaidiStatusMap(false))) {
 			$condition['pExpressStatus'] = trim($data['pExpressStatus']);