edit

service/agent/lib/Agreement.php

@@ -130,6 +130,7 @@ class Agreement
         }
 		// print_r($agreement);die;
 		$role = Dever::db('setting/role')->find($order['role']);
+        $order['price'] = $order['oprice'];
         foreach ($agreement as $k => $v) {
             if ($k == 3) {
                 if (isset($order['soft_cash']) && $order['soft_cash'] > 0) {
@@ -137,6 +138,12 @@ class Agreement
                 } else {
                     continue;
                 }
+            } else {
+                if (isset($order['agent_cash']) && $order['agent_cash'] > 0) {
+                    $order['price'] = $order['agent_cash'];
+                } else {
+                    $order['price'] = $order['oprice'];
+                }
             }
         	if ($k >= 5) {
         		continue;
@@ -220,6 +227,20 @@ class Agreement
             if ($agreement) {
                 $method = 'content_' . $agreement['type'];
                 $up = array();
+                $order = Dever::db('agent/order')->find($info['order_id']);
+                if ($order) {
+                    if ($agreement['type'] == 1) {
+                        if (isset($order['agent_cash']) && $order['agent_cash'] > 0) {
+                            $order['price'] = $order['agent_cash'];
+                        }
+                    } elseif ($agreement['type'] == 3) {
+                        if (isset($order['soft_cash']) && $order['soft_cash'] > 0) {
+                            $order['price'] = $order['soft_cash'];
+                        }
+                    }
+                    $info['price'] = $up['price'] = $order['price'];
+                }
+                
                 $up['content'] = Dever::array_encode($this->$method($agreement, $info));
                 $up['where_id'] = $info['id'];
                 $member = Dever::db('agent/member')->find($info['mid']);