1

src/main/java/org/rcisoft/bus/wmsgoods/dao/WmsGoodsRepository.java

@@ -39,5 +39,6 @@ public interface WmsGoodsRepository extends CyBaseMapper<WmsGoods> {
 
     List<OssInfo> findOss(@Param("entity") WmsGoods wmsGoods);
 
+    int delOssById(@Param("entity") WmsGoods wmsGoods);
 }
 

src/main/java/org/rcisoft/bus/wmsgoods/service/WmsGoodsService.java

@@ -31,6 +31,7 @@ public interface WmsGoodsService {
     * @return
     */
     CyPersistModel remove(WmsGoods wmsGoods);
+    CyPersistModel delOss(WmsGoods wmsGoods);
 
     /**
     * 逻辑删除 商品信息表

src/main/java/org/rcisoft/bus/wmsgoods/service/impl/WmsGoodsServiceImpl.java

@@ -100,6 +100,15 @@ public class WmsGoodsServiceImpl extends ServiceImpl<WmsGoodsRepository, WmsGood
         return new CyPersistModel(line);
     }
 
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
+    @Override
+    public CyPersistModel delOss(WmsGoods wmsGoods) {
+        wmsGoods.setDeleted();
+        int line = baseMapper.delOssById(wmsGoods);
+        log.debug(CyUserUtil.getAuthenUsername() + "删除了ID为" +
+                wmsGoods.getBusinessId() + "的商品信息表信息");
+        return new CyPersistModel(line);
+    }
     /**
      * 修改 商品信息表
      *
@@ -110,9 +119,8 @@ public class WmsGoodsServiceImpl extends ServiceImpl<WmsGoodsRepository, WmsGood
     @Override
     public CyPersistModel merge(WmsGoods wmsGoods) {
         int line = baseMapper.updateById(wmsGoods);
-
         // 删除一下 goods_oss by goods
-
+            baseMapper.delOssById(wmsGoods);
         //插入图片
         if(StringUtils.isNotBlank(wmsGoods.getUrlIdList())){
             List<Map<String, String>> params = new ArrayList<>();

src/main/resources/mapper/bus/wmsGoods/WmsGoodsMapper.xml

@@ -32,6 +32,10 @@
             (#{item.gid},#{item.oid})
         </foreach>
     </insert>
+    <delete id="delOssById">
+        delete  from  wms_goods_oss wgo
+        where wgo.goods_id = #{entity.businessId}
+    </delete>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryWmsGoods" resultMap="BaseResultMap">

src/main/resources/mapper/bus/wmsGoodsApply/WmsGoodsApplyMapper.xml

@@ -30,7 +30,6 @@
             (#{item.flag},#{item.delFlag},#{item.createBy},#{item.createDate},#{item.updateBy},#{item.updateDate},#{item.remarks},#{item.io_type},#{item.deal_status},#{item.goods_counts},#{item.shipper},#{item.shipper_address},#{item.shipper_phone},
             #{item.goods_check},#{item.salesman},#{item.maker},#{item.inGoods},#{item.outGoods},#{item.appCode})
         </foreach></insert>
-
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
     <select id="queryWmsGoodsApplys" resultMap="BaseResultMap">
         select * from wms_goods_apply