rabin 2 years ago
parent
commit
dee170b0a5
2 changed files with 8 additions and 3 deletions
  1. 6 1
      service/agent/lib/Manage.php
  2. 2 2
      service/agent/lib/Order.php

+ 6 - 1
service/agent/lib/Manage.php

@@ -656,6 +656,8 @@ class Manage
             $param = explode(',', $param);
             foreach ($param as $k => $v) {
                 $t = Dever::array_decode($v);
+                $parent_order = $order;
+                $parent_order['mid'] = $t['parent_mid'];
                 $where['type'] = $t['type'];
                 $where['order_id'] = $order['id'];
                 $where['mid'] = $order['mid'];
@@ -692,7 +694,7 @@ class Manage
                         $prize['type_id'] = $prize_info['id'];
                         $prize['sku_id'] = -1;
                         $prize['num'] = $prize_info['num'];
-                        $this->addGoods($order, $prize);
+                        $this->addGoods($parent_order, $prize);
                     }
                 }
                 if (isset($t['parent_goods_id'])) {
@@ -704,6 +706,9 @@ class Manage
                             $prize_goods = Dever::db('setting/prize_goods')->select(array('prize_id' => $parent_prize['id']));
                             if ($prize_goods) {
                                 # 赠送权益
+                                foreach ($prize_goods as $k1 => $v1) {
+                                    $this->addGoods($parent_order, $v1, 1);
+                                }
                             }
 
                             $member = Dever::db('agent/member')->find($t['parent_mid']);

+ 2 - 2
service/agent/lib/Order.php

@@ -991,11 +991,11 @@ class Order
                                                 } else {
                                                     $sku = '';
                                                 }
-                                                $prize_goods[$pk]['name'] = $goods_info['name'] . $sku;
+                                                $prize_goods[$pk]['name'] = '<a style="color:blue">' . $goods_info['name'] . $sku . '</a>';
                                             } elseif ($pv['type'] == 2) {
                                                 $card = Dever::db('card/info')->find($pv['type_id']);
                                                 $pv['price'] = round($info['price']*($pv['num']/100), 2);
-                                                $prize_goods[$pk]['name'] = $pv['price'] . '元' . $card['name'];
+                                                $prize_goods[$pk]['name'] = '<a style="color:blue">' . $pv['price'] . '元' . $card['name'] . '</a>';
                                                 $prize_goods[$pk]['num'] = $pv['num'] . '%';
                                             }
                                         }