|
|
@@ -158,7 +158,7 @@ class RechargeController extends Curd
|
|
|
if ($goods && $goods->goods_name && strpos($goods->goods_name, '皇冠') !== false) {
|
|
|
$item['is_crown'] = 'Y';
|
|
|
}
|
|
|
- $item['sheet']['goods_name'] = ($goods && $goods->goods_name) ? $goods->goods_name . $sheetDeng : '';
|
|
|
+ $item['sheet']['goods_name'] = ($goods && $goods->goods_name) ? $goods->goods_name . $sheetDeng : '自定义充值';
|
|
|
$item['sheet']['goods_classify'] = $goods->goods_classify ?? '';
|
|
|
$item['sheet']['order_sheet_num'] = intval($item['sheet']['order_sheet_num']);
|
|
|
}
|
|
|
@@ -752,7 +752,9 @@ class RechargeController extends Curd
|
|
|
$coupons = [];
|
|
|
foreach ($orderSheet as &$item) {
|
|
|
$sheetAmount += $item['order_sheet_amount'];
|
|
|
- $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
|
|
|
+ if (!empty($item['goods'])) {
|
|
|
+ $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
|
|
|
+ }
|
|
|
if (!empty($item['goods']) && $item['goods']['goods_classify'] == 'PACKAGE') {
|
|
|
$components = GoodsComponent::with('goods')
|
|
|
->where('join_component_master_goods_id', $item['goods']['goods_id'])
|
|
|
@@ -993,7 +995,7 @@ class RechargeController extends Curd
|
|
|
return json_success('', $data);
|
|
|
|
|
|
} catch (\Exception $e) {
|
|
|
- dump($e->getMessage());
|
|
|
+ dump($e->getMessage(), $e->getLine());
|
|
|
}
|
|
|
}
|
|
|
|
gorden