完善jd店铺商品

model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java

@@ -18,6 +18,6 @@ public class TaoGoodsBo implements Serializable {
      */
     private String title;
     private String outerId;
-    private Integer shopId;
+    private Long shopId;
     private Integer hasLink;//是否关联
 }

service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java

@@ -50,7 +50,11 @@ public class TaoGoodsServiceImpl extends ServiceImpl<TaoGoodsMapper, TaoGoods>
     @Override
     public PageResult<TaoGoods> queryPageList(TaoGoodsBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<TaoGoods> queryWrapper = new LambdaQueryWrapper<TaoGoods>()
-                .eq(bo.getShopId()!=null,TaoGoods::getShopId,bo.getShopId());
+                .eq(bo.getShopId()!=null,TaoGoods::getShopId,bo.getShopId())
+                .eq(bo.getNumIid()!=null,TaoGoods::getNumIid,bo.getNumIid())
+                .eq(org.springframework.util.StringUtils.hasText(bo.getOuterId()),TaoGoods::getOuterId,bo.getOuterId())
+
+                ;
 
         Page<TaoGoods> taoGoodsPage = mapper.selectPage(pageQuery.build(), queryWrapper);
         if(taoGoodsPage.getRecords()!=null && taoGoodsPage.getRecords().size()>0){

service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java

@@ -40,6 +40,7 @@ public class TaoGoodsSkuServiceImpl extends ServiceImpl<TaoGoodsSkuMapper, TaoGo
                 .eq(bo.getNumIid()!=null,TaoGoodsSku::getNumIid,bo.getNumIid())
                 .eq(bo.getSkuId()!=null,TaoGoodsSku::getSkuId,bo.getSkuId())
                 .eq(StringUtils.hasText(bo.getOuterId()),TaoGoodsSku::getOuterId,bo.getOuterId())
+                .eq(bo.getErpGoodsSkuId()!=null,TaoGoodsSku::getErpGoodsSkuId,bo.getErpGoodsSkuId())
                 ;
         IPage<TaoGoodsSku> result = mapper.selectPage(pageQuery.build(), ew);
         return PageResult.build(result);

vue/src/views/jd/goods/goods_list.vue

@@ -1,40 +1,33 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
-      <el-form-item label="平台SkuId" prop="skuId">
+      <el-form-item label="平台商品ID" prop="wareId">
         <el-input
-          v-model="queryParams.skuId"
+          v-model="queryParams.wareId"
-          placeholder="请输入平台SkuId"
+          placeholder="请输入平台商品ID"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="商家sku编码" prop="outerId">
+
+      <el-form-item label="商家商品编码" prop="itemNum">
         <el-input
-          v-model="queryParams.outerId"
+          v-model="queryParams.itemNum"
-          placeholder="请输入商家sku编码"
+          placeholder="请输入商家商品编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="ERP skuId" prop="erpSkuId">
+      <el-form-item label="店铺" prop="shopId">
-        <el-input
+        <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
-          v-model="queryParams.erpSkuId"
+         <el-option
-          placeholder="请输入ERP skuId"
+            v-for="item in shopList"
-          clearable
+            :key="item.id"
-          @keyup.enter.native="handleQuery"
+            :label="item.name"
-        />
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
-            <el-form-item label="店铺" prop="shopId">
-              <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
-               <el-option
-                  v-for="item in shopList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

vue/src/views/jd/goods/sku_list.vue

@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="平台商品ID" prop="wareId">
+        <el-input
+          v-model="queryParams.wareId"
+          placeholder="请输入平台商品ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="商家sku编码" prop="outerId">
         <el-input
           v-model="queryParams.outerId"

vue/src/views/tao/goods/goods_list.vue

@@ -10,22 +10,15 @@
         />
       </el-form-item>
 
-      <el-form-item label="商家编码" prop="outerId">
+      <el-form-item label="商家商品编码" prop="outerId">
         <el-input
           v-model="queryParams.outerId"
-          placeholder="请输入商家编码"
+          placeholder="请输入商家商品编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="ERP商品ID" prop="erpGoodsId">
-        <el-input
-          v-model="queryParams.erpGoodsId"
-          placeholder="请输入ERP skuId"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="店铺" prop="shopId">
         <el-select v-model="queryParams.shopId" placeholder="请选择店铺" clearable @change="handleQuery">
          <el-option