~API:商品管理:商品编辑服务支持、标签编辑未更改问题更正;

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberOrderMapper.xml

@@ -50,11 +50,11 @@
                 and amo.source = #{source}
             </if>
             <if test="paymentAtStart != null  and paymentAtStart != ''">
-#                 and amo.payment_at &gt; #{paymentAtStart}
+                <!-- and amo.payment_at &gt; #{paymentAtStart} -->
                 and amo.payment_at <![CDATA[>=]]> #{paymentAtStart}
             </if>
             <if test="paymentAtEnd != null  and paymentAtEnd != ''">
-#                 and amo.payment_at &lt; #{paymentAtEnd}
+                <!-- and amo.payment_at &lt; #{paymentAtEnd} -->
                 and amo.payment_at <![CDATA[<=]]> #{paymentAtEnd}
             </if>
         </where>

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsController.java

@@ -194,7 +194,10 @@ public class GoblinStoreMgtGoodsController {
         }
 
         // 服务保障处理
-        goodsInfoVo.setServiceSupportVoList(goblinMongoUtils.getServiceSupportVos(storeMgtGoodsAddParam.getSsidList()));
+        List<String> ssidList = storeMgtGoodsAddParam.getSsidList();
+        if (!CollectionUtils.isEmpty(ssidList)) {
+            goodsInfoVo.setServiceSupportVoList(goblinMongoUtils.getServiceSupportVos(ssidList));
+        }
 
         goblinstoreMgtGoodsService.goodsAdd(goodsInfoVo, goodsSkuInfoVoList);
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -13,7 +13,7 @@ goblin_store_certification.update_by_del=UPDATE goblin_store_certification SET d
 goblin_store_config.update=UPDATE goblin_store_config SET config_val=?,updated_by=?,updated_at=? WHERE store_id=? AND config_key=? 
 #----                   店铺公告信息
 goblin_store_notice.insert=INSERT INTO goblin_store_notice (notice_id,store_id,content,release_time,long_lasting,cancell_time,status,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?) 
-goblin_store_notice.update=UPDATE goblin_store_notice set content=?,release_time=?,long_lasting=?,cancell_time=?,status=?,updated_by=?,updated_at=? WHERE notice_id=? 
+goblin_store_notice.update=UPDATE goblin_store_notice SET content=?,release_time=?,long_lasting=?,cancell_time=?,status=?,updated_by=?,updated_at=? WHERE notice_id=? 
 
 goblin_store_notice.release=UPDATE goblin_store_notice SET release_time=?,status='1',updated_by=?,updated_at=? WHERE store_id=? AND notice_id=? 
 goblin_store_notice.remove=UPDATE goblin_store_notice SET del_flg='1',updated_by=?,updated_at=? WHERE store_id=? AND notice_id=? 
@@ -53,8 +53,10 @@ goblin_goods_sku.update_by_del_store=UPDATE goblin_goods_sku SET del_flg='1',upd
 goblin_goods_sku.update_by_del=UPDATE goblin_goods_sku SET del_flg='1',updated_by=?,updated_at=?,deleted_by=?,deleted_at=? WHERE spu_id=? AND store_id=? 
 
 goblin_goods_image.insert=INSERT INTO goblin_goods_image (spu_id,url)VALUES(?,?) 
-goblin_goods_tag.insert=insert into goblin_goods_tag (spu_id,tag_id,sort,tag_belong)VALUES(?,?,?,?) 
+goblin_goods_tag.insert=INSERT INTO goblin_goods_tag (spu_id,tag_id,sort,tag_belong)VALUES(?,?,?,?) 
+goblin_goods_tag.delete=UPDATE goblin_goods_tag SET del_flg='1' WHERE spu_id=? AND tag_belong=? AND del_flg='0' 
 goblin_goods_service_support.insert=INSERT INTO goblin_goods_service_support (spu_id,ssid)VALUES(?,?) 
+goblin_goods_service_support.delete=UPDATE goblin_goods_service_support SET del_flg='1' WHERE spu_id=? AND del_flg='0' 
 #----                   商铺活动
 goblin.store.market.insert=INSERT INTO goblin_store_marketing (`store_market_id`,`name`,`type`,`status`,`store_id`,`start_time`,`end_time`,`del_flag`,`is_pre`,`pre_time`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?)
 goblin.store.market.status=UPDATE goblin_store_marketing SET status=? , del_flag=? WHERE store_market_id =? and store_id =?