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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-12-01 14:35:49 +08:00
commit 52273c1299
10 changed files with 80 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/controller/admin/store/StoreCategory.php
View File

@ -204,26 +204,26 @@ class StoreCategory extends BaseController
$lv = $this->request->param('lv',null);
if (!is_null($lv)) $lv = $lv + 1;
$data = $this->repository->getList($type,$lv);
if ($lv) {
$ret = $data;
} else {
$ret = [];
foreach ($data as $key => $value) {
if (isset($value['children'])) {
$level = [];
foreach ($value['children'] as $child) {
if (isset($child['children'])) {
$level[] = $child;
}
}
if (isset($level) && !empty($level)) {
$value['children'] = $level;
$ret[] = $value;
}
}
}
}
return app('json')->success($ret);
// if ($lv) {
// $ret = $data;
// } else {
// $ret = [];
// foreach ($data as $key => $value) {
// if (isset($value['children'])) {
// $level = [];
// foreach ($value['children'] as $child) {
// if (isset($child['children'])) {
// $level[] = $child;
// }
// }
// if (isset($level) && !empty($level)) {
// $value['children'] = $level;
// $ret[] = $value;
// }
// }
// }
// }
return app('json')->success($data);
}
/**

32
app/controller/api/server/StoreCategory.php
View File

@ -126,22 +126,22 @@ class StoreCategory extends BaseController
public function getList()
{
$data = $this->repository->getList(1);
$ret = [];
foreach ($data as $key => $value) {
if (isset($value['children'])) {
$level = [];
foreach ($value['children'] as $child) {
if (isset($child['children'])) {
$level[] = $child;
}
}
if (isset($level) && !empty($level)) {
$value['children'] = $level;
$ret[] = $value;
}
}
}
return app('json')->success($ret);
// $ret = [];
// foreach ($data as $key => $value) {
// if (isset($value['children'])) {
// $level = [];
// foreach ($value['children'] as $child) {
// if (isset($child['children'])) {
// $level[] = $child;
// }
// }
// if (isset($level) && !empty($level)) {
// $value['children'] = $level;
// $ret[] = $value;
// }
// }
// }
return app('json')->success($data);
}
/**

8
app/controller/merchant/store/StoreImport.php
View File

@ -16,6 +16,7 @@ use app\common\repositories\store\order\StoreImportDeliveryRepository;
use app\common\repositories\store\order\StoreOrderRepository;
use crmeb\jobs\ImportSpreadsheetExcelJob;
use crmeb\jobs\ImportPicJob;
use crmeb\jobs\ImportProductJob;
use crmeb\services\ExcelService;
use crmeb\services\SpreadsheetExcelService;
use crmeb\services\UploadService;
@ -232,7 +233,9 @@ class StoreImport extends BaseController
'where' => ['store_name' => 'A'],
]
];
app()->make(StoreOrderRepository::class)->setProduct($data['data'],$data['mer_id'],$type_id);
// app()->make(StoreOrderRepository::class)->setProduct($data['data'],$data['mer_id'],$type_id);
Queue::push(ImportProductJob::class,['mer_id'=>$data['mer_id'],'data'=>$data['data'],'type_id'=>$type_id]);
}else{
$check =[
'A1'=>'商品名称（必填）',
@ -258,7 +261,8 @@ class StoreImport extends BaseController
'where' => ['store_name' => 'A'],
]
];
app()->make(StoreOrderRepository::class)->setProduct($data['data'],$data['mer_id'],$type_id);
Queue::push(ImportProductJob::class,['mer_id'=>$data['mer_id'],'data'=>$data['data'],'type_id'=>$type_id]);
// app()->make(StoreOrderRepository::class)->setProduct($data['data'],$data['mer_id'],$type_id);
}
}
public function transcoding($fileName)

10
app/controller/merchant/store/product/Product.php
View File

@ -86,11 +86,11 @@ class Product extends BaseController
{
$params = $this->request->params($this->repository::CREATE_PARAMS);
$data = $this->repository->checkParams($params,$this->request->merId());
$cate_id=StoreCategory::where('pid',$data['cate_id'])->where('level',2)->value('store_category_id');
if(!$cate_id){
return app('json')->fail('请先添加第三级分类');
}
$data['cate_id']=$cate_id;
// $cate_id=StoreCategory::where('pid',$data['cate_id'])->where('level',2)->value('store_category_id');
// if(!$cate_id){
// return app('json')->fail('请先添加第三级分类');
// }
// $data['cate_id']=$cate_id;
$data['mer_id'] = $this->request->merId();
if ($data['is_gift_bag'] && !$this->repository->checkMerchantBagNumber($data['mer_id']))
return app('json')->fail('礼包数量超过数量限制');

29
crmeb/jobs/ImportProductJob.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace crmeb\jobs;
use crmeb\interfaces\JobInterface;
use think\facade\Log;
use app\common\repositories\store\order\StoreOrderRepository;
class ImportProductJob implements JobInterface
{
public function fire($job, $data)
{
Log::error('开始导入商品:' . $job->attempts());
if ($job->attempts() > 1) {
$job->delete();
$this->failed($data);
}
app()->make(StoreOrderRepository::class)->setProduct($data['data'],$data['mer_id'],$data['type_id']);
$job->delete();
}
public function failed($data)
{
Log::error('导入商品失败:' . json_encode($data));
// TODO: Implement failed() method.
}
}

2
public/mer.html
View File

File diff suppressed because one or more lines are too long

2
public/mer/css/chunk-ada5bd26.29cda840.css → public/mer/css/chunk-77630b52.14ffd303.css
View File

@ -1 +1 @@
.title[data-v-3500ed7a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.description-term[data-v-3500ed7a]{display:table-cell;padding-bottom:10px;line-height:20px;width:50%;font-size:12px}[data-v-3cd1b9b0] .el-cascader{display:block}.dialog-scustom[data-v-3cd1b9b0]{width:1200px;height:600px}.ela-btn[data-v-3cd1b9b0]{color:#2d8cf0}.Box .ivu-radio-wrapper[data-v-3cd1b9b0]{margin-right:25px}.Box .numPut[data-v-3cd1b9b0]{width:80%!important}.lunBox[data-v-3cd1b9b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;border:1px solid #0bb20c}.pictrueBox[data-v-3cd1b9b0]{display:inline-block}.pictrue[data-v-3cd1b9b0]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-3cd1b9b0]{width:100%;height:100%}.pictrueTab[data-v-3cd1b9b0]{width:40px!important;height:40px!important}.upLoad[data-v-3cd1b9b0]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.ft[data-v-3cd1b9b0]{color:red}.buttonGroup[data-v-3cd1b9b0]{position:relative;display:inline-block;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.buttonGroup .small-btn[data-v-3cd1b9b0]{position:relative;float:left;height:24px;padding:0 7px;font-size:14px;border-radius:3px}.buttonGroup .small-btn[data-v-3cd1b9b0]:first-child{margin-left:0;border-bottom-right-radius:0;border-top-right-radius:0}.virtual_boder[data-v-3cd1b9b0]{border:1px solid #1890ff}.virtual_boder2[data-v-3cd1b9b0]{border:1px solid #e7e7e7}.virtual_san[data-v-3cd1b9b0]{position:absolute;bottom:0;right:0;width:0;height:0;border-bottom:26px solid #1890ff;border-left:26px solid transparent}.virtual_dui[data-v-3cd1b9b0]{position:absolute;bottom:-2px;right:2px;color:#fff;font-family:system-ui}.virtual[data-v-3cd1b9b0]{width:120px;height:60px;background:#fff;border-radius:3px;float:left;text-align:center;padding-top:8px;position:relative;cursor:pointer;line-height:23px}.virtual .virtual_top[data-v-3cd1b9b0]{font-size:14px;font-weight:600;color:rgba(0,0,0,.85)}.virtual .virtual_bottom[data-v-3cd1b9b0]{font-size:12px;font-weight:400;color:#999}.virtual[data-v-3cd1b9b0]:nth-child(2n){margin:0 12px}[data-v-7d87bc0d] .el-cascader{display:block}.ela-btn[data-v-7d87bc0d]{color:#2d8cf0}.priceBox[data-v-7d87bc0d]{width:80px}.pictrue[data-v-7d87bc0d]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-7d87bc0d]{width:100%;height:100%}[data-v-7d87bc0d] .el-input-number__decrease,[data-v-7d87bc0d] .el-input-number__increase{display:none}[data-v-7d87bc0d] .el-input-number.is-controls-right .el-input__inner,[data-v-7d87bc0d] .el-input__inner{padding:0 5px}.pictrueTab[data-v-7d87bc0d]{width:40px!important;height:40px!important}.upLoad[data-v-7d87bc0d]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.bg[data-v-e9391b98]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.goods_detail .goods_detail_wrapper[data-v-e9391b98]{z-index:-10}[data-v-e9391b98] table.el-input__inner{padding:0}.demo-table-expand[data-v-e9391b98]{font-size:0}.demo-table-expand1[data-v-e9391b98] label{width:77px!important;color:#99a9bf}.demo-table-expand .el-form-item[data-v-e9391b98]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-e9391b98]{width:350px!important}.seachTiele[data-v-e9391b98]{line-height:35px}
.title[data-v-3500ed7a]{margin-bottom:16px;color:#17233d;font-weight:500;font-size:14px}.description-term[data-v-3500ed7a]{display:table-cell;padding-bottom:10px;line-height:20px;width:50%;font-size:12px}[data-v-3cd1b9b0] .el-cascader{display:block}.dialog-scustom[data-v-3cd1b9b0]{width:1200px;height:600px}.ela-btn[data-v-3cd1b9b0]{color:#2d8cf0}.Box .ivu-radio-wrapper[data-v-3cd1b9b0]{margin-right:25px}.Box .numPut[data-v-3cd1b9b0]{width:80%!important}.lunBox[data-v-3cd1b9b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;border:1px solid #0bb20c}.pictrueBox[data-v-3cd1b9b0]{display:inline-block}.pictrue[data-v-3cd1b9b0]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-3cd1b9b0]{width:100%;height:100%}.pictrueTab[data-v-3cd1b9b0]{width:40px!important;height:40px!important}.upLoad[data-v-3cd1b9b0]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.ft[data-v-3cd1b9b0]{color:red}.buttonGroup[data-v-3cd1b9b0]{position:relative;display:inline-block;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.buttonGroup .small-btn[data-v-3cd1b9b0]{position:relative;float:left;height:24px;padding:0 7px;font-size:14px;border-radius:3px}.buttonGroup .small-btn[data-v-3cd1b9b0]:first-child{margin-left:0;border-bottom-right-radius:0;border-top-right-radius:0}.virtual_boder[data-v-3cd1b9b0]{border:1px solid #1890ff}.virtual_boder2[data-v-3cd1b9b0]{border:1px solid #e7e7e7}.virtual_san[data-v-3cd1b9b0]{position:absolute;bottom:0;right:0;width:0;height:0;border-bottom:26px solid #1890ff;border-left:26px solid transparent}.virtual_dui[data-v-3cd1b9b0]{position:absolute;bottom:-2px;right:2px;color:#fff;font-family:system-ui}.virtual[data-v-3cd1b9b0]{width:120px;height:60px;background:#fff;border-radius:3px;float:left;text-align:center;padding-top:8px;position:relative;cursor:pointer;line-height:23px}.virtual .virtual_top[data-v-3cd1b9b0]{font-size:14px;font-weight:600;color:rgba(0,0,0,.85)}.virtual .virtual_bottom[data-v-3cd1b9b0]{font-size:12px;font-weight:400;color:#999}.virtual[data-v-3cd1b9b0]:nth-child(2n){margin:0 12px}[data-v-7d87bc0d] .el-cascader{display:block}.ela-btn[data-v-7d87bc0d]{color:#2d8cf0}.priceBox[data-v-7d87bc0d]{width:80px}.pictrue[data-v-7d87bc0d]{width:50px;height:50px;border:1px dotted rgba(0,0,0,.1);display:inline-block;position:relative;cursor:pointer}.pictrue img[data-v-7d87bc0d]{width:100%;height:100%}[data-v-7d87bc0d] .el-input-number__decrease,[data-v-7d87bc0d] .el-input-number__increase{display:none}[data-v-7d87bc0d] .el-input-number.is-controls-right .el-input__inner,[data-v-7d87bc0d] .el-input__inner{padding:0 5px}.pictrueTab[data-v-7d87bc0d]{width:40px!important;height:40px!important}.upLoad[data-v-7d87bc0d]{width:40px;height:40px;border:1px dotted rgba(0,0,0,.1);border-radius:4px;background:rgba(0,0,0,.02);cursor:pointer}.bg[data-v-95f6c30c]{z-index:100;position:fixed;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.goods_detail .goods_detail_wrapper[data-v-95f6c30c]{z-index:-10}[data-v-95f6c30c] table.el-input__inner{padding:0}.demo-table-expand[data-v-95f6c30c]{font-size:0}.demo-table-expand1[data-v-95f6c30c] label{width:77px!important;color:#99a9bf}.demo-table-expand .el-form-item[data-v-95f6c30c]{margin-right:0;margin-bottom:0;width:33.33%}.selWidth[data-v-95f6c30c]{width:350px!important}.seachTiele[data-v-95f6c30c]{line-height:35px}

2
public/mer/js/app.13af7fde.js → public/mer/js/app.a91b5d7a.js
View File

File diff suppressed because one or more lines are too long

1
public/mer/js/chunk-77630b52.7d3e8d4c.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/mer/js/chunk-ada5bd26.85765c23.js
View File

File diff suppressed because one or more lines are too long