挂售

app/admin/controller/order/StoreOrder.php

@@ -298,14 +298,9 @@ class StoreOrder extends AuthController
      * */
     public function order_goods($id = 0)
     {
-//        $list = Express::where('is_show', 1)->order('sort desc')->column('name', 'id');
-        try {
-            $list = ExpressService::init()->express(1, 1, 1000);
-        } catch (\Throwable $e) {
-            $list = [];
-        }
+        $list = Express::where('is_show', 1)->order('sort desc')->column('name', 'id');
         $this->assign([
-            'list' => $list['data'] ?? [],
+            'list' => $list,
             'id' => $id
         ]);
         return $this->fetch();
@@ -669,7 +664,7 @@ class StoreOrder extends AuthController
                 if ($bill_integral['number'] > $user_integral)
                     $bill_integral['number'] = $user_integral;
                 User::bcDec($bill_integral['uid'], 'integral', $bill_integral['number'], 'uid');
-                UserBill::expend('退款扣除积分', $bill_integral['uid'], 'integral', 'gain', $bill_integral['number'], $id, bcsub($user_integral, $bill_integral['number'], 2), '订单退款扣除积分' . floatval($bill_integral['number']) . '积分');
+                UserBill::expend('退款扣除趣豆', $bill_integral['uid'], 'integral', 'gain', $bill_integral['number'], $id, bcsub($user_integral, $bill_integral['number'], 2), '订单退款扣除积分' . floatval($bill_integral['number']) . '趣豆');
             }
             //回退库存
             StoreOrderModels::RegressionStock($product);
@@ -742,17 +737,10 @@ class StoreOrder extends AuthController
             $f[] = Form::input('delivery_id', '送货人电话', $product->getData('delivery_id'));
         } else if ($product['delivery_type'] == 'express') {
             $f[] = Form::select('delivery_name', '快递公司', $product->getData('delivery_name'))->setOptions(function () {
-//                $list = Express::where('is_show', 1)->column('name', 'id');
-                try {
-                    $list = ExpressService::init()->express(1, 1, 1000);
-                    $list = $list['data'] ?? [];
-                } catch (\Throwable $e) {
-                    $list = [];
-                }
-
+                $list = Express::where('is_show', 1)->column('name', 'id');
                 $menus = [];
                 foreach ($list as $k => $v) {
-                    $menus[] = ['value' => $v['name'], 'label' => $v['name']];
+                    $menus[] = ['value' => $v, 'label' => $v];
                 }
                 return $menus;
             });

app/admin/view/index/index.php

@@ -29,7 +29,7 @@
                 <li class="nav-header">
                     <div class="dropdown profile-element admin_open">
                         <span>
-                            <img alt="image" class="imgbox" src="{$site_logo}" onerror="javascript:this.src='{__ADMIN_PATH}images/admin_logo.png';"/>
+<!--                            <img alt="image" class="imgbox" src="{$site_logo}" onerror="javascript:this.src='{__ADMIN_PATH}images/admin_logo.png';"/>-->
                         </span>
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
                             <span class="clear" style="margin-top: 20px;">

app/admin/view/order/store_order/order_goods.php

@@ -17,7 +17,7 @@
                     <select name="delivery_name">
                         <option value="">请选择</option>
                         {volist name='$list' id='item' key='k'}
-                        <option value="{$item['name']}">{$item['name']}</option>
+                        <option value="{$item}">{$item}</option>
                         {/volist}
                     </select>
                 </div>

app/admin/view/order/store_order/order_info.php

@@ -54,10 +54,10 @@
                         <div class="col-xs-6" style="color: #f1a417">退款金额: ￥{$orderInfo.refund_price}</div>
                         {/if}
                         {if condition="$orderInfo['use_integral'] > 0"}
-                        <div class="col-xs-6" style="color: #f1a417">使用积分: {$orderInfo.use_integral}积分(抵扣了￥{$orderInfo.deduction_price})</div>
+                        <div class="col-xs-6" style="color: #f1a417">使用趣豆: {$orderInfo.use_integral}积分(抵扣了￥{$orderInfo.deduction_price})</div>
                         {/if}
                         {if condition="$orderInfo['back_integral'] > 0"}
-                        <div class="col-xs-6" style="color: #f1a417">退回积分: ￥{$orderInfo.back_integral}</div>
+                        <div class="col-xs-6" style="color: #f1a417">退回趣豆: ￥{$orderInfo.back_integral}</div>
                         {/if}
                         <div class="col-xs-6">创建时间: {$orderInfo.add_time|date="Y/m/d H:i"}</div>
                         <div class="col-xs-6">支付方式:

app/models/user/UserBill.php

@@ -223,7 +223,7 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'pay_money');
                 break;
             case 2:
-                $model = $model->where('type', 'in', 'recharge,system_add');
+                $model = $model->where('type', 'in', 'recharge,system_add,pay_product_refund');
                 break;
             case 3:
                 $model = $model->where('type', 'brokerage');