|
@@ -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;
|
|
|
});
|