Your Name 3 년 전
부모
커밋
5c803698b2
4개의 변경된 파일29개의 추가작업 그리고 4개의 파일을 삭제
  1. 11 1
      service/agent/database/order.php
  2. 12 0
      service/agent/database/order_process.php
  3. 2 0
      service/agent/lib/Manage.php
  4. 4 3
      service/agent/lib/Order.php

+ 11 - 1
service/agent/database/order.php

@@ -383,7 +383,17 @@ return array
             'match'     => 'option',
             'update'    => 'text',
         ),
-
+        'option_price'      => array
+        (
+            'type'      => 'float-11,2',
+            'name'      => '赠送期权价值',
+            'default'   => '0',
+            'desc'      => '金额',
+            'match'     => 'option',
+            'update'    => 'text',
+            // 'value'     => Dever::input('soft_price', '0'),
+            // 'show'      => 'cstatus=2',
+        ),
 		'bank_id'		=> array
 		(
 			'type' 		=> 'int-11',

+ 12 - 0
service/agent/database/order_process.php

@@ -165,6 +165,18 @@ return array
             'show'      => 'cstatus=2',
         ),
 
+         'option_price'      => array
+        (
+            'type'      => 'float-11,2',
+            'name'      => '赠送期权价值',
+            'default'   => '0',
+            'desc'      => '金额',
+            'match'     => 'option',
+            'update'    => 'text',
+            // 'value'     => Dever::input('soft_price', '0'),
+            // 'show'      => 'cstatus=2',
+        ),
+
         'desc'      => array
         (
             'type'      => 'varchar-400',

+ 2 - 0
service/agent/lib/Manage.php

@@ -158,6 +158,7 @@ class Manage
                         $soft_price = Dever::param('soft_price', $data);
                         $price = Dever::param('price', $data);
                         $prize_type = Dever::param('prize_type', $data);
+                        $option_price = Dever::param('option_price', $data);
                         if ($prize_type == 2) {
                             # 扣减已有名额,判断一下
                             $prize = Dever::db('setting/prize')->find(array('type' => 1, 'price' => $order['price']));
@@ -180,6 +181,7 @@ class Manage
                         $update['price'] = $price;
                         $update['agent_cash'] = $price;
                         $update['soft_cash'] = 0;
+                        $update['option_price']=$option_price;
 
                         $cstatus = Dever::param('cstatus', $data);
                         if ($cstatus && $cstatus == 2 && $price > 0) {

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

@@ -525,13 +525,14 @@ class Order
                 (
                     array('应付金额', '¥' . $info['f_price'] . '元'),
                     array('实付金额', '¥' . $info['price'] . '元'),
+                    array('代理费', '¥' . $info['agent_cash'] . '元'),
                 ),
 
                 array
                 (
-                    array('代理费', '¥' . $info['agent_cash'] . '元'),
                     array('软件服务费', '¥' . $info['soft_cash'] . '元'),
                     array('商品价值', '¥' . $info['goods_cash'] . '元'),
+                    array('赠送期权价值', '¥' . $info['option_price'] . '元'),
                 ),
 
                 array
@@ -594,7 +595,7 @@ class Order
             'link' => $purl,
             'name' => '备注',
         );
-
+        
         if ($info['status'] <= 1) {
             $purl = Dever::url('project/database/update?project=agent&table=order&where_id='.$info['id'].'&col=invite_type,parent_code,source_id,name,idcard,type,idcard_front,idcard_back,company_name,company_number,company_pic,pay_type,pay_pic', 'manage');
 
@@ -634,7 +635,7 @@ class Order
                     $cstatus = ',prize_type';
                 }
             }
-            $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,price,desc'.$cstatus.'&price='.$info['price'].'&soft_price=' . $soft_price, 'manage');
+            $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,price,option_price,desc'.$cstatus.'&price='.$info['price'].'&soft_price=' . $soft_price, 'manage');
             if (isset($process[1]) && $process[1]) {
                 $purl .= '&where_id=' . $process[1]['id'];
             }