yjc/erp
1
0
Fork 0
mirror of https://gitee.com/hzchunfen/erp.git synced 2025-11-30 22:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

!123 同步更新商品优化

Browse Source 
Merge pull request !123 from develop
This commit is contained in:
赵世界 2022-11-01 06:18:19 +00:00 committed by Gitee
commit f9fd45fbd2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
30 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Shop/ShopsController.php
View File

@ -172,8 +172,6 @@ class ShopsController extends Controller
public function downloadGoods($id, Request $request) public function downloadGoods($id, Request $request)
{ {
$shop = Shop::query()->find($id); $shop = Shop::query()->find($id);
// 删除已下载的商品数据
BusinessGoodsSku::query()->where('shop_id', $shop->id)->delete();
$business = BusinessFactory::init()->make($shop->plat_id); $business = BusinessFactory::init()->make($shop->plat_id);
$business->setShop($shop); $business->setShop($shop);
$business->downloadGoodsListAndBind(); $business->downloadGoodsListAndBind();

7
app/Services/Business/KuaiTuanTuan/KuaiTuanTuan.php
View File

@ -123,7 +123,12 @@ class KuaiTuanTuan extends BusinessClient
$publicParams['sign'] = $this->getSign($publicParams); $publicParams['sign'] = $this->getSign($publicParams);
$res = $this->formDataPostRequest($url, $publicParams); $res = $this->formDataPostRequest($url, $publicParams);
if (isset($res['error_response'])) { if (isset($res['error_response'])) {
Log::info(json_encode($res, 256)); // "error_msg":"业务服务错误","sub_msg":"该店铺下不存在该商品","sub_code":"11","error_code":50001
// "error_msg":"业务服务错误","sub_msg":"该SKU在快团团中设置的库存为无限库存，不支持修改库存","sub_code":"13","error_code":50001
if (50001 == $res['error_response']['error_code'] && in_array($res['error_response']['sub_code'], ['13', '11'])) {
BusinessGoodsSku::query()->where('goods_id', $appendParams['goods_id'])->where('sku_id', $appendParams['sku_id'])->update(['is_sync' => 0]);
}
Log::error(json_encode($res, 256));
} }
return $res; return $res;

2
public/dist/index.html vendored
View File

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-0f6f9608.b3153d73.css" rel="prefetch"><link href="css/chunk-10d9ee19.84a6683c.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.51c2ef91.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-0f6f9608.eccd92af.js" rel="prefetch"><link href="js/chunk-10d9ee19.6bc719ae.js" rel="prefetch"><link href="js/chunk-26daa808.2474195a.js" rel="prefetch"><link href="js/chunk-35db73ce.fe38bb27.js" rel="prefetch"><link href="js/chunk-4caed774.f85b30e3.js" rel="prefetch"><link href="js/chunk-52fcdd7c.024c67cb.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.d79d9abf.js" rel="prefetch"><link href="js/chunk-743f0316.503949a4.js" rel="prefetch"><link href="js/chunk-75426f71.3cf1798d.js" rel="prefetch"><link href="js/chunk-904e5abc.3be42305.js" rel="prefetch"><link href="js/chunk-a3ddd952.0a612044.js" rel="prefetch"><link href="js/chunk-ab4d3e40.65848b76.js" rel="prefetch"><link href="js/chunk-e35186f0.2b972719.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.e264ca96.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.dd37326c.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.dd37326c.js"></script></body></html> <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>erp</title><link href="css/chunk-088acbde.902ebb66.css" rel="prefetch"><link href="css/chunk-0cbcaa56.e05858e7.css" rel="prefetch"><link href="css/chunk-0f6f9608.b3153d73.css" rel="prefetch"><link href="css/chunk-10d9ee19.84a6683c.css" rel="prefetch"><link href="css/chunk-26daa808.62429343.css" rel="prefetch"><link href="css/chunk-35db73ce.1f9c10ff.css" rel="prefetch"><link href="css/chunk-4caed774.ad94328f.css" rel="prefetch"><link href="css/chunk-52fcdd7c.51e3ffbd.css" rel="prefetch"><link href="css/chunk-6ae0a0d3.84a02b23.css" rel="prefetch"><link href="css/chunk-743f0316.fb5066fb.css" rel="prefetch"><link href="css/chunk-75426f71.902ebb66.css" rel="prefetch"><link href="css/chunk-904e5abc.902ebb66.css" rel="prefetch"><link href="css/chunk-a3ddd952.902ebb66.css" rel="prefetch"><link href="css/chunk-ab4d3e40.d941d6ef.css" rel="prefetch"><link href="css/chunk-e35186f0.902ebb66.css" rel="prefetch"><link href="css/chunk-f0b6f0d4.a3b83cc4.css" rel="prefetch"><link href="css/chunk-f35dfe36.ea52b615.css" rel="prefetch"><link href="js/chunk-088acbde.08d60870.js" rel="prefetch"><link href="js/chunk-0cbcaa56.46e3dd42.js" rel="prefetch"><link href="js/chunk-0f6f9608.cdc3788a.js" rel="prefetch"><link href="js/chunk-10d9ee19.6bc719ae.js" rel="prefetch"><link href="js/chunk-26daa808.9e326ce2.js" rel="prefetch"><link href="js/chunk-35db73ce.ae2590c3.js" rel="prefetch"><link href="js/chunk-4caed774.d65d1796.js" rel="prefetch"><link href="js/chunk-52fcdd7c.0070e388.js" rel="prefetch"><link href="js/chunk-63c1eac8.59f3df74.js" rel="prefetch"><link href="js/chunk-6ae0a0d3.ee4aa3e0.js" rel="prefetch"><link href="js/chunk-743f0316.503949a4.js" rel="prefetch"><link href="js/chunk-75426f71.128f599c.js" rel="prefetch"><link href="js/chunk-904e5abc.e6a5edbe.js" rel="prefetch"><link href="js/chunk-a3ddd952.0482ce75.js" rel="prefetch"><link href="js/chunk-ab4d3e40.078de018.js" rel="prefetch"><link href="js/chunk-e35186f0.055dd015.js" rel="prefetch"><link href="js/chunk-f0b6f0d4.e264ca96.js" rel="prefetch"><link href="js/chunk-f35dfe36.e7038b09.js" rel="prefetch"><link href="css/app.6c30acd7.css" rel="preload" as="style"><link href="css/chunk-vendors.9181e156.css" rel="preload" as="style"><link href="js/app.64b5d689.js" rel="preload" as="script"><link href="js/chunk-vendors.524d6b36.js" rel="preload" as="script"><link href="css/chunk-vendors.9181e156.css" rel="stylesheet"><link href="css/app.6c30acd7.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but erp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.524d6b36.js"></script><script src="js/app.64b5d689.js"></script></body></html>

4
public/dist/js/app.dd37326c.js → public/dist/js/app.64b5d689.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/app.dd37326c.js.map → public/dist/js/app.64b5d689.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-088acbde.51c2ef91.js → public/dist/js/chunk-088acbde.08d60870.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-088acbde.51c2ef91.js.map → public/dist/js/chunk-088acbde.08d60870.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-0f6f9608.eccd92af.js → public/dist/js/chunk-0f6f9608.cdc3788a.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-0f6f9608.eccd92af.js.map → public/dist/js/chunk-0f6f9608.cdc3788a.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-26daa808.2474195a.js → public/dist/js/chunk-26daa808.9e326ce2.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-26daa808.2474195a.js.map → public/dist/js/chunk-26daa808.9e326ce2.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-35db73ce.fe38bb27.js → public/dist/js/chunk-35db73ce.ae2590c3.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-35db73ce.fe38bb27.js.map → public/dist/js/chunk-35db73ce.ae2590c3.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-4caed774.f85b30e3.js → public/dist/js/chunk-4caed774.d65d1796.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-4caed774.f85b30e3.js.map → public/dist/js/chunk-4caed774.d65d1796.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-52fcdd7c.024c67cb.js → public/dist/js/chunk-52fcdd7c.0070e388.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-52fcdd7c.024c67cb.js.map → public/dist/js/chunk-52fcdd7c.0070e388.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-6ae0a0d3.d79d9abf.js → public/dist/js/chunk-6ae0a0d3.ee4aa3e0.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-6ae0a0d3.d79d9abf.js.map → public/dist/js/chunk-6ae0a0d3.ee4aa3e0.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-75426f71.3cf1798d.js → public/dist/js/chunk-75426f71.128f599c.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-75426f71.3cf1798d.js.map → public/dist/js/chunk-75426f71.128f599c.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-904e5abc.3be42305.js → public/dist/js/chunk-904e5abc.e6a5edbe.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-904e5abc.3be42305.js.map → public/dist/js/chunk-904e5abc.e6a5edbe.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-a3ddd952.0a612044.js → public/dist/js/chunk-a3ddd952.0482ce75.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-a3ddd952.0a612044.js.map → public/dist/js/chunk-a3ddd952.0482ce75.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-ab4d3e40.65848b76.js → public/dist/js/chunk-ab4d3e40.078de018.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-ab4d3e40.65848b76.js.map → public/dist/js/chunk-ab4d3e40.078de018.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
public/dist/js/chunk-e35186f0.2b972719.js → public/dist/js/chunk-e35186f0.055dd015.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/dist/js/chunk-e35186f0.2b972719.js.map → public/dist/js/chunk-e35186f0.055dd015.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
resources/frontend/src/util/http.js vendored
View File

@ -4,7 +4,7 @@ import NProgress from "nprogress";
import "nprogress/nprogress.css"; import "nprogress/nprogress.css";
import { Message } from "element-ui"; import { Message } from "element-ui";
var instance = axios.create({ var instance = axios.create({
timeout: 120000, timeout: 360000,
}); });
instance.interceptors.request.use( instance.interceptors.request.use(