|
@@ -50,6 +50,7 @@ class Aatest extends Start_Controller {
|
|
|
$this->load->_model('Model_logic_tools','logic_tools');
|
|
|
$this->load->_model('Model_returngoods','returngoods');
|
|
|
$this->load->_model('Model_returnlogs','returnlogs');
|
|
|
+ $this->load->_model('Model_productdescribe','productdescribe');
|
|
|
|
|
|
}
|
|
|
|
|
@@ -78,13 +79,13 @@ class Aatest extends Start_Controller {
|
|
|
// var_dump($list);
|
|
|
// die;
|
|
|
// $v = $list[0];
|
|
|
- $v = [
|
|
|
- 'waybill'=>'284280923614'
|
|
|
- ];
|
|
|
- $fs = $this->fedexv1->get_logistics($v);
|
|
|
- var_dump($fs);
|
|
|
- die;
|
|
|
- die;
|
|
|
+ // $v = [
|
|
|
+ // 'waybill'=>'285250961332'
|
|
|
+ // ];
|
|
|
+ // $fs = $this->fedexv1->get_logistics($v);
|
|
|
+ // var_dump($fs);
|
|
|
+ // die;
|
|
|
+ // die;
|
|
|
|
|
|
$list = $this->fullorder->findall("waybill = 9205590251001335234515");
|
|
|
$v = $list['0'];
|
|
@@ -181,7 +182,24 @@ class Aatest extends Start_Controller {
|
|
|
$dtctitle = $data['dtctitle'];
|
|
|
$quantity = 'Loose Body--HDWig-26-HD5*5Wig-180%,WKPack';
|
|
|
$issku = '1;1';
|
|
|
- $r = $this->api->matching($quantity,$issku,$dtc,0,0,$dtctitle,[],[
|
|
|
+ $money = array();
|
|
|
+ $productdescribe = $this->productdescribe->find_all('1=1');
|
|
|
+ foreach ($productdescribe as $v)
|
|
|
+ {
|
|
|
+ $money[$v['number']] = array();
|
|
|
+ }
|
|
|
+ /* 价格加入 */
|
|
|
+ /* 匹配ID加入 */
|
|
|
+ $int = array();
|
|
|
+ $intdata = $this->typeclass->find_all('classid=14','id,spare');
|
|
|
+ foreach ($intdata as $v)
|
|
|
+ {
|
|
|
+ $v['spare'] = explode('|',$v['spare']);
|
|
|
+ $int[$v['id']] = $v['spare'][0];
|
|
|
+ }
|
|
|
+ var_dump($dtc);
|
|
|
+ var_dump($dtctitle);
|
|
|
+ $r = $this->api->matching($quantity,$issku,$dtc,$money,$int,$dtctitle,[1],[
|
|
|
|
|
|
]);
|
|
|
echo "<pre>";
|