mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#137) from dev into master

Browse Source 
Reviewed-on: #137
This commit is contained in:
mkm 2024-01-26 13:55:13 +08:00
commit 02307dcf3a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/dao/store/StoreActivityDao.php
View File

@ -143,6 +143,10 @@ class StoreActivityDao extends BaseDao
{ {
$orderProductIds = array_column($order->orderProduct->toArray(), 'product_id'); $orderProductIds = array_column($order->orderProduct->toArray(), 'product_id');
$productIds = CloudProduct::whereIn('product_id', $orderProductIds)->where('activity_id', $activityId)->column('product_id'); $productIds = CloudProduct::whereIn('product_id', $orderProductIds)->where('activity_id', $activityId)->column('product_id');
$find = StoreActivityOrderProduct::where('user_id', $order['uid'])->where('status', 1)->find();
if ($find && $activityId == 2) {
throw new ValidateException('活动商品限购1个');
}
foreach ($productIds as $productId) { foreach ($productIds as $productId) {
$model = new StoreActivityOrderProduct(); $model = new StoreActivityOrderProduct();
$model->user_id = $order['uid']; $model->user_id = $order['uid'];

4
app/common/repositories/store/product/ProductRepository.php
View File

@ -1728,9 +1728,9 @@ class ProductRepository extends BaseRepository
if ($this->dao->updates($id, [$field => $status]) === false) { if ($this->dao->updates($id, [$field => $status]) === false) {
throw new \Exception('商品操作出错', 500); throw new \Exception('商品操作出错', 500);
} }
event('product.sell', ['product_id' => $productIds]); event('product.sell', ['product_id' => $productIds,'status'=>$status]);
Db::commit(); Db::commit();
Queue::push(ChangeSpuStatusJob::class, ['id' => $id, 'product_type' => $product_type]); Queue::push(ChangeSpuStatusJob::class, ['id' => $productIds, 'product_type' => $product_type]);
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
throw new \Exception('商品操作出错', $e->getCode()); throw new \Exception('商品操作出错', $e->getCode());

2
app/controller/api/Open.php
View File

@ -20,10 +20,10 @@ class Open extends BaseController
{ {
$timestamp = $this->request->post('timestamp'); $timestamp = $this->request->post('timestamp');
$data = $this->request->post('data'); $data = $this->request->post('data');
Log::error('供销平台佣金回调：' . $data);
$aes = new \AES(); $aes = new \AES();
$iv = !empty($timestamp) ? $aes->buildIv($timestamp) : ''; $iv = !empty($timestamp) ? $aes->buildIv($timestamp) : '';
$decrypted = $aes->decrypt($data, $iv); $decrypted = $aes->decrypt($data, $iv);
Log::error('供销平台佣金回调：' . var_export($decrypted, true));
if (!empty($decrypted)) { if (!empty($decrypted)) {
$storeConsumptionUserDao = new CommissionDao(); $storeConsumptionUserDao = new CommissionDao();
// "惠农供销，谱写数字新篇章"活动首单分润 // "惠农供销，谱写数字新篇章"活动首单分润