|
@@ -6,6 +6,7 @@ use app\admin\service\coupon\CouponDetailService;
|
|
use app\admin\service\coupon\CouponService;
|
|
use app\admin\service\coupon\CouponService;
|
|
use app\admin\service\member\MemberService;
|
|
use app\admin\service\member\MemberService;
|
|
use app\admin\service\order\OrderService;
|
|
use app\admin\service\order\OrderService;
|
|
|
|
+use app\admin\service\order\OrderSheetService;
|
|
use app\admin\service\order\PayDetailService;
|
|
use app\admin\service\order\PayDetailService;
|
|
use app\admin\validate\coupon\CouponValidate;
|
|
use app\admin\validate\coupon\CouponValidate;
|
|
use app\admin\validate\device\DeviceValidate;
|
|
use app\admin\validate\device\DeviceValidate;
|
|
@@ -705,7 +706,6 @@ class WholeController extends Curd
|
|
}
|
|
}
|
|
foreach ($params['goodsContentList'] as $sheet) {
|
|
foreach ($params['goodsContentList'] as $sheet) {
|
|
// 先还原库存
|
|
// 先还原库存
|
|
-
|
|
|
|
$orderSheet = OrderSheet::where('order_sheet_id', $sheet['order_sheet_id'])->first();
|
|
$orderSheet = OrderSheet::where('order_sheet_id', $sheet['order_sheet_id'])->first();
|
|
if (!isset($params['submit_goods_classify']) || $params['submit_goods_classify'] != 'MEALS') {
|
|
if (!isset($params['submit_goods_classify']) || $params['submit_goods_classify'] != 'MEALS') {
|
|
$goodsSku = GoodsSku::where('goods_sku_id', $orderSheet->join_sheet_goods_sku_id)->first();
|
|
$goodsSku = GoodsSku::where('goods_sku_id', $orderSheet->join_sheet_goods_sku_id)->first();
|
|
@@ -718,7 +718,7 @@ class WholeController extends Curd
|
|
|
|
|
|
$goodsRunning = GoodsRunning::where('join_running_goods_id', $orderSheet->join_sheet_goods_id)->first();
|
|
$goodsRunning = GoodsRunning::where('join_running_goods_id', $orderSheet->join_sheet_goods_id)->first();
|
|
$goodsRunning->goods_running_storage = $goodsRunning->goods_running_storage + $orderSheet->order_sheet_num;
|
|
$goodsRunning->goods_running_storage = $goodsRunning->goods_running_storage + $orderSheet->order_sheet_num;
|
|
- $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale - $orderSheet->order_sheet_num;
|
|
|
|
|
|
+// $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale - $orderSheet->order_sheet_num;
|
|
$goodsRunning->save();
|
|
$goodsRunning->save();
|
|
|
|
|
|
$data = [
|
|
$data = [
|
|
@@ -742,11 +742,11 @@ class WholeController extends Curd
|
|
}
|
|
}
|
|
|
|
|
|
$goodsRunning = GoodsRunning::where('join_running_goods_id', $orderSheet->join_sheet_goods_id)->first();
|
|
$goodsRunning = GoodsRunning::where('join_running_goods_id', $orderSheet->join_sheet_goods_id)->first();
|
|
- $goodsRunning->goods_running_storage = $goodsRunning->goods_running_storage - $sheet['nbr'];
|
|
|
|
|
|
+// $goodsRunning->goods_running_storage = $goodsRunning->goods_running_storage - $sheet['nbr'];
|
|
if ($goodsRunning->goods_running_storage < 0) {
|
|
if ($goodsRunning->goods_running_storage < 0) {
|
|
throw new BusinessException('库存不足');
|
|
throw new BusinessException('库存不足');
|
|
}
|
|
}
|
|
- $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale + $sheet['nbr'];
|
|
|
|
|
|
+// $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale + $sheet['nbr'];
|
|
$goodsRunning->save();
|
|
$goodsRunning->save();
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1310,6 +1310,8 @@ class WholeController extends Curd
|
|
|
|
|
|
// 触发事件
|
|
// 触发事件
|
|
if ($order->order_is_complete == 'Y' && $order->order_status_payment == 'SUCCESS') {
|
|
if ($order->order_is_complete == 'Y' && $order->order_status_payment == 'SUCCESS') {
|
|
|
|
+ // 加销售量
|
|
|
|
+ OrderSheetService::addGoodsSales($params['orderId']);
|
|
// 完成订单
|
|
// 完成订单
|
|
Event::dispatch('order.complete', $params);
|
|
Event::dispatch('order.complete', $params);
|
|
// 上级提成
|
|
// 上级提成
|
|
@@ -1773,6 +1775,8 @@ class WholeController extends Curd
|
|
Db::commit();
|
|
Db::commit();
|
|
// 触发事件
|
|
// 触发事件
|
|
if ($order->order_is_complete == 'Y' && $order->order_status_payment == 'SUCCESS') {
|
|
if ($order->order_is_complete == 'Y' && $order->order_status_payment == 'SUCCESS') {
|
|
|
|
+ // 加销售量
|
|
|
|
+ OrderSheetService::addGoodsSales($params['orderId']);
|
|
// 完成订单
|
|
// 完成订单
|
|
Event::dispatch('order.complete', $params);
|
|
Event::dispatch('order.complete', $params);
|
|
// 上级提成
|
|
// 上级提成
|
|
@@ -3268,7 +3272,9 @@ class WholeController extends Curd
|
|
if ($goodsRunning->goods_running_storage < 0) {
|
|
if ($goodsRunning->goods_running_storage < 0) {
|
|
throw new BusinessException('库存不足');
|
|
throw new BusinessException('库存不足');
|
|
}
|
|
}
|
|
- $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale + $goods['nbr'];
|
|
|
|
|
|
+ if ($params['order_status_payment'] == 'SUCCESS') {
|
|
|
|
+ $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale + $goods['nbr'];
|
|
|
|
+ }
|
|
$goodsRunning->save();
|
|
$goodsRunning->save();
|
|
}
|
|
}
|
|
return $orderSheetIds;
|
|
return $orderSheetIds;
|
|
@@ -3493,7 +3499,7 @@ class WholeController extends Curd
|
|
throw new BusinessException('库存不足');
|
|
throw new BusinessException('库存不足');
|
|
}
|
|
}
|
|
|
|
|
|
- $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale + $goods['nbr'];
|
|
|
|
|
|
+// $goodsRunning->goods_running_sale = $goodsRunning->goods_running_sale + $goods['nbr'];
|
|
$goodsRunning->save();
|
|
$goodsRunning->save();
|
|
|
|
|
|
OrderSheet::insertGetId($data);
|
|
OrderSheet::insertGetId($data);
|
|
@@ -4877,6 +4883,8 @@ class WholeController extends Curd
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_json_response' => json_encode($result)
|
|
'pay_json_response' => json_encode($result)
|
|
]);
|
|
]);
|
|
|
|
+ // 加销售量
|
|
|
|
+ OrderSheetService::addGoodsSales($params['orderId']);
|
|
// 优惠券标记使用
|
|
// 优惠券标记使用
|
|
$this->changeOrderCouponStatus($discountJson, 'USED');
|
|
$this->changeOrderCouponStatus($discountJson, 'USED');
|
|
|
|
|
|
@@ -4928,7 +4936,8 @@ class WholeController extends Curd
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_json_response' => json_encode($result)
|
|
'pay_json_response' => json_encode($result)
|
|
]);
|
|
]);
|
|
-
|
|
|
|
|
|
+ // 加销售量
|
|
|
|
+ OrderSheetService::addGoodsSales($params['orderId']);
|
|
// 优惠券标记使用
|
|
// 优惠券标记使用
|
|
$this->changeOrderCouponStatus($discountJson, 'USED');
|
|
$this->changeOrderCouponStatus($discountJson, 'USED');
|
|
Db::commit();
|
|
Db::commit();
|
|
@@ -5003,6 +5012,8 @@ class WholeController extends Curd
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_json_response' => json_encode($result)
|
|
'pay_json_response' => json_encode($result)
|
|
]);
|
|
]);
|
|
|
|
+ // 加销售量
|
|
|
|
+ OrderSheetService::addGoodsSales($order['order_id']);
|
|
|
|
|
|
$discountJson = [];
|
|
$discountJson = [];
|
|
if (!empty($orders[0]['order_discount_json'])) {
|
|
if (!empty($orders[0]['order_discount_json'])) {
|
|
@@ -5036,6 +5047,8 @@ class WholeController extends Curd
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_paytimes' => date('Y-m-d H:i:s'),
|
|
'pay_json_response' => json_encode($result)
|
|
'pay_json_response' => json_encode($result)
|
|
]);
|
|
]);
|
|
|
|
+ // 加销售量
|
|
|
|
+ OrderSheetService::addGoodsSales($order['order_id']);
|
|
// 优惠券标记使用
|
|
// 优惠券标记使用
|
|
$discountJson = [];
|
|
$discountJson = [];
|
|
if (!empty($orders[0]['order_discount_json'])) {
|
|
if (!empty($orders[0]['order_discount_json'])) {
|