dever 3 年之前
父節點
當前提交
e8ce0b8d37
共有 2 個文件被更改,包括 18 次插入14 次删除
  1. 14 13
      service/agent/lib/Manage.php
  2. 4 1
      service/agent/lib/Order.php

+ 14 - 13
service/agent/lib/Manage.php

@@ -199,19 +199,17 @@ class Manage
                     $role = Dever::db('setting/role')->one($order['role']);
                     if ($role && $role['type'] == 2) {
                         Dever::load('area/api')->upStatus($order['area'], 2);
-                    }
-                    
-                    $area_data = array('mid' => $order['mid'], 'order_id' => $order['id'], 'role' => $order['role'], 'area' => $order['area']);
-                    $area = Dever::db('agent/member_area')->find($area_data);
-
-                    if (!$area) {
-                        $area_data['type'] = $order['get_type'];
-                        $area_data['price'] = $order['price'];
-                        $area_data['status'] = 1;
-                        Dever::db('agent/member_area')->insert($area_data);
-                    } else {
-                        Dever::db('agent/member_area')->update(array('where_id' => $area['id'], 'state' => 2));
-                        if ($role && $role['type'] == 2) {
+
+                        $area_data = array('mid' => $order['mid'], 'order_id' => $order['id'], 'role' => $order['role'], 'area' => $order['area']);
+                        $area = Dever::db('agent/member_area')->find($area_data);
+
+                        if (!$area) {
+                            $area_data['type'] = $order['get_type'];
+                            $area_data['price'] = $order['price'];
+                            $area_data['status'] = 1;
+                            Dever::db('agent/member_area')->insert($area_data);
+                        } else {
+                            Dever::db('agent/member_area')->update(array('where_id' => $area['id'], 'state' => 2));
                             Dever::load('area/api')->upStatus($area['area'], 1);
                         }
                     }
@@ -329,6 +327,9 @@ class Manage
     {
         $price = 0;
         $t = intval($order['price']/10000);
+        if ($t <= 0) {
+            $t = 1;
+        }
         if ($v['type'] == 1) {
             $v['num'] = $v['num'] * $t;
             $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v['type_id'], $v['sku_id']);

+ 4 - 1
service/agent/lib/Order.php

@@ -823,6 +823,9 @@ class Order
             $table['head'] = array('权益类型', '权益名称', '权益价值', '权益数量');
             $table['body'] = array();
             $t = intval($info['price']/10000);
+            if ($t <= 0) {
+                $t = 1;
+            }
             foreach ($goods as $k => $v) {
                 if ($v['type'] == 1) {
                     $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v['type_id'], $v['sku_id']);
@@ -869,7 +872,7 @@ class Order
                 $agreement_info = Dever::db('setting/agreement')->find($v['agreement_id']);
                 $agreement_status_name = $agreement_status[$v['status']];
 
-                $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 1), $agreement_status_name);
+                $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $agreement_status_name);
             }
 
         } else {