From ac29c72bf2ed25fde14bbfa8ad64c4d061e10806 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Fri, 19 Jul 2024 09:20:21 +0800
Subject: [PATCH] 7/19

---
 .../biz/goodsbrandinfo/GoodsBrandInfoMapper.xml    |  2 +-
 .../biz/goodsbrandinfo/GoodsBrandInfoService.java  |  5 ++---
 .../goodsmanufacturer/GoodsManufacturerMapper.xml  |  2 +-
 .../GoodsManufacturerService.java                  |  5 ++---
 .../yxt/goods/biz/goodsspu/GoodsSpuService.java    | 14 +++++++++++---
 .../yxt/goods/biz/goodstype/GoodsTypeMapper.xml    |  2 +-
 .../yxt/goods/biz/goodstype/GoodsTypeService.java  | 14 +++++++++++---
 .../yxt/goods/biz/goodsunit/GoodsUnitMapper.xml    |  2 +-
 .../yxt/goods/biz/goodsunit/GoodsUnitService.java  |  5 ++---
 9 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
index c7f1135..ea42284 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoMapper.xml
@@ -19,7 +19,7 @@
         from goods_brand_info a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java
index a7cc53b..4084a8e 100644
--- a/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsbrandinfo/GoodsBrandInfoService.java
@@ -105,8 +105,8 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
 //                wmsGoodsBrand.setBigPic(path);
 //            }
             wmsGoodsBrand.setCreateBySid(dto.getUserSid());
-            wmsGoodsBrand.setCreateOrgSid(dto.getOrgPath());
-            wmsGoodsBrand.setUseOrgSid(dto.getOrgPath());
+            wmsGoodsBrand.setCreateOrgSid(dto.getUseOrgSid());
+//            wmsGoodsBrand.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoodsBrand);
         }
         return rb.success().setMsg("成功");
@@ -118,7 +118,6 @@ public class GoodsBrandInfoService extends MybatisBaseService<GoodsBrandInfoMapp
         GoodsBrandInfo wmsGoodsBrand = fetchBySid(sid);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         BeanUtil.copyProperties(wmsGoodsBrand, vo);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
index 49d4c8d..25a64fd 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerMapper.xml
@@ -19,7 +19,7 @@
         from goods_manufacturer a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <select id="getAllTypeByUseOrgSid" resultType="com.yxt.goods.biz.goodsmanufacturer.GoodsManufacturerVo">
diff --git a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java
index 944360f..451969b 100644
--- a/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsmanufacturer/GoodsManufacturerService.java
@@ -96,8 +96,8 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
 //                lpkGoods.setPicUrl(path);
 //            }
             wmsManufacturer.setCreateBySid(dto.getUserSid());
-            wmsManufacturer.setCreateOrgSid(dto.getOrgPath());
-            wmsManufacturer.setUseOrgSid(dto.getOrgPath());
+            wmsManufacturer.setCreateOrgSid(dto.getUseOrgSid());
+//            wmsManufacturer.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsManufacturer);
         }
         return rb.success().setMsg("成功");
@@ -115,7 +115,6 @@ public class GoodsManufacturerService extends MybatisBaseService<GoodsManufactur
 //            }
 //            vo.setCreateTime(sdf.format(lpkGoods.getCreateTime()));
         }
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
index a75222e..406bcfc 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
@@ -130,6 +130,15 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         if(StringUtils.isBlank(dto.getIsListed())){
             dto.setIsListed("1");
         }
+        if (StringUtils.isBlank(dto.getTaxRate())){
+            dto.setTaxRate("0");
+        }
+        if(StringUtils.isBlank(dto.getShelfLife())){
+            dto.setShelfLife("0");
+        }
+        if(StringUtils.isBlank(dto.getSortNo())){
+            dto.setSortNo("0");
+        }
         if (spun != null) {
             if (!spun.getSid().equals(dto.getSid())) {
                 return rb.setMsg("商品编码重复");
@@ -161,8 +170,8 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
             wmsGoods.setCreateTime(new DateTime());
             wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName()));;
             wmsGoods.setCreateBySid(dto.getUserSid());
-            wmsGoods.setCreateOrgSid(dto.getOrgPath());
-            wmsGoods.setUseOrgSid(dto.getOrgPath());
+            wmsGoods.setCreateOrgSid(dto.getUseOrgSid());
+//            wmsGoods.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoods);
             //spu详情
             dto.getBaseGoodsSpuDetail().setGoodSpuSid(wmsGoods.getSid());
@@ -215,7 +224,6 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
             goodsSkuVo.setBaseGoodsSkuExtend(vo2);
         }
         vo.setBaseGoodsSkus(vos);
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
index b5f377f..6cbf192 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeMapper.xml
@@ -19,7 +19,7 @@
         from goods_type a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
index b148f22..99db72a 100644
--- a/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
+++ b/src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java
@@ -98,6 +98,15 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
         ResultBean rb = ResultBean.fireFail();
         String sid = "";
         dto.setPSid(dto.getSids());
+        if (StringUtils.isBlank(dto.getPercentageRate())){
+            dto.setPercentageRate("0");
+        }
+        if (StringUtils.isBlank(dto.getPercentageAmount())){
+            dto.setPercentageAmount("0");
+        }
+        if(StringUtils.isBlank(dto.getSortNo())){
+            dto.setSortNo("0");
+        }
         if (StringUtils.isNotBlank(dto.getSid())) {
             sid = dto.getSid();
             GoodsType wmsGoodsType = fetchBySid(dto.getSid());
@@ -121,8 +130,8 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
                 wmsGoods.setIsGoodsID("1");
             }
             wmsGoods.setCreateBySid(dto.getUserSid());
-            wmsGoods.setCreateOrgSid(dto.getOrgPath());
-            wmsGoods.setUseOrgSid(dto.getOrgPath());
+            wmsGoods.setCreateOrgSid(dto.getUseOrgSid());
+//            wmsGoods.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoods);
         }
         return rb.success().setMsg("成功");
@@ -145,7 +154,6 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
             }
             vo.setSids(wmsGoodsType.getPSid());
         }
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }
 
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
index ab3683a..b40fbd8 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitMapper.xml
@@ -19,7 +19,7 @@
         from goods_unit a
         LEFT JOIN ss_user.sys_organization as s ON a.useOrgSid = s.sid
         <where>
-            s.orgSidPath like #{orgPath} and a.isDelete !='1'
+            s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1'
         </where>
     </select>
     <update id="updateBySidIsDelete">
diff --git a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java
index 271cb86..f25d78e 100644
--- a/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsunit/GoodsUnitService.java
@@ -94,8 +94,8 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
 //                lpkGoods.setPicUrl(path);
 //            }
             wmsGoods.setCreateBySid(dto.getUserSid());
-            wmsGoods.setCreateOrgSid(dto.getOrgPath());
-            wmsGoods.setUseOrgSid(dto.getOrgPath());
+            wmsGoods.setCreateOrgSid(dto.getUseOrgSid());
+//            wmsGoods.setUseOrgSid(dto.getOrgPath());
             baseMapper.insert(wmsGoods);
         }
         return rb.success().setMsg("成功");
@@ -116,7 +116,6 @@ public class GoodsUnitService extends MybatisBaseService<GoodsUnitMapper, GoodsU
 //            BaseGoodsUnit wmsGoodsType1 = fetchBySid(wmsGoodsType.getPSid());
 //            vo.setPName(wmsGoodsType1.getGoodsTypeName());
         }
-        vo.setOrgPath(vo.getUseOrgSid());
         return rb.success().setData(vo);
     }