|
|
@@ -18,7 +18,7 @@ use crmeb\traits\ModelTrait;
|
|
|
use think\facade\Log;
|
|
|
use app\models\system\SystemStore;
|
|
|
use app\models\routine\RoutineTemplate;
|
|
|
-use app\models\user\{User, UserAddress, UserBill, UserSpread, WechatUser};
|
|
|
+use app\models\user\{User, UserAddress, UserBill, UserLevel, UserSpread, WechatUser};
|
|
|
use crmeb\services\{
|
|
|
SystemConfigService, WechatTemplateService, workerman\ChannelService
|
|
|
};
|
|
|
@@ -756,11 +756,12 @@ class StoreOrder extends BaseModel
|
|
|
if ($order->combination_id && $res1 && !$order->refund_status) $resPink = StorePink::createPink($order);//创建拼团
|
|
|
$oid = self::where('order_id', $orderId)->value('id');
|
|
|
StoreOrderStatus::status($oid, 'pay_success', '用户付款成功');
|
|
|
- $now_money = User::where('uid',$order['uid'])->value('now_money');
|
|
|
+ $now_money = User::where('uid', $order['uid'])->value('now_money');
|
|
|
UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元购买商品');
|
|
|
//支付成功后
|
|
|
event('OrderPaySuccess', [$order, $formId]);
|
|
|
$res = $res1 && $resPink && UserSpread::setSpreadSure($order['uid']) && User::backOrderBrokerage($order);
|
|
|
+ UserLevel::setLevelComplete($order['uid']);
|
|
|
return false !== $res;
|
|
|
}
|
|
|
|
|
|
@@ -1585,7 +1586,7 @@ class StoreOrder extends BaseModel
|
|
|
$res = $res && StoreOrderStatus::status($item, 'take_delivery', '已收货[自动收货]');
|
|
|
}
|
|
|
|
|
|
- if(!$res){
|
|
|
+ if (!$res) {
|
|
|
throw new \Exception('');
|
|
|
}
|
|
|
|