修改店铺云商品列表的错误
This commit is contained in:
parent
677038757d
commit
b1a7991677
@ -238,6 +238,7 @@ class ProductDao extends BaseDao
|
||||
}
|
||||
app()->make(SpuRepository::class)->getSearch(['product_id' => $id])->update(['is_del' => 1, 'status' => 0]);
|
||||
event('product.delete',compact('id'));
|
||||
event('product.sell', ['product_id' => [$id]]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -556,4 +556,29 @@ class Product extends BaseModel
|
||||
{
|
||||
$query->whereIn('Product.temp_id',$value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品允许展示的条件
|
||||
* @return array
|
||||
*/
|
||||
public static function searchEnable()
|
||||
{
|
||||
return [
|
||||
'mer_status' => 1,
|
||||
'status' => 1,
|
||||
'is_del' => 0,
|
||||
'is_show' => self::IS_SHOW,
|
||||
'is_used' => 1
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* 商品是否允许展示
|
||||
* @return bool
|
||||
*/
|
||||
public function isEnable()
|
||||
{
|
||||
return $this->mer_status == 1 && $this->status == 1 && $this->is_del == 0 && $this->is_show == self::IS_SHOW && $this->is_used == 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -289,7 +289,7 @@ class ProductRepository extends BaseRepository
|
||||
app()->make(SpuRepository::class)->baseUpdate($spuData, $id, 0, $productType);
|
||||
event('product.update',compact('id'));
|
||||
if ($data['status'] == 0) {
|
||||
event('product.sell', ['source_mer_id' => $merId, 'product_id' => [$id], 'status' => $data['status']]);
|
||||
event('product.sell', ['product_id' => [$id]]);
|
||||
}
|
||||
app()->make(SpuRepository::class)->changeStatus($id, $productType);
|
||||
});
|
||||
@ -1576,7 +1576,7 @@ class ProductRepository extends BaseRepository
|
||||
throw new ValidateException('商品spu更新出错');
|
||||
}else{
|
||||
if ($product->product_type==0){
|
||||
event('product.sell', ['source_mer_id' => $merId, 'product_id' => [$id], 'status' => $status]);
|
||||
event('product.sell', ['product_id' => [$id]]);
|
||||
}
|
||||
}
|
||||
Db::commit();
|
||||
@ -1589,8 +1589,12 @@ class ProductRepository extends BaseRepository
|
||||
$products = $this->dao->getSearch([])->where('product_id','in', $id)->select();
|
||||
if (!$products)
|
||||
throw new ValidateException('数据不存在');
|
||||
$productIds = [];
|
||||
foreach ($products as $product) {
|
||||
$product_type = $product['product_type'];
|
||||
if ($product_type == 0) {
|
||||
$productIds[] = $product['product_id'];
|
||||
}
|
||||
if ($merId && $product['mer_id'] !== $merId)
|
||||
throw new ValidateException('商品不属于您');
|
||||
if ($status == 1 && $product['product_type'] == 2)
|
||||
@ -1603,9 +1607,7 @@ class ProductRepository extends BaseRepository
|
||||
if ($this->dao->updates($id,[$field => $status]) === false) {
|
||||
throw new \Exception('商品操作出错');
|
||||
}
|
||||
if ($product->product_type==0){
|
||||
event('product.sell', ['source_mer_id' => $merId, 'product_id' => $id, 'status' => $status]);
|
||||
}
|
||||
event('product.sell', ['product_id' => $productIds]);
|
||||
Db::commit();
|
||||
Queue::push(ChangeSpuStatusJob::class,['id' => $id,'product_type'=> $product_type]);
|
||||
} catch (\Exception $e) {
|
||||
@ -1637,6 +1639,7 @@ class ProductRepository extends BaseRepository
|
||||
]
|
||||
], $product['mer_id']);
|
||||
app()->make(SpuRepository::class)->changeStatus($id,$product->product_type);
|
||||
event('product.sell', ['product_id' => [$id]]);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1666,6 +1669,7 @@ class ProductRepository extends BaseRepository
|
||||
$this->dao->updates($id, $data);
|
||||
Queue(ChangeSpuStatusJob::class, ['id' => $id, 'product_type' => $product_type]);
|
||||
event('product.status',compact('id','data'));
|
||||
event('product.sell', ['product_id' => $id]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
namespace app\common\repositories\store\product;
|
||||
|
||||
use app\common\model\store\product\CloudProduct;
|
||||
use app\common\model\store\product\Product;
|
||||
use app\common\repositories\store\coupon\StoreCouponProductRepository;
|
||||
use app\common\repositories\store\coupon\StoreCouponRepository;
|
||||
use app\common\repositories\store\StoreActivityRepository;
|
||||
@ -165,8 +166,7 @@ class SpuRepository extends BaseRepository
|
||||
|
||||
public function getApiCloudSearch($where, $page, $limit, $rand = true)
|
||||
{
|
||||
$where['spu_status'] = 1;
|
||||
$where['mer_status'] = 1;
|
||||
$where = array_merge(Product::searchEnable(), $where);
|
||||
if (!empty($where['keyword'])) {
|
||||
if (preg_match('/^(\/@[1-9]{1}).*\*\//', $where['keyword'])) {
|
||||
$command = app()->make(CopyCommand::class)->getMassage($where['keyword']);
|
||||
|
||||
@ -5,51 +5,56 @@ declare (strict_types=1);
|
||||
namespace app\listener;
|
||||
|
||||
use app\common\dao\store\product\CloudProductDao;
|
||||
use app\common\model\store\product\Product;
|
||||
use app\common\model\system\merchant\Merchant;
|
||||
use crmeb\services\RedisCacheService;
|
||||
use app\common\model\store\product\CloudProduct as CloudProductModel;
|
||||
|
||||
class CloudProduct
|
||||
{
|
||||
|
||||
public function handle($event)
|
||||
{
|
||||
if (!$event['source_mer_id']) {
|
||||
return true;
|
||||
}
|
||||
$sourceMerchant = Merchant::getDB()->where('mer_id', $event['source_mer_id'])->field('category_id,type_id')->find();
|
||||
if ($sourceMerchant['type_id'] != Merchant::TypeStore) {
|
||||
return true;
|
||||
}
|
||||
$cloudMerchant = Merchant::getDB()->where(['type_id' => Merchant::TypeCloudWarehouse, 'category_id' => $sourceMerchant['category_id'], 'status' => 1, 'mer_state' => 1])->value('mer_id');
|
||||
if ($cloudMerchant) {
|
||||
/** @var CloudProductDao $repo */
|
||||
$repo = app()->make(CloudProductDao::class);
|
||||
foreach ($event['product_id'] as $productId) {
|
||||
$productIds = $event['product_id'];
|
||||
$products = Product::withTrashed()->whereIn('product_id', $productIds)->field('product_id,mer_id,status,is_del,is_show,mer_status,is_used')->select();
|
||||
/** @var CloudProductDao $repo */
|
||||
$repo = app()->make(CloudProductDao::class);
|
||||
/** @var RedisCacheService $RedisCacheService */
|
||||
$RedisCacheService = app()->make(RedisCacheService::class);
|
||||
$clearCache = [];
|
||||
foreach ($products as $product) {
|
||||
$categoryId = Merchant::getDB()->where('mer_id', $product['mer_id'])->where('type_id', Merchant::TypeStore)->value('category_id');
|
||||
if (!$categoryId) {
|
||||
continue;
|
||||
}
|
||||
$cloudMerchant = Merchant::getDB()->where(['type_id' => Merchant::TypeCloudWarehouse, 'category_id' => $categoryId, 'status' => 1, 'mer_state' => 1])->value('mer_id');
|
||||
$status = $product->isEnable() ? 1 : 0;
|
||||
$exist = $repo->get($product['product_id']);
|
||||
if (!$exist) {
|
||||
$values = [
|
||||
'mer_id' => $cloudMerchant,
|
||||
'source_mer_id' => $event['source_mer_id'],
|
||||
'product_id' => $productId,
|
||||
'status' => $event['status'],
|
||||
'create_time' => date('Y-m-d H:i:s'),
|
||||
'source_mer_id' => $product['mer_id'],
|
||||
'product_id' => $product['product_id'],
|
||||
'status' => $status,
|
||||
$values['create_time'] = time(),
|
||||
];
|
||||
$exist = $repo->get($productId);
|
||||
if (!$exist) {
|
||||
$repo->create($values);
|
||||
} else {
|
||||
$repo->update((int)$productId, $values);
|
||||
}
|
||||
$repo->create($values);
|
||||
} else {
|
||||
$repo->update((int)$product['product_id'], ['status' => $status]);
|
||||
}
|
||||
$cacheKey = sprintf(\app\common\model\store\product\CloudProduct::CacheKey, $cloudMerchant);
|
||||
/** @var RedisCacheService $RedisCacheService */
|
||||
$RedisCacheService = app()->make(RedisCacheService::class);
|
||||
foreach ($event['product_id'] as $productId) {
|
||||
if ($event['status'] == 1) {
|
||||
$RedisCacheService->SADD($cacheKey, $productId);
|
||||
} else {
|
||||
$RedisCacheService->SREM($cacheKey, $productId);
|
||||
}
|
||||
|
||||
$cacheKey = sprintf(CloudProductModel::CacheKey, $product['mer_id']);
|
||||
$exist = $RedisCacheService->SISMEMBER($cacheKey, $product['product_id']);
|
||||
if ($status == 1 && !$exist) {
|
||||
$RedisCacheService->SADD($cacheKey, $product['product_id']);
|
||||
$clearCache[] = $product['mer_id'];
|
||||
} elseif ($status == 0) {
|
||||
$RedisCacheService->SREM($cacheKey, $product['product_id']);
|
||||
$clearCache[] = $product['mer_id'];
|
||||
}
|
||||
$takenKey = sprintf(\app\common\model\store\product\CloudProduct::TakenKey, $cloudMerchant);
|
||||
}
|
||||
foreach ($clearCache as $item) {
|
||||
$takenKey = sprintf(CloudProductModel::TakenKey, $item);
|
||||
$RedisCacheService->del($takenKey);
|
||||
}
|
||||
}
|
||||
|
||||
@ -42,6 +42,8 @@ class paySuccessOrder
|
||||
$commission_rate = ($event['order']['commission_rate'] / 100);
|
||||
//该笔订单平台总手续费
|
||||
$this->totalAmount = bcmul((string)$event['order']['total_price'], (string)$commission_rate, 2);
|
||||
$this->totalAmount = bcmul($this->totalAmount, (string)$event['order']['extension_one'], 2);
|
||||
$this->totalAmount = bcmul($this->totalAmount, (string)$event['order']['extension_two'], 2);
|
||||
$this->remain = $this->totalAmount;
|
||||
|
||||
//镇团队佣金
|
||||
@ -60,6 +62,8 @@ class paySuccessOrder
|
||||
->column('source,source_id,sum(product_price) total');
|
||||
foreach ($orderProduct as $item) {
|
||||
$this->totalAmount = bcmul((string)$item['total'], (string)$commission_rate, 2);
|
||||
$this->totalAmount = bcmul($this->totalAmount, (string)$item['extension_one'], 2);
|
||||
$this->totalAmount = bcmul($this->totalAmount, (string)$item['extension_two'], 2);
|
||||
if ($this->totalAmount <= 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user