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

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

Browse Source 
Reviewed-on: #126
This commit is contained in:
mkm 2024-01-23 12:29:38 +08:00
commit 82baff3003
5 changed files with 116 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -85,16 +85,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
}
}
foreach ($merchantCart['list'] as $cart) {
$canBuy = (new StoreActivityDao())->canBuy($cart['uid'], $cart['product_id']);
if (!$canBuy) {
throw new ValidateException('活动商品限购1个');
}
if ($canBuy == 2) {
$activityProductCount += $cart['cart_num'];
if ($activityProductCount > 1){
throw new ValidateException('活动商品限购1个');
}
}
if ($cart['product_type'] == 0) {
if ($cart['product']['once_min_count'] > 0 && $cart['product']['once_min_count'] > $cart['cart_num'])
throw new ValidateException('[低于起购数:' . $cart['product']['once_min_count'] . ']' . mb_substr($cart['product']['store_name'], 0, 10) . '...');
@ -112,6 +102,18 @@ class StoreOrderCreateRepository extends StoreOrderRepository
$order_type = $cart['product_type'];
}
$source = $cart['source'];
if($source==103){
$canBuy = (new StoreActivityDao())->canBuy($cart['uid'], $cart['product_id']);
if (!$canBuy) {
throw new ValidateException('活动商品限购1个');
}
if ($canBuy == 2) {
$activityProductCount += $cart['cart_num'];
if ($activityProductCount > 1){
throw new ValidateException('活动商品限购1个');
}
}
}
if ($cart['product_type'] <= 97 && $cart['product_type'] > 0 && (($cart['product_type'] != 10 && count($merchantCart['list']) != 1) || count($merchantCartList) != 1)) {
throw new ValidateException('活动商品必须单独购买');
}

8
app/controller/admin/store/StoreProduct.php
View File

@ -306,6 +306,7 @@ class StoreProduct extends BaseController
public function copy($product_id = 0, $mer_id = 0, $street_code = 0, $type_id = 0, $category_id = 0)
{
if ($product_id == 0) return app('json')->fail('参数错误');
$find= Db::name('merchant')->where('mer_id',$mer_id)->find();
$products = $this->repository->getAdminOneProduct($product_id, 0);
$product = $products->toArray();
$product['mer_id'] = $mer_id;
@ -321,7 +322,12 @@ class StoreProduct extends BaseController
'create_time' => date('Y-m-d H:i:s'),
'type_id' => $type_id,
'category_id' => $category_id,
'cate_id' => $product['cate_id']
'cate_id' => 2244,
'long' => $find['long'],
'lat' => $find['lat'],
'lat' => $find['lat'],
'store_name' => $products['store_name'],
'activity_id' =>2,
];
Db::name('cloud_product')->insert($data);
return $productId;

104
app/controller/api/Demo.php
View File

@ -21,6 +21,7 @@ use Exception;
use ZipArchive;
use think\facade\Queue;
use crmeb\jobs\ProductCopyJob;
/**
* Class Auth
* @package app\controller\api
@ -30,18 +31,95 @@ use crmeb\jobs\ProductCopyJob;
class Demo extends BaseController
{
public function index()
{
{
return app('json')->success('修改成功');
//[31,32,118,39,167,236,237,238,239]
// return app('json')->success('修改成功');>whereIn('mer_id',[110,116,149,227,226,35,117,148,156,104,137,151,136,183,140,229,79,133,235])->
// $merchant = Db::name('merchant')->where('mer_id', 31)->find();
// $arr = Db::name('cloud_product')->where('mer_id', $merchant['mer_id'])->select();
// $arr=Db::name('store_product')->whereIn('mer_id',[31,32,118,39,167,236,237,238,239])->where('is_show',1)->where('stock',0)->field('product_id')->select();
// foreach ($arr as $item) {
$arr=Db::name('store_product')->whereIn('mer_id',[31,32,118,39,167,236,237,238,239])->where('is_show',1)->where('stock',0)->field('product_id')->select();
foreach($arr as $item){
Queue::push(ProductCopyJob::class, ['product_id' => $item['product_id']]);//短信通知
// $store_name = Db::name('store_product')->where('product_id', $item['product_id'])->value('store_name');
// if ($store_name) {
// Db::name('cloud_product')->where('mer_id', $merchant['mer_id'])->where(
// 'product_id',
// $item['product_id']
// )->update(['store_name' => $store_name,'long'=>$merchant['long'],'lat'=>$merchant['lat']]);
// }
// // Queue::push(ProductCopyJob::class, ['product_id' => $item['product_id']]);//短信通知
// }
$arr=[
['product_id'=>171650,],
['product_id'=>171649,],
['product_id'=>171648,],
['product_id'=>171647],
];
$mer_id=167;//导入到的商户
$street_code=510521107;//导入到的商户
$type_id=17;//导入到的商户分类
$category_id=2566;//导入到的商户分类
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=236;//导入到的商户
$street_code=510521123;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=237;//导入到的商户
$street_code=510521115;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=238;//导入到的商户
$street_code=510521105;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=239;//导入到的商户
$street_code=510521116;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
//江阳
$mer_id=31;//导入到的商户
$street_code=510502108;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=32;//导入到的商户
$street_code=510502107;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=118;//导入到的商户
$street_code=510502106;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
$mer_id=39;//导入到的商户
$street_code=510502105;//导入到的商户
foreach($arr as $k=>$v){
Queue::push(ProductCopyJob::class, ['product_id' => $v['product_id'], 'mer_id' =>$mer_id,'street_code'=>$street_code,'type_id'=>$type_id,'category_id'=>$category_id]);//短信通知
}
}
public function transcoding($fileName)
@ -55,26 +133,26 @@ class Demo extends BaseController
return $fileName;
}
function createDirectories($path) {
function createDirectories($path)
{
if (is_dir($path)) {
return true ;
return true;
} else {
$parts = explode(DIRECTORY_SEPARATOR, $path);
$part = null;
foreach ($parts as $part) {
if ($part === '' || $part === '.' || $part === '..') {
continue;
}
$dir = dirname($path) . DIRECTORY_SEPARATOR . $part;
if (!file_exists($dir)) {
mkdir($dir, 0777, true);
}
}
return true ;
return true;
}
}
}

4
app/controller/api/store/product/CloudWarehouse.php
View File

@ -46,6 +46,7 @@ class CloudWarehouse extends BaseController
*/
public function index($street_code, $page = 1, $category_id = 0, $cate_pid = 0,$cate_id = 0,$location = '')
{
$keyword = $this->request->get('keyword');
if (!empty($location) && $location != ',') {
[$lat, $lng] = explode(',', $location);
} elseif (!empty($street_code)) {
@ -69,6 +70,9 @@ class CloudWarehouse extends BaseController
if($cate_id>0){
$query->whereIn('cate_id', $cate_id);
}
if (!empty($keyword)) {
$query->where('store_name', 'like', '%'. $keyword . '%');
}
$cloud_product_arr = $query->where(function($query){
$query->where('mer_labels', '')
->whereOr('mer_labels',',5,');

4
crmeb/jobs/ProductCopyJob.php
View File

@ -34,8 +34,8 @@ class ProductCopyJob implements JobInterface
// }
// }
// $make = app()->make(StoreProduct::class);
// $make->copy($data['product_id'],$data['mer_id'],$data['street_code'],$data['type_id'],$data['category_id']);
$make = app()->make(StoreProduct::class);
$make->copy($data['product_id'],$data['mer_id'],$data['street_code'],$data['type_id'],$data['category_id']);
$job->delete();
}