edit

app/goods/lib/Set.php

@@ -33,6 +33,12 @@ class Set
                     if ($give) {
                         $other_where['give'] = $give;
                     }
+                    if ($table == 'agent/order_goods') {
+                        $where_type = Dever::input('type', 1);
+                        if ($where_type) {
+                            $other_where['type'] = $where_type;
+                        }
+                    }
                     $other = Dever::db($table)->find($other_where);
                     $result[$i]['id'] = $v['id'];
                     $result[$i]['name'] = $v['name'];
@@ -120,6 +126,12 @@ class Set
                             if ($give) {
                                 $other_sku_where['give'] = $give;
                             }
+                            if ($table == 'agent/order_goods') {
+                                $where_type = Dever::input('type', 1);
+                                if ($where_type) {
+                                    $other_sku_where['type'] = $where_type;
+                                }
+                            }
                             $other_sku = Dever::db($table)->find($other_sku_where);
 
                             $children['select'] = 2;

app/shop/src/Yspay.php

@@ -13,7 +13,7 @@ class Yspay
 		$class = new Chinaums();
 
 		# 查看当前余额
-		$cash = $class->query('89810007372107C');
+		$cash = $class->query('89810007372106N');
 
 		echo $cash;die;
 		return $cash;

service/agent/assets/pc/html/setMemberGoods.html

@@ -42,7 +42,7 @@
                             <tr>
                                 <th lay-data="{field:'name'}">商品名称</th>
                                 <th lay-data="{field:'price', edit: 'text'}">价值（元）</th>
-                                <th lay-data="{field:'number', edit: 'text'}">更改剩余数量</th>
+                                <th lay-data="{field:'number', edit: 'text'}">更改总数量</th>
                                 <th lay-data="{field:'operation'}">操作</th>
                             </tr>
                         </thead>

service/agent/lib/Order.php

@@ -1149,7 +1149,7 @@ class Order
                     }
                     foreach ($give as $gv) {
                         if ($child_num == $gv['num']) {
-                            $prize_goods = Dever::db('setting/prize_goods')->select(array('reward_give_id' => $v['id']));
+                            $prize_goods = Dever::db('setting/prize_goods')->select(array('reward_give_id' => $gv['id']));
                             if ($prize_goods) {
                                 foreach ($prize_goods as $pk => $pv) {
                                     $param['goods'][] = $pv;
@@ -1280,7 +1280,7 @@ class Order
              if (Dever::load('manage/auth')->checkFunc('agent.order', 'edit6', '修改权益')) {
                 $process_button[] = array(
                     'type' => 'link',
-                    'link' => Dever::url('lib/order_set.home?order_id='.$info['id'].'&role_id=' . $info['role'] . '&total=' . $t, 'agent'),
+                    'link' => Dever::url('lib/order_set.home?type='.$info['order_type'].'&order_id='.$info['id'].'&role_id=' . $info['role'] . '&total=' . $t, 'agent'),
                     'name' => '修改权益'
                 );
             }