From ec5e4281ea5d775fd18e7a0c5e94563adea52bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Tue, 11 Jun 2024 11:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96tao=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=8B=89=E5=8F=96=E3=80=81=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- open-api/pom.xml | 2 +- .../tao/controller/GoodsApiController.java | 168 +++-- .../tao/controller/GoodsController.java | 20 +- .../com/qihang/tao/domain/OmsTaoGoodsSku.java | 2 +- .../service/impl/OmsTaoGoodsServiceImpl.java | 30 +- .../com/qihang/tao/task/CronTaskLoader.java | 90 +-- .../java/com/qihang/tao/task/OrderTask.java | 60 +- vue/src/views/dou/goods/index.vue | 2 +- vue/src/views/dou/order/index.vue | 2 +- vue/src/views/dou/refund/index.vue | 12 +- vue/src/views/goods/brand/index.vue | 255 -------- .../goods/category/categoryAttribute.vue | 282 --------- .../goods/category/categoryAttributeValue.vue | 304 --------- vue/src/views/goods/category/index.vue | 351 ----------- vue/src/views/goods/create.vue | 580 ------------------ vue/src/views/goods/goodsInventory/index.vue | 265 -------- vue/src/views/goods/index.vue | 515 ---------------- vue/src/views/goods/shopGoods/index.vue | 46 -- vue/src/views/goods/spec/index.vue | 297 --------- vue/src/views/jd/goods/index.vue | 2 +- vue/src/views/jd/order/index.vue | 2 +- vue/src/views/jd/refund/index.vue | 2 +- vue/src/views/pdd/goods/index.vue | 2 +- vue/src/views/pdd/order/index.vue | 2 +- vue/src/views/pdd/refund/index.vue | 14 +- vue/src/views/shop/dou/goods/index.vue | 4 +- vue/src/views/shop/goods/index_old.vue | 503 --------------- vue/src/views/shop/index.vue | 341 ---------- vue/src/views/shop/jd/goods/index.vue | 4 +- vue/src/views/shop/pdd/goods/index.vue | 4 +- vue/src/views/shop/shop_index.vue | 10 +- vue/src/views/shop/tao/goods/index.vue | 4 +- .../views/shop/wei/ewaybill/account_list.vue | 2 +- vue/src/views/shop/wei/ewaybill/index.vue | 2 +- vue/src/views/shop/wei/goods/index.vue | 2 +- vue/src/views/shop/wei/goods/index_old.vue | 2 +- vue/src/views/shop/wei/order/index.vue | 2 +- vue/src/views/shop/wei/refund/index.vue | 2 +- vue/src/views/tao/goods/index.vue | 278 --------- vue/src/views/tao/order/index.vue | 2 +- vue/src/views/tao/refund/index.vue | 2 +- vue/src/views/xhs/order/index.vue | 2 +- 42 files changed, 223 insertions(+), 4250 deletions(-) delete mode 100644 vue/src/views/goods/brand/index.vue delete mode 100644 vue/src/views/goods/category/categoryAttribute.vue delete mode 100644 vue/src/views/goods/category/categoryAttributeValue.vue delete mode 100644 vue/src/views/goods/category/index.vue delete mode 100644 vue/src/views/goods/create.vue delete mode 100644 vue/src/views/goods/goodsInventory/index.vue delete mode 100644 vue/src/views/goods/index.vue delete mode 100644 vue/src/views/goods/shopGoods/index.vue delete mode 100644 vue/src/views/goods/spec/index.vue delete mode 100644 vue/src/views/shop/goods/index_old.vue delete mode 100644 vue/src/views/shop/index.vue delete mode 100644 vue/src/views/tao/goods/index.vue diff --git a/open-api/pom.xml b/open-api/pom.xml index 3f22faeb..4057d783 100644 --- a/open-api/pom.xml +++ b/open-api/pom.xml @@ -20,7 +20,7 @@ pdd-api dou-api wei-api - kwai-api + 17 diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java b/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java index 0f7ae6c2..e3cec249 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsApiController.java @@ -73,103 +73,87 @@ public class GoodsApiController extends BaseController { int insertSuccess = 0;//新增成功的订单 int totalError = 0; int hasExistOrder = 0;//已存在的订单数 + try { + ApiResultVo goodsItemApiResultVo = GoodsApiHelper.pullGoodsList(appKey, appSecret, sessionKey); + if (goodsItemApiResultVo.getCode() == ApiResultVoEnum.SUCCESS.getIndex()) { + //成功 + if (goodsItemApiResultVo.getList() != null) { + for (var g : goodsItemApiResultVo.getList()) { + OmsTaoGoods goods = new OmsTaoGoods(); + // TODO:转换goods + goods.setNumIid(g.getNum_iid()); + goods.setTitle(g.getTitle()); + goods.setType(g.getType()); + goods.setCid(g.getCid()); + goods.setPicUrl(g.getPic_url()); + goods.setNum(g.getNum()); + goods.setValidThru(g.getValid_thru()); + goods.setHasDiscount(g.isHas_discount() + ""); + goods.setHasInvoice(g.isHas_invoice() + ""); + goods.setHasWarranty(g.isHas_warranty() + ""); + goods.setHasShowcase(g.isHas_showcase() + ""); + goods.setModified(DateUtil.stringtoDate(g.getModified())); + goods.setDelistTime(StringUtils.isEmpty(g.getDelist_time()) ? null : DateUtil.stringtoDate(g.getDelist_time())); + goods.setPostageId(g.getPostage_id()); + goods.setOuterId(g.getOuter_id()); + goods.setListTime(StringUtils.isEmpty(g.getList_time()) ? null : DateUtil.stringtoDate(g.getList_time())); + goods.setPrice(g.getPrice()); + goods.setSoldQuantity(g.getSold_quantity()); + goods.setShopId(req.getShopId()); + List skuList = new ArrayList<>(); + for (var s : g.getSkuList()) { + OmsTaoGoodsSku sku = new OmsTaoGoodsSku(); + sku.setShopId(req.getShopId()); + sku.setNumIid(s.getNum_iid()); + sku.setIid(s.getIid()); + sku.setSkuId(s.getSku_id()); + sku.setProperties(s.getProperties()); + sku.setPropertiesName(s.getProperties_name()); + sku.setQuantity(s.getQuantity()); + sku.setSkuSpecId(s.getSku_spec_id() + ""); + sku.setPrice(StringUtils.isEmpty(s.getPrice()) ? null : Double.parseDouble(s.getPrice())); + sku.setOuterId(s.getOuter_id()); + sku.setCreated(StringUtils.isEmpty(s.getCreated()) ? null : DateUtil.stringtoDate(s.getCreated())); + sku.setModified(StringUtils.isEmpty(s.getModified()) ? null : DateUtil.stringtoDate(s.getModified())); + sku.setStatus(s.getStatus()); + sku.setCreateTime(new Date()); + skuList.add(sku); + } + goods.setSkuList(skuList); - ApiResultVo goodsItemApiResultVo = GoodsApiHelper.pullGoodsList(appKey, appSecret, sessionKey); - if(goodsItemApiResultVo.getCode() == ApiResultVoEnum.SUCCESS.getIndex()){ - //成功 - if(goodsItemApiResultVo.getList()!=null){ - for (var g:goodsItemApiResultVo.getList()) { - OmsTaoGoods goods = new OmsTaoGoods(); - // TODO:转换goods - goods.setNumIid(g.getNum_iid()); - goods.setTitle(g.getTitle()); - goods.setType(g.getType()); - goods.setCid(g.getCid()); - goods.setPicUrl(g.getPic_url()); - goods.setNum(g.getNum()); - goods.setValidThru(g.getValid_thru()); - goods.setHasDiscount(g.isHas_discount()+""); - goods.setHasInvoice(g.isHas_invoice()+""); - goods.setHasWarranty(g.isHas_warranty()+""); - goods.setHasShowcase(g.isHas_showcase()+""); - goods.setModified(DateUtil.stringtoDate(g.getModified())); - goods.setDelistTime(StringUtils.isEmpty(g.getDelist_time())?null:DateUtil.stringtoDate(g.getDelist_time())); - goods.setPostageId(g.getPostage_id()); - goods.setOuterId(g.getOuter_id()); - goods.setListTime(StringUtils.isEmpty(g.getList_time())?null:DateUtil.stringtoDate(g.getList_time())); - goods.setPrice(g.getPrice()); - goods.setSoldQuantity(g.getSold_quantity()); - goods.setShopId(req.getShopId()); - List skuList = new ArrayList<>(); - for (var s:g.getSkuList()) { - OmsTaoGoodsSku sku = new OmsTaoGoodsSku(); - sku.setShopId(req.getShopId()); - sku.setNumIid(s.getNum_iid()); - sku.setIid(s.getIid()); - sku.setSkuId(s.getSku_id()); - sku.setProperties(s.getProperties()); - sku.setPropertiesName(s.getProperties_name()); - sku.setQuantity(s.getQuantity()); - sku.setSkuSpecId(s.getSku_spec_id()+""); - sku.setPrice(StringUtils.isEmpty(s.getPrice())?null:Double.parseDouble(s.getPrice())); - sku.setOuterId(s.getOuter_id()); - sku.setCreated(StringUtils.isEmpty(s.getCreated())?null:DateUtil.stringtoDate(s.getCreated())); - sku.setModified(StringUtils.isEmpty(s.getModified())?null: DateUtil.stringtoDate(s.getModified())); - sku.setStatus(s.getStatus()); - sku.setCreateTime(new Date()); - skuList.add(sku); - } - goods.setSkuList(skuList); - - int result = goodsService.saveAndUpdateGoods(req.getShopId(), goods); - if (result == ResultVoEnum.DataExist.getIndex()) { - //已经存在 - hasExistOrder++; - } else if (result == ResultVoEnum.SUCCESS.getIndex()) { - insertSuccess++; - }else { - totalError++; + int result = goodsService.saveAndUpdateGoods(req.getShopId(), goods); + if (result == ResultVoEnum.DataExist.getIndex()) { + //已经存在 + hasExistOrder++; + } else if (result == ResultVoEnum.SUCCESS.getIndex()) { + insertSuccess++; + } else { + totalError++; + } } } - } - String msg = "成功，总共找到：" + goodsItemApiResultVo.getTotalRecords() + "条商品数据，新增：" + insertSuccess + "条，添加错误：" + totalError + "条，更新：" + hasExistOrder + "条"; - logger.info(msg); - SysShopPullLogs logs = new SysShopPullLogs(); - logs.setShopId(req.getShopId()); - logs.setShopType(EnumShopType.TAO.getIndex()); - logs.setPullType("GOODS"); - logs.setPullWay("主动拉取"); - logs.setPullParams("{PageNo:1,PageSize:100}"); - logs.setPullResult("{successTotal:"+goodsItemApiResultVo.getTotalRecords()+"}"); - logs.setPullTime(currDateTime); - logs.setDuration(System.currentTimeMillis() - startTime); - pullLogsService.save(logs); + String msg = "成功，总共找到：" + goodsItemApiResultVo.getTotalRecords() + "条商品数据，新增：" + insertSuccess + "条，添加错误：" + totalError + "条，更新：" + hasExistOrder + "条"; + logger.info(msg); + SysShopPullLogs logs = new SysShopPullLogs(); + logs.setShopId(req.getShopId()); + logs.setShopType(EnumShopType.TAO.getIndex()); + logs.setPullType("GOODS"); + logs.setPullWay("主动拉取"); + logs.setPullParams("{PageNo:1,PageSize:100}"); + logs.setPullResult("{successTotal:" + goodsItemApiResultVo.getTotalRecords() + "}"); + logs.setPullTime(currDateTime); + logs.setDuration(System.currentTimeMillis() - startTime); + pullLogsService.save(logs); // return new ApiResult<>(EnumResultVo.SUCCESS.getIndex(), msg); - return AjaxResult.success(msg); - }else{ - return AjaxResult.error(goodsItemApiResultVo.getCode(),goodsItemApiResultVo.getMsg()); + return AjaxResult.success(msg); + } else { + return AjaxResult.error(goodsItemApiResultVo.getCode(), goodsItemApiResultVo.getMsg()); + } + }catch (IllegalStateException e){ + e.printStackTrace(); + log.info("链接超时！！！！"); + return AjaxResult.error("链接超时！！！！"); } -// ApiResultVo resultVo = goodsApiService.pullGoodsList(req.getShopId(), url, appKey, appSecret, sessionKey); - - -// for (var goods:resultVo.getList()) { -// int result = goodsService.saveAndUpdateGoods(req.getShopId(), goods); -// if (result == ResultVoEnum.DataExist.getIndex()) { -// //已经存在 -// hasExistOrder++; -// } else if (result == ResultVoEnum.SUCCESS.getIndex()) { -// insertSuccess++; -// }else { -// totalError++; -// } -// } - - - -// String msg = "成功，总共找到：" + resultVo.getTotalRecords() + "条商品数据"; -// logger.info(msg); -//// return new ApiResult<>(EnumResultVo.SUCCESS.getIndex(), msg); -// return AjaxResult.success(msg); } } diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java b/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java index b0d94c39..0509c2dc 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java @@ -8,6 +8,7 @@ import com.qihang.common.common.PageResult; import com.qihang.common.common.TableDataInfo; import com.qihang.tao.common.BaseController; import com.qihang.tao.domain.OmsTaoGoods; +import com.qihang.tao.domain.OmsTaoGoodsSku; import com.qihang.tao.domain.bo.TaoGoodsBo; import com.qihang.tao.domain.vo.TaoGoodsSkuListVo; import com.qihang.tao.service.OmsTaoGoodsService; @@ -44,14 +45,15 @@ public class GoodsController extends BaseController { { return AjaxResult.success(skuService.getById(id)); } -// @PostMapping(value = "/sku/linkErp") -// public AjaxResult linkErp(@RequestBody LinkErpGoodsSkuBo bo) -// { -// TaoGoodsSku sku = new TaoGoodsSku(); -// sku.setId(bo.getId()); -// sku.setErpGoodsSkuId(Long.parseLong(bo.getErpGoodsSkuId())); -// skuService.updateById(sku); -// return success(); -// } + + @PostMapping(value = "/sku/linkErp") + public AjaxResult linkErp(@RequestBody LinkErpGoodsSkuBo bo) + { + OmsTaoGoodsSku sku = new OmsTaoGoodsSku(); + sku.setId(bo.getId()); + sku.setErpGoodsSkuId(Long.parseLong(bo.getErpGoodsSkuId())); + skuService.updateById(sku); + return success(); + } } diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/domain/OmsTaoGoodsSku.java b/open-api/tao-api/src/main/java/com/qihang/tao/domain/OmsTaoGoodsSku.java index 889eba8a..deca9533 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/domain/OmsTaoGoodsSku.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/domain/OmsTaoGoodsSku.java @@ -13,7 +13,7 @@ public class OmsTaoGoodsSku implements Serializable { /** * 主键id */ - private Long id; + private String id; /** * sku所属商品数字id diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/service/impl/OmsTaoGoodsServiceImpl.java b/open-api/tao-api/src/main/java/com/qihang/tao/service/impl/OmsTaoGoodsServiceImpl.java index c027f864..137d3e67 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/service/impl/OmsTaoGoodsServiceImpl.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/service/impl/OmsTaoGoodsServiceImpl.java @@ -62,14 +62,14 @@ public class OmsTaoGoodsServiceImpl extends ServiceImpl oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getOuterId())); - if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ - sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); - sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); - } - - } +// if(StringUtils.isNotEmpty(sku.getOuterId())) { +// List oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getOuterId())); +// if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ +// sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); +// sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); +// } +// +// } skuMapper.insert(sku); } } @@ -85,13 +85,13 @@ public class OmsTaoGoodsServiceImpl extends ServiceImpl oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getOuterId())); - if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ - sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); - sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); - } - } +// if(StringUtils.isNotEmpty(sku.getOuterId())) { +// List oGoodsSkus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(OGoodsSku::getSkuNum, sku.getOuterId())); +// if(oGoodsSkus!=null && !oGoodsSkus.isEmpty()){ +// sku.setErpGoodsId(oGoodsSkus.get(0).getErpGoodsId()); +// sku.setErpGoodsSkuId(oGoodsSkus.get(0).getErpSkuId()); +// } +// } skuMapper.insert(sku); } } diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/task/CronTaskLoader.java b/open-api/tao-api/src/main/java/com/qihang/tao/task/CronTaskLoader.java index 483e5271..dc85029a 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/task/CronTaskLoader.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/task/CronTaskLoader.java @@ -1,45 +1,45 @@ -package com.qihang.tao.task; - -import com.qihang.common.task.SchedulingConfiguration; -import lombok.extern.java.Log; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.util.concurrent.atomic.AtomicBoolean; -@Log -@Component -public class CronTaskLoader implements ApplicationRunner { -// private static final Logger log = LoggerFactory.getLogger(CronTaskLoader.class); - private final SchedulingConfiguration schedulingConfiguration; - private final AtomicBoolean appStarted = new AtomicBoolean(false); - private final AtomicBoolean initializing = new AtomicBoolean(false); - - public CronTaskLoader(SchedulingConfiguration schedulingConfiguration) { - this.schedulingConfiguration = schedulingConfiguration; - } - - /** - * 定时任务配置刷新(10分钟刷新一次) - */ - @Scheduled(fixedDelay = 600000) - public void cronTaskConfigRefresh() { - if (appStarted.get() && initializing.compareAndSet(false, true)) { - log.info("定时调度任务动态加载开始>>>>TAO>>"); - try { - schedulingConfiguration.refresh(); - } finally { - initializing.set(false); - } -// log.info("定时调度任务动态加载结束<<<<<<"); - } - } - - @Override - public void run(ApplicationArguments args) { - if (appStarted.compareAndSet(false, true)) { - cronTaskConfigRefresh(); - } - } -} \ No newline at end of file +//package com.qihang.tao.task; +// +//import com.qihang.common.task.SchedulingConfiguration; +//import lombok.extern.java.Log; +//import org.springframework.boot.ApplicationArguments; +//import org.springframework.boot.ApplicationRunner; +//import org.springframework.scheduling.annotation.Scheduled; +//import org.springframework.stereotype.Component; +// +//import java.util.concurrent.atomic.AtomicBoolean; +//@Log +//@Component +//public class CronTaskLoader implements ApplicationRunner { +//// private static final Logger log = LoggerFactory.getLogger(CronTaskLoader.class); +// private final SchedulingConfiguration schedulingConfiguration; +// private final AtomicBoolean appStarted = new AtomicBoolean(false); +// private final AtomicBoolean initializing = new AtomicBoolean(false); +// +// public CronTaskLoader(SchedulingConfiguration schedulingConfiguration) { +// this.schedulingConfiguration = schedulingConfiguration; +// } +// +// /** +// * 定时任务配置刷新(10分钟刷新一次) +// */ +// @Scheduled(fixedDelay = 600000) +// public void cronTaskConfigRefresh() { +// if (appStarted.get() && initializing.compareAndSet(false, true)) { +// log.info("定时调度任务动态加载开始>>>>TAO>>"); +// try { +// schedulingConfiguration.refresh(); +// } finally { +// initializing.set(false); +// } +//// log.info("定时调度任务动态加载结束<<<<<<"); +// } +// } +// +// @Override +// public void run(ApplicationArguments args) { +// if (appStarted.compareAndSet(false, true)) { +// cronTaskConfigRefresh(); +// } +// } +//} \ No newline at end of file diff --git a/open-api/tao-api/src/main/java/com/qihang/tao/task/OrderTask.java b/open-api/tao-api/src/main/java/com/qihang/tao/task/OrderTask.java index 5996cdb0..a362ecf4 100644 --- a/open-api/tao-api/src/main/java/com/qihang/tao/task/OrderTask.java +++ b/open-api/tao-api/src/main/java/com/qihang/tao/task/OrderTask.java @@ -1,30 +1,30 @@ -package com.qihang.tao.task; - -import com.qihang.common.task.IPollableService; -import com.qihang.tao.domain.SysTask; -import com.qihang.tao.service.SysTaskService; -import lombok.AllArgsConstructor; -import lombok.extern.java.Log; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; - -@Log -@AllArgsConstructor -@Service -public class OrderTask implements IPollableService { - - private final SysTaskService taskService; - @Override - public void poll() { - log.info("=======自动任务==TAO===拉取订单========="+ LocalDateTime.now()); -// System.out.printf("更新TAO订单%s","echo"); - } - - @Override - public String getCronExpression() { - SysTask task = taskService.getById(1); -// return "0/1 * * * * ?"; - return task.getCron(); - } -} \ No newline at end of file +//package com.qihang.tao.task; +// +//import com.qihang.common.task.IPollableService; +//import com.qihang.tao.domain.SysTask; +//import com.qihang.tao.service.SysTaskService; +//import lombok.AllArgsConstructor; +//import lombok.extern.java.Log; +//import org.springframework.stereotype.Service; +// +//import java.time.LocalDateTime; +// +//@Log +//@AllArgsConstructor +//@Service +//public class OrderTask implements IPollableService { +// +// private final SysTaskService taskService; +// @Override +// public void poll() { +// log.info("=======自动任务==TAO===拉取订单========="+ LocalDateTime.now()); +//// System.out.printf("更新TAO订单%s","echo"); +// } +// +// @Override +// public String getCronExpression() { +// SysTask task = taskService.getById(1); +//// return "0/1 * * * * ?"; +// return task.getCron(); +// } +//} \ No newline at end of file diff --git a/vue/src/views/dou/goods/index.vue b/vue/src/views/dou/goods/index.vue index 6cce2dc8..538fa29e 100644 --- a/vue/src/views/dou/goods/index.vue +++ b/vue/src/views/dou/goods/index.vue @@ -161,7 +161,7 @@ export default { }; }, created() { - listShop({type:3}).then(response => { + listShop({platform:3}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/dou/order/index.vue b/vue/src/views/dou/order/index.vue index 068b0ac8..4acaccec 100644 --- a/vue/src/views/dou/order/index.vue +++ b/vue/src/views/dou/order/index.vue @@ -756,7 +756,7 @@ export default { }; }, created() { - listShop({type:6}).then(response => { + listShop({platform:6}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/dou/refund/index.vue b/vue/src/views/dou/refund/index.vue index a4eddaeb..da8fe65d 100644 --- a/vue/src/views/dou/refund/index.vue +++ b/vue/src/views/dou/refund/index.vue @@ -17,7 +17,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + - + 搜索 重置 @@ -192,7 +192,7 @@ --> - + { + listShop({platform:6}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/goods/brand/index.vue b/vue/src/views/goods/brand/index.vue deleted file mode 100644 index 9920629b..00000000 --- a/vue/src/views/goods/brand/index.vue +++ /dev/null @@ -1,255 +0,0 @@ - - - diff --git a/vue/src/views/goods/category/categoryAttribute.vue b/vue/src/views/goods/category/categoryAttribute.vue deleted file mode 100644 index 3af5591f..00000000 --- a/vue/src/views/goods/category/categoryAttribute.vue +++ /dev/null @@ -1,282 +0,0 @@ - - - diff --git a/vue/src/views/goods/category/categoryAttributeValue.vue b/vue/src/views/goods/category/categoryAttributeValue.vue deleted file mode 100644 index eec43aff..00000000 --- a/vue/src/views/goods/category/categoryAttributeValue.vue +++ /dev/null @@ -1,304 +0,0 @@ - - - diff --git a/vue/src/views/goods/category/index.vue b/vue/src/views/goods/category/index.vue deleted file mode 100644 index de586780..00000000 --- a/vue/src/views/goods/category/index.vue +++ /dev/null @@ -1,351 +0,0 @@ - - - diff --git a/vue/src/views/goods/create.vue b/vue/src/views/goods/create.vue deleted file mode 100644 index 024aa71a..00000000 --- a/vue/src/views/goods/create.vue +++ /dev/null @@ -1,580 +0,0 @@ - - - - diff --git a/vue/src/views/goods/goodsInventory/index.vue b/vue/src/views/goods/goodsInventory/index.vue deleted file mode 100644 index f814c434..00000000 --- a/vue/src/views/goods/goodsInventory/index.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - diff --git a/vue/src/views/goods/index.vue b/vue/src/views/goods/index.vue deleted file mode 100644 index f63451e2..00000000 --- a/vue/src/views/goods/index.vue +++ /dev/null @@ -1,515 +0,0 @@ - - - diff --git a/vue/src/views/goods/shopGoods/index.vue b/vue/src/views/goods/shopGoods/index.vue deleted file mode 100644 index 8f00c30a..00000000 --- a/vue/src/views/goods/shopGoods/index.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/vue/src/views/goods/spec/index.vue b/vue/src/views/goods/spec/index.vue deleted file mode 100644 index a21be0db..00000000 --- a/vue/src/views/goods/spec/index.vue +++ /dev/null @@ -1,297 +0,0 @@ - - - diff --git a/vue/src/views/jd/goods/index.vue b/vue/src/views/jd/goods/index.vue index e52988d0..07ef30b2 100644 --- a/vue/src/views/jd/goods/index.vue +++ b/vue/src/views/jd/goods/index.vue @@ -176,7 +176,7 @@ export default { }; }, created() { - listShop({type:2}).then(response => { + listShop({platform:2}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/jd/order/index.vue b/vue/src/views/jd/order/index.vue index bc5b76d2..4c0db06e 100644 --- a/vue/src/views/jd/order/index.vue +++ b/vue/src/views/jd/order/index.vue @@ -159,7 +159,7 @@ export default { }; }, created() { - listShop({type:3}).then(response => { + listShop({platform:3}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/jd/refund/index.vue b/vue/src/views/jd/refund/index.vue index fabf0437..ef12180d 100644 --- a/vue/src/views/jd/refund/index.vue +++ b/vue/src/views/jd/refund/index.vue @@ -284,7 +284,7 @@ export default { }; }, created() { - listShop({type:2}).then(response => { + listShop({platform:2}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/pdd/goods/index.vue b/vue/src/views/pdd/goods/index.vue index 2611bac2..e7cb41cf 100644 --- a/vue/src/views/pdd/goods/index.vue +++ b/vue/src/views/pdd/goods/index.vue @@ -161,7 +161,7 @@ export default { }; }, created() { - listShop({type:4}).then(response => { + listShop({platform:4}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue index df51a59b..6302bca3 100644 --- a/vue/src/views/pdd/order/index.vue +++ b/vue/src/views/pdd/order/index.vue @@ -882,7 +882,7 @@ export default { }; }, created() { - listShop({type:5}).then(response => { + listShop({platform:5}).then(response => { this.shopList = response.rows; }); diff --git a/vue/src/views/pdd/refund/index.vue b/vue/src/views/pdd/refund/index.vue index 796cfda0..fd7d98a3 100644 --- a/vue/src/views/pdd/refund/index.vue +++ b/vue/src/views/pdd/refund/index.vue @@ -27,7 +27,7 @@ @keyup.enter.native="handleQuery" /> - + - + - + - + 搜索 重置 @@ -174,7 +174,7 @@ --> - + @@ -197,7 +197,7 @@ --> - + { + listShop({platform:5}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/shop/dou/goods/index.vue b/vue/src/views/shop/dou/goods/index.vue index e6abe060..ccd6559e 100644 --- a/vue/src/views/shop/dou/goods/index.vue +++ b/vue/src/views/shop/dou/goods/index.vue @@ -185,7 +185,7 @@ export default { }; }, created() { - listShop({type:6}).then(response => { + listShop({platform:6}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id @@ -260,7 +260,7 @@ export default { if(response.code === 1401) { MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => { // isRelogin.show = false; - this.$router.push({path:"/shop/shop_list",query:{type:6}}) + this.$router.push({path:"/shop/shop_list",query:{platform:6}}) // store.dispatch('LogOut').then(() => { // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId // }) diff --git a/vue/src/views/shop/goods/index_old.vue b/vue/src/views/shop/goods/index_old.vue deleted file mode 100644 index 6d27c14b..00000000 --- a/vue/src/views/shop/goods/index_old.vue +++ /dev/null @@ -1,503 +0,0 @@ - - - diff --git a/vue/src/views/shop/index.vue b/vue/src/views/shop/index.vue deleted file mode 100644 index 952f7d64..00000000 --- a/vue/src/views/shop/index.vue +++ /dev/null @@ -1,341 +0,0 @@ - - - diff --git a/vue/src/views/shop/jd/goods/index.vue b/vue/src/views/shop/jd/goods/index.vue index 153a88c1..29fd220f 100644 --- a/vue/src/views/shop/jd/goods/index.vue +++ b/vue/src/views/shop/jd/goods/index.vue @@ -178,7 +178,7 @@ export default { }; }, created() { - listShop({type: 3}).then(response => { + listShop({platform: 3}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id @@ -250,7 +250,7 @@ export default { MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => { // isRelogin.show = false; // store.dispatch('LogOut').then(() => { - this.$router.push({path:"/shop/shop_list",query:{type:3}}) + this.$router.push({path:"/shop/shop_list",query:{platform:3}}) // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId // }) }).catch(() => { diff --git a/vue/src/views/shop/pdd/goods/index.vue b/vue/src/views/shop/pdd/goods/index.vue index c41df92b..107df4e2 100644 --- a/vue/src/views/shop/pdd/goods/index.vue +++ b/vue/src/views/shop/pdd/goods/index.vue @@ -175,7 +175,7 @@ export default { }; }, created() { - listShop({type:5}).then(response => { + listShop({platform:5}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id @@ -246,7 +246,7 @@ export default { console.log('拉取PDD商品接口返回=====',response) if(response.code === 1401) { MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => { - this.$router.push({path:"/shop/shop_list",query:{type:5}}) + this.$router.push({path:"/shop/shop_list",query:{platform:5}}) // isRelogin.show = false; // store.dispatch('LogOut').then(() => { // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId diff --git a/vue/src/views/shop/shop_index.vue b/vue/src/views/shop/shop_index.vue index b42d8f82..801da66f 100644 --- a/vue/src/views/shop/shop_index.vue +++ b/vue/src/views/shop/shop_index.vue @@ -100,7 +100,7 @@ - + @@ -171,6 +171,10 @@ + + + + @@ -268,8 +272,8 @@ export default { created() { listPlatform().then(res=>{ this.typeList = res.rows; - if(this.$route.query.type){ - this.queryParams.type = parseInt(this.$route.query.type) + if(this.$route.query.platform){ + this.queryParams.platform = parseInt(this.$route.query.platform) } this.getList(); }) diff --git a/vue/src/views/shop/tao/goods/index.vue b/vue/src/views/shop/tao/goods/index.vue index 645804c6..1db2f88b 100644 --- a/vue/src/views/shop/tao/goods/index.vue +++ b/vue/src/views/shop/tao/goods/index.vue @@ -172,7 +172,7 @@ export default { }; }, created() { - listShop({type: 4}).then(response => { + listShop({platform: 4}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id @@ -230,7 +230,7 @@ export default { if(response.code === 1401) { MessageBox.confirm('Token已过期，需要重新授权！请前往店铺列表重新获取授权！', '系统提示', { confirmButtonText: '前往授权', cancelButtonText: '取消', type: 'warning' }).then(() => { // isRelogin.show = false; - this.$router.push({path:"/shop/shop_list",query:{type:4}}) + this.$router.push({path:"/shop/shop_list",query:{platform:4}}) // store.dispatch('LogOut').then(() => { // location.href = response.data.tokenRequestUrl+'?shopId='+this.queryParams.shopId // }) diff --git a/vue/src/views/shop/wei/ewaybill/account_list.vue b/vue/src/views/shop/wei/ewaybill/account_list.vue index f23a3f0d..6c303122 100644 --- a/vue/src/views/shop/wei/ewaybill/account_list.vue +++ b/vue/src/views/shop/wei/ewaybill/account_list.vue @@ -169,7 +169,7 @@ export default { }; }, created() { - // listShop({type:3}).then(response => { + // listShop({platform:3}).then(response => { // this.shopList = response.rows; // }); // this.getList(); diff --git a/vue/src/views/shop/wei/ewaybill/index.vue b/vue/src/views/shop/wei/ewaybill/index.vue index 879ce0cd..24315dcd 100644 --- a/vue/src/views/shop/wei/ewaybill/index.vue +++ b/vue/src/views/shop/wei/ewaybill/index.vue @@ -182,7 +182,7 @@ export default { }; }, created() { - // listShop({type:3}).then(response => { + // listShop({platform:3}).then(response => { // this.shopList = response.rows; // }); // this.getList(); diff --git a/vue/src/views/shop/wei/goods/index.vue b/vue/src/views/shop/wei/goods/index.vue index a8d6abaa..b397ede7 100644 --- a/vue/src/views/shop/wei/goods/index.vue +++ b/vue/src/views/shop/wei/goods/index.vue @@ -174,7 +174,7 @@ export default { }; }, created() { - listShop({type: 2}).then(response => { + listShop({platform: 2}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id diff --git a/vue/src/views/shop/wei/goods/index_old.vue b/vue/src/views/shop/wei/goods/index_old.vue index 49fd6fc1..d4465db8 100644 --- a/vue/src/views/shop/wei/goods/index_old.vue +++ b/vue/src/views/shop/wei/goods/index_old.vue @@ -169,7 +169,7 @@ export default { }; }, created() { - // listShop({type:3}).then(response => { + // listShop({platform:3}).then(response => { // this.shopList = response.rows; // }); // this.getList(); diff --git a/vue/src/views/shop/wei/order/index.vue b/vue/src/views/shop/wei/order/index.vue index a1c9de83..a2fd65ba 100644 --- a/vue/src/views/shop/wei/order/index.vue +++ b/vue/src/views/shop/wei/order/index.vue @@ -353,7 +353,7 @@ export default { }; }, created() { - listShop({type: 2}).then(response => { + listShop({platform: 2}).then(response => { this.shopList = response.rows; if (this.shopList && this.shopList.length > 0) { this.queryParams.shopId = this.shopList[0].id diff --git a/vue/src/views/shop/wei/refund/index.vue b/vue/src/views/shop/wei/refund/index.vue index 63b8d016..e3775dae 100644 --- a/vue/src/views/shop/wei/refund/index.vue +++ b/vue/src/views/shop/wei/refund/index.vue @@ -284,7 +284,7 @@ export default { }; }, created() { - listShop({type:2}).then(response => { + listShop({platform:2}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/tao/goods/index.vue b/vue/src/views/tao/goods/index.vue deleted file mode 100644 index 45f8c173..00000000 --- a/vue/src/views/tao/goods/index.vue +++ /dev/null @@ -1,278 +0,0 @@ - - - diff --git a/vue/src/views/tao/order/index.vue b/vue/src/views/tao/order/index.vue index e7f166e5..1f2a252f 100644 --- a/vue/src/views/tao/order/index.vue +++ b/vue/src/views/tao/order/index.vue @@ -193,7 +193,7 @@ export default { }; }, created() { - listShop({type:4}).then(response => { + listShop({platform:4}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/tao/refund/index.vue b/vue/src/views/tao/refund/index.vue index 462f579d..1acae03e 100644 --- a/vue/src/views/tao/refund/index.vue +++ b/vue/src/views/tao/refund/index.vue @@ -265,7 +265,7 @@ export default { }; }, created() { - listShop({type:1}).then(response => { + listShop({platform:1}).then(response => { this.shopList = response.rows; }); this.getList(); diff --git a/vue/src/views/xhs/order/index.vue b/vue/src/views/xhs/order/index.vue index 307ffc64..342a7837 100644 --- a/vue/src/views/xhs/order/index.vue +++ b/vue/src/views/xhs/order/index.vue @@ -718,7 +718,7 @@ export default { }; }, created() { - listShop({type:7}).then(response => { + listShop({platform:7}).then(response => { this.shopList = response.rows; }); this.getList();