From 42b6989f2ab45f74c2c0ba657b2ca9d955f7f7bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Sat, 17 Jan 2026 14:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96tao=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tao/controller/TaoGoodsApiController.java | 4 ++- docs/qihang-erp.sql | 2 ++ .../qihangerp/model/entity/TaoGoodsSku.java | 5 +++ .../tao/service/impl/TaoGoodsServiceImpl.java | 9 ++++-- .../mapper/tao/TaoGoodsSkuMapper.xml | 4 ++- vue/src/views/tao/goods/goods_list.vue | 9 +++--- vue/src/views/tao/goods/sku_list.vue | 32 ++++++++++++------- 7 files changed, 44 insertions(+), 21 deletions(-) diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java index 95e0be2d..a06ad27b 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java @@ -129,11 +129,13 @@ public class TaoGoodsApiController { TaoGoodsSku taoGoodsSku = new TaoGoodsSku(); BeanUtils.copyProperties(s, taoGoodsSku); // taoGoodsSku.setShopId(req.getShopId()); + taoGoodsSku.setTitle(taoGoods.getTitle()); + taoGoodsSku.setPicUrl(taoGoods.getPicUrl()); taoGoodsSku.setNumIid(s.getNum_iid()); taoGoodsSku.setIid(s.getIid()); taoGoodsSku.setSkuId(s.getSku_id()); taoGoodsSku.setProperties(s.getProperties()); - taoGoodsSku.setPropertiesName(s.getProperties_name()); + taoGoodsSku.setPropertiesName(s.getProperties_name().replace(s.getProperties()+":","")); taoGoodsSku.setQuantity(s.getQuantity()); taoGoodsSku.setSkuSpecId(s.getSku_spec_id() + ""); taoGoodsSku.setPrice(StringUtils.isEmpty(s.getPrice()) ? null : Double.parseDouble(s.getPrice())); diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql index ad8f02e2..67b59f55 100644 --- a/docs/qihang-erp.sql +++ b/docs/qihang-erp.sql @@ -3345,6 +3345,8 @@ CREATE TABLE `oms_tao_goods_sku` ( `tao_goods_id` bigint NOT NULL COMMENT '外键id', `num_iid` bigint NOT NULL COMMENT 'sku所属商品数字id', `iid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'sku所属商品id(注意：iid近期即将废弃，请用num_iid参数)', + `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品标题', + `pic_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品图片', `sku_id` bigint NOT NULL COMMENT '商品skuid，阿里', `properties` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'sku的销售属性组合字符串（颜色，大小，等等，可通过类目API获取某类目下的销售属性）,格式是p1:v1;p2:v2', `properties_name` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'sku所对应的销售属性的中文名字串，格式如：pid1:vid1:pid_name1:vid_name1;pid2:vid2:pid_name2:vid_name2……', diff --git a/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java b/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java index 7be379ed..d067137f 100644 --- a/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java +++ b/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java @@ -36,6 +36,11 @@ public class TaoGoodsSku implements Serializable { * sku所属商品id(注意：iid近期即将废弃，请用num_iid参数) */ private String iid; + private String title; + /** + * 图 + */ + private String picUrl; /** * 商品skuid，阿里 diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java index aa14c7ae..238fba67 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java @@ -64,6 +64,7 @@ public class TaoGoodsServiceImpl extends ServiceImpl @Transactional @Override public int saveAndUpdateGoods(Long shopId, TaoGoods goods) { + if(goods==null) return ResultVoEnum.Fail.getIndex(); List goodsList = mapper.selectList(new LambdaQueryWrapper().eq(TaoGoods::getNumIid, goods.getNumIid())); if(goodsList!=null && goodsList.size()>0){ // 存在，更新 @@ -73,8 +74,6 @@ public class TaoGoodsServiceImpl extends ServiceImpl // goods.setOuterId(erpGoodsNum); // goods.setErpGoodsId(erpGoodsId); mapper.updateById(goods); - - return ResultVoEnum.DataExist.getIndex(); }else { // 不存在，新增 goods.setShopId(shopId); @@ -101,6 +100,7 @@ public class TaoGoodsServiceImpl extends ServiceImpl List taoGoodsSkus = skuMapper.selectList(new LambdaQueryWrapper().eq(TaoGoodsSku::getSkuId, sku.getSkuId())); if(taoGoodsSkus!=null && !taoGoodsSkus.isEmpty()){ // 更新 + sku.setId(taoGoodsSkus.get(0).getId()); sku.setUpdateTime(new Date()); skuMapper.updateById(sku); }else { @@ -118,7 +118,10 @@ public class TaoGoodsServiceImpl extends ServiceImpl taoGoodsUpdate.setErpGoodsId(erpGoodsId); mapper.updateById(taoGoodsUpdate); } - return 0; + + if(goodsList!=null && goodsList.size()>0) { + return ResultVoEnum.DataExist.getIndex(); + }else return ResultVoEnum.SUCCESS.getIndex(); } /** diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml index bb89d031..09a80248 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml @@ -9,6 +9,8 @@ + + @@ -30,7 +32,7 @@ id,tao_goods_id,num_iid,shop_id, - iid,sku_id,properties, + iid,sku_id,properties,pic_url,title, properties_name,quantity,spec, price,outer_id,created, modified,status,sku_spec_id, diff --git a/vue/src/views/tao/goods/goods_list.vue b/vue/src/views/tao/goods/goods_list.vue index 1409acd0..a310a094 100644 --- a/vue/src/views/tao/goods/goods_list.vue +++ b/vue/src/views/tao/goods/goods_list.vue @@ -68,14 +68,15 @@ - + + - - + + diff --git a/vue/src/views/tao/goods/sku_list.vue b/vue/src/views/tao/goods/sku_list.vue index 055232d1..6699a665 100644 --- a/vue/src/views/tao/goods/sku_list.vue +++ b/vue/src/views/tao/goods/sku_list.vue @@ -74,20 +74,26 @@ - - - - - - + + + - - - + + + + - + + + + + + + + +