|
@@ -155,7 +155,7 @@ class RechargeController extends Curd
|
|
|
if (count($item['sheets']) > 1 && $goods->goods_classify == 'MEALS') {
|
|
|
$sheetDeng = ' 等';
|
|
|
}
|
|
|
- if ($goods && $goods->goods_name && strpos($goods->goods_name,'皇冠') !== false){
|
|
|
+ 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 : '';
|
|
@@ -218,8 +218,9 @@ class RechargeController extends Curd
|
|
|
throw new BusinessException("充值场所不存在");
|
|
|
}
|
|
|
$params['dept_name'] = $dept->dept_name;
|
|
|
- $orderExtendJson = ['dept_id' => $params['dept_id'], 'dept_name' => $params['dept_name']];
|
|
|
+ $orderExtendJson = ['referee_dept_id' => $params['dept_id'], 'referee_premises' => $params['dept_name']];
|
|
|
}
|
|
|
+ $orderExtendJson['referee'] = $params['referee'] ?? '';
|
|
|
// 下单账户
|
|
|
if (empty($params['join_order_member_id']) && !empty($params['mobile'])) {
|
|
|
if (Member::where('member_mobile', $params['mobile'])->exists()) {
|
|
@@ -825,14 +826,14 @@ class RechargeController extends Curd
|
|
|
->toArray();
|
|
|
foreach ($coupons as &$coupon) {
|
|
|
if (isset($goodsAttributeJson['coupon'][$coupon['coupon_id']])) {
|
|
|
- $coupon['num'] = CouponDetail::where('join_detail_coupon_id',$coupon['coupon_id'])
|
|
|
- ->where('join_coupon_detail_member_id',$order->join_order_member_id)
|
|
|
- ->whereJsonContains('coupon_detail_extend_json->order_id',$order->order_id)
|
|
|
+ $coupon['num'] = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
|
|
|
+ ->where('join_coupon_detail_member_id', $order->join_order_member_id)
|
|
|
+ ->whereJsonContains('coupon_detail_extend_json->order_id', $order->order_id)
|
|
|
->count();
|
|
|
- $coupon['used'] = CouponDetail::where('join_detail_coupon_id',$coupon['coupon_id'])
|
|
|
- ->where('join_coupon_detail_member_id',$order->join_order_member_id)
|
|
|
- ->whereJsonContains('coupon_detail_extend_json->order_id',$order->order_id)
|
|
|
- ->where('coupon_detail_status','USED')
|
|
|
+ $coupon['used'] = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
|
|
|
+ ->where('join_coupon_detail_member_id', $order->join_order_member_id)
|
|
|
+ ->whereJsonContains('coupon_detail_extend_json->order_id', $order->order_id)
|
|
|
+ ->where('coupon_detail_status', 'USED')
|
|
|
->count();
|
|
|
$coupon['unused'] = $coupon['num'] - $coupon['used'];
|
|
|
}
|