|
@@ -504,18 +504,18 @@ class WholeController extends Curd
|
|
if (!empty($discountItem['coupon_id'])) {
|
|
if (!empty($discountItem['coupon_id'])) {
|
|
$discount['coupon_name'] .= Coupon::where('coupon_id', $discountItem['coupon_id'])->value('coupon_name') . ', ';
|
|
$discount['coupon_name'] .= Coupon::where('coupon_id', $discountItem['coupon_id'])->value('coupon_name') . ', ';
|
|
}
|
|
}
|
|
- if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])){
|
|
|
|
- $discount['classify'] .= $discountItem['coupon_classify'].'('.round($discountItem['coupon_value'],2).'), ';
|
|
|
|
|
|
+ if (empty($discountItem['coupon_id']) && !empty($discountItem['coupon_classify'])) {
|
|
|
|
+ $discount['classify'] .= $discountItem['coupon_classify'] . '(' . round($discountItem['coupon_value'], 2) . '), ';
|
|
}
|
|
}
|
|
- if (!empty($discountItem['coupon_value'])){
|
|
|
|
|
|
+ if (!empty($discountItem['coupon_value'])) {
|
|
$discount['value'] += $discountItem['coupon_value'];
|
|
$discount['value'] += $discountItem['coupon_value'];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (!empty($discount['coupon_name'])){
|
|
|
|
- $discount['coupon_name'] = rtrim($discount['coupon_name'],', ');
|
|
|
|
|
|
+ if (!empty($discount['coupon_name'])) {
|
|
|
|
+ $discount['coupon_name'] = rtrim($discount['coupon_name'], ', ');
|
|
}
|
|
}
|
|
- if (!empty($discount['classify'])){
|
|
|
|
- $discount['classify'] = rtrim($discount['classify'],', ');
|
|
|
|
|
|
+ if (!empty($discount['classify'])) {
|
|
|
|
+ $discount['classify'] = rtrim($discount['classify'], ', ');
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$order->discount = $discount;
|
|
$order->discount = $discount;
|
|
@@ -747,7 +747,7 @@ class WholeController extends Curd
|
|
$orderConfigJson = json_decode($order->order_config_json, true);
|
|
$orderConfigJson = json_decode($order->order_config_json, true);
|
|
if (isset($orderConfigJson['premises'])) {
|
|
if (isset($orderConfigJson['premises'])) {
|
|
$premises = SysDept::where('dept_name', $orderConfigJson['premises'])->first();
|
|
$premises = SysDept::where('dept_name', $orderConfigJson['premises'])->first();
|
|
- if (!empty($premises)){
|
|
|
|
|
|
+ if (!empty($premises)) {
|
|
$params['submit_premises_id'] = $premises->dept_id;
|
|
$params['submit_premises_id'] = $premises->dept_id;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1060,9 +1060,9 @@ class WholeController extends Curd
|
|
$payData['pay_prepayid'] = $params['card_nbr'];
|
|
$payData['pay_prepayid'] = $params['card_nbr'];
|
|
} else if ($params['pay_category'] == 'OFFLINE') {
|
|
} else if ($params['pay_category'] == 'OFFLINE') {
|
|
$payData['pay_prepayid'] = 'OFFLINE';
|
|
$payData['pay_prepayid'] = 'OFFLINE';
|
|
- } else if ($params['pay_category'] == 'OFFLINE_ALIPAY') {
|
|
|
|
|
|
+ } else if ($params['pay_category'] == 'OFFLINE_ALIPAY') {
|
|
$payData['pay_prepayid'] = 'OFFLINE_ALIPAY';
|
|
$payData['pay_prepayid'] = 'OFFLINE_ALIPAY';
|
|
- } else if ($params['pay_category'] == 'OFFLINE_WXPAY') {
|
|
|
|
|
|
+ } else if ($params['pay_category'] == 'OFFLINE_WXPAY') {
|
|
$payData['pay_prepayid'] = 'OFFLINE_WXPAY';
|
|
$payData['pay_prepayid'] = 'OFFLINE_WXPAY';
|
|
} else if ($params['pay_category'] == 'MONEY') {
|
|
} else if ($params['pay_category'] == 'MONEY') {
|
|
$payData['pay_prepayid'] = 'MONEY';
|
|
$payData['pay_prepayid'] = 'MONEY';
|
|
@@ -1147,8 +1147,8 @@ class WholeController extends Curd
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
}
|
|
}
|
|
|
|
|
|
- if ($order->order_is_complete == 'Y'){
|
|
|
|
- Event::dispatch('order.complete',$params);
|
|
|
|
|
|
+ if ($order->order_is_complete == 'Y') {
|
|
|
|
+ Event::dispatch('order.complete', $params);
|
|
}
|
|
}
|
|
|
|
|
|
Db::commit();
|
|
Db::commit();
|
|
@@ -1287,7 +1287,7 @@ class WholeController extends Curd
|
|
$orderConfigJson = json_decode($order->order_config_json, true);
|
|
$orderConfigJson = json_decode($order->order_config_json, true);
|
|
if (isset($orderConfigJson['premises'])) {
|
|
if (isset($orderConfigJson['premises'])) {
|
|
$premises = SysDept::where('dept_name', $orderConfigJson['premises'])->first();
|
|
$premises = SysDept::where('dept_name', $orderConfigJson['premises'])->first();
|
|
- if (!empty($premises)){
|
|
|
|
|
|
+ if (!empty($premises)) {
|
|
$params['submit_premises_id'] = $premises->dept_id;
|
|
$params['submit_premises_id'] = $premises->dept_id;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1529,8 +1529,8 @@ class WholeController extends Curd
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
}
|
|
}
|
|
|
|
|
|
- if ($order->order_is_complete == 'Y'){
|
|
|
|
- Event::dispatch('order.complete',$params);
|
|
|
|
|
|
+ if ($order->order_is_complete == 'Y') {
|
|
|
|
+ Event::dispatch('order.complete', $params);
|
|
}
|
|
}
|
|
|
|
|
|
Db::commit();
|
|
Db::commit();
|
|
@@ -2178,8 +2178,8 @@ class WholeController extends Curd
|
|
$params['member_id'] = $params['join_order_member_id'];
|
|
$params['member_id'] = $params['join_order_member_id'];
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
}
|
|
}
|
|
- if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y'){
|
|
|
|
- Event::dispatch('order.complete',$params);
|
|
|
|
|
|
+ if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y') {
|
|
|
|
+ Event::dispatch('order.complete', $params);
|
|
}
|
|
}
|
|
|
|
|
|
Db::commit();
|
|
Db::commit();
|
|
@@ -2673,8 +2673,8 @@ class WholeController extends Curd
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
Event::dispatch('order.kangyangCityVIP.grant', $params);
|
|
}
|
|
}
|
|
|
|
|
|
- if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y'){
|
|
|
|
- Event::dispatch('order.complete',$params);
|
|
|
|
|
|
+ if (!empty($params['order_is_complete']) && $params['order_is_complete'] == 'Y') {
|
|
|
|
+ Event::dispatch('order.complete', $params);
|
|
}
|
|
}
|
|
|
|
|
|
Db::commit();
|
|
Db::commit();
|
|
@@ -4253,7 +4253,31 @@ class WholeController extends Curd
|
|
Db::rollBack();
|
|
Db::rollBack();
|
|
return json_fail('修改订单状态失败');
|
|
return json_fail('修改订单状态失败');
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public function useCoupon(Request $request)
|
|
|
|
+ {
|
|
|
|
+ $goods = $request->post('goods', []);
|
|
|
|
+ $coupon = $request->post('coupon', []);
|
|
|
|
+ $payAmount = $request->post('pay_amount', 0);
|
|
|
|
+ $totalAmount = $request->post('total_amount', 0);
|
|
|
|
+ $memberId = $request->post('member_id', '');
|
|
|
|
+ if (empty($goods) || empty($coupon) || empty($memberId)) {
|
|
|
|
+ return json_fail("参数异常");
|
|
|
|
+ }
|
|
|
|
+ foreach ($coupon as $item) {
|
|
|
|
+ if (!in_array(substr($item, 0, 2), ['CU', 'CO'])) {
|
|
|
|
+ return json_fail("参数异常");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ $goodsCount = count($goods);
|
|
|
|
+ foreach ($goods as $good) {
|
|
|
|
+ $payAmount = OrderService::useCoupon($memberId, $good, $goodsCount, $coupon, $payAmount, $totalAmount);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ Redis::del("ORDER:USE:COUPON:" . $memberId);
|
|
|
|
|
|
|
|
+ return json_success("success", ['pay_amount' => $payAmount]);
|
|
}
|
|
}
|
|
|
|
|
|
public static $goodsClassify = [
|
|
public static $goodsClassify = [
|