同步:增加组团社错误的备注提示; 修正删除收款记录的类型[地接代收,地接社代收]

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -369,7 +369,7 @@ class TulanduoApi extends CI_Controller
             ,"GCI_leaveDate"  => $detail_jsonResp->orderDetail->leaveDate
             ,"GCI_createTime" => date('Y-m-d H:i:s')
         );
-        $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
+        $gci_info = $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
         /** GRoupInfo */
         $coli_groupcode_ht = analysis_groupCode($getInfo_byGroupCode->COLI_GroupCode);
         $groupcode_ht = $coli_groupcode_ht['cut'];
@@ -395,6 +395,12 @@ class TulanduoApi extends CI_Controller
         $new_memo = trim($detail_jsonResp->orderDetail->orderRemark)=="" ? $old_memo : $old_memo . " orderRemark\r\n" . $detail_jsonResp->orderDetail->orderRemark . "\r\n";
         $old_detail = mb_strstr($coli_orderdetailtext, " operations", true)!==false ? mb_strstr($coli_orderdetailtext, " operations", true) : $coli_orderdetailtext;
         $new_detail = trim($allDetails_to_HT)=="" ? $old_detail : $old_detail . " operations\r\n" . $allDetails_to_HT . "\r\n";
+        // 判断收款方并提示
+        $finance_memo = "";
+        if (intval($coli_opi_id) === 435 && in_array($gci_info->GCI_FromAgc, array("D目的地桂林组", "Trippest"))) {
+            $finance_memo .= "备注: 本订单组团社是渠道, 账单收款方应为地接社代收, 同步回来却是Trippest自营, 请注意核对.\r\n";
+            $new_memo .= mb_strstr($new_memo, "orderRemark", true)!==false ? $finance_memo : ("orderRemark " . $finance_memo);
+        }
         // 团款总金额
         // 渠道实收
         $travel_fee = 0;

webht/third_party/trippestOrderSync/models/order_update.php

@@ -53,7 +53,7 @@ class Order_update extends CI_Model {
         }
         $update_str = $this->HT->update_string('GroupCombineInfo', $column_data, $this->gci_where_update);
         $update_exc = $this->HT->query($update_str);
-        return $update_exc;
+        return $this->HT->query("SELECT top 1 * from GroupCombineInfo WHERE " . $this->gci_where_update)->row();
     }
 
     /*!

webht/third_party/trippestOrderSync/models/orders_model.php

@@ -1280,8 +1280,8 @@ class Orders_model extends CI_Model {
     public function biz_groupaccountinfo_cut($coli_sn, $paytype)
     {
       $sql = "DELETE from BIZ_GroupAccountInfo
-              WHERE GAI_COLI_SN=? AND GAI_Type=? AND GAI_Operator = 435";
-      $query = $this->HT->query($sql, array($coli_sn, $paytype));
+              WHERE GAI_COLI_SN=?  AND GAI_Operator = 435"; // AND GAI_Type=?, $paytype
+      $query = $this->HT->query($sql, array($coli_sn));
       return $query;
     }