Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/order_finance.php

@@ -495,7 +495,7 @@ class Order_finance extends CI_Controller {
         $ret->person_cost = bcdiv($ret->cost_sum, $ret->person_num);
         $ret->comment = "PVT[" . $combineNo . "],共" . $ret->person_num . "人";
         $pag_sns = array_values(array_unique(array_map(function($ele) {return $ele->COLD_ServiceSN;}, $all_orders)));
-        $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', $pag_sns));
+        $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', $pag_sns),  $all_orders[0]->COLD_PlanVEI_SN);
         $ret->PAG_Code = implode(",", array_values(array_unique(array_map(function($ele) {return mb_strtoupper($ele->PAG_Code);}, $pags_info))));
         $ret->vendor_name = implode(",", array_values(array_unique(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info)))) ;
         $ret->pag_name = implode("; ", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ;

webht/third_party/trippestOrderSync/models/orderFinance_model.php

@@ -183,14 +183,15 @@ class OrderFinance_model extends CI_Model {
     }
 
     /** 获取产品信息:产品名称,供应商等 */
-    public function get_pag_info($PAG_SN_str="")
+    public function get_pag_info($PAG_SN_str="", $cold_vei=null)
     {
         if ($PAG_SN_str=="") {
             return array();
         }
+        $vei_sql = $cold_vei===null ? 'PAG_DefaultVEI_SN' : "isnull(PAG_DefaultVEI_SN,$cold_vei)";
         $sql = "SELECT pag.PAG_SN,PAG_Code,PAG_DefaultVEI_SN,PAG_Title,vei2.VEI2_CompanyBN
                 from BIZ_PackageInfo pag
-                inner join VEndorInfo2 vei2 on VEI2_VEI_SN=PAG_DefaultVEI_SN and VEI2_LGC=2
+                left join VEndorInfo2 vei2 on VEI2_VEI_SN=$vei_sql and VEI2_LGC=2
                 where PAG_SN in ($PAG_SN_str)   ";
         return $this->HT->query($sql)->result();
     }