edit

service/agent/lib/Dhorder.php

@@ -244,7 +244,7 @@ class Dhorder
     }
 
     # 确认兑换
-	public function action($user, $name, $num, $price, $goods, $address_id, $dh_type, $type, $info, $refer = '')
+	public function action($user, $name, $num, $price, $goods, $address_id, $dh_type, $type, $type_id, $info, $refer = '')
     {
     	# 获取平台店
     	$shop = Dever::db('shop/info')->find(array('type' => 10));
@@ -261,6 +261,9 @@ class Dhorder
         $order_data['price'] = $price;
         $order_data['dh_type'] = $dh_type;
         $order_data['type'] = $type;
+        if ($type_id) {
+            $order_data['type_id'] = $type_id;
+        }
         if ($dh_type == 2) {
             $order_data['status'] = 5;
         } else {

service/agent/lib/Manage.php

@@ -100,7 +100,7 @@ class Manage
                                     $price = 0;
                                     # 开始扣减
                                     $member = Dever::db('agent/member')->find($order['mid']);
-                                    Dever::load('agent/lib/dhorder')->action($member, $prize['name'], $prize['num'], $prize['price'], array(), -1, 2, 3, $desc);
+                                    Dever::load('agent/lib/dhorder')->action($member, $prize['name'], $prize['num'], $prize['price'], array(), -1, 2, 3, $prize['id'], $desc);
                                 }
                             }
                         }
@@ -447,7 +447,7 @@ class Manage
                         $member = Dever::db('agent/member')->find($t['parent_mid']);
                         if ($member) {
                             $desc = $parent_prize['name'] . '名额使用';
-                            Dever::load('agent/lib/dhorder')->action($member, $parent_prize['name'], $parent_prize['num'], $parent_prize['price'], array(), -1, 2, 3, $desc);
+                            Dever::load('agent/lib/dhorder')->action($member, $parent_prize['name'], $parent_prize['num'], $parent_prize['price'], array(), -1, 2, 3, $parent_goods['type_id'], $desc);
                         }
                     }
                 }

service/agent/src/My.php

@@ -406,7 +406,7 @@ class My extends Core
         }
         $info = Dever::input('info');
 
-        return Dever::load('agent/lib/dhorder')->action($this->user, $data['name'], $data['num'], $data['price'], $data['list'], $address_id, $dh_type, $type, $info);
+        return Dever::load('agent/lib/dhorder')->action($this->user, $data['name'], $data['num'], $data['price'], $data['list'], $address_id, $dh_type, $type, -1, $info);
     }
 
     # 我的权益订单