修改banner 支持商品和nft

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/GoblinGoodsSearchDto.java

+package com.liquidnet.service.goblin.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreSearchDto", description = "商品搜素")
+@Data
+public class GoblinGoodsSearchDto implements Serializable, Cloneable {
+    private static final long serialVersionUID = 8425727558228094904L;
+    @ApiModelProperty(position = 11, value = "店铺id")
+    private String spuId;
+    @ApiModelProperty(position = 11, value = "店铺名称")
+    private String spuName;
+
+    private static final GoblinGoodsSearchDto obj = new GoblinGoodsSearchDto();
+    public static GoblinGoodsSearchDto getNew() {
+        try {
+            return (GoblinGoodsSearchDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsSearchDto();
+        }
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersDisplayLocation.java

@@ -17,7 +17,8 @@ public enum BannersDisplayLocation {
     DISPLAY_LOCATION3("周边", 3),
     DISPLAY_LOCATION5("积分商城", 5),
     DISPLAY_LOCATION6("YOUNG BLOOD", 6),
-    DISPLAY_LOCATION8("视频", 8);
+    DISPLAY_LOCATION8("视频", 8),
+    DISPLAY_LOCATION9("NFT", 9);
 
     private String name;
     private int index;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java

@@ -19,6 +19,7 @@ public enum BannersTargetType {
 //    TARGET_TYPE5("场地", 5),
     TARGET_TYPE6("票务", 6),
     TARGET_TYPE7("商品", 7),
+    TARGET_TYPE9("NFT", 9),
 //    TARGET_TYPE8("巡演", 8),
     TARGET_TYPE12("活动跳转-可分享", 12),
     TARGET_TYPE100("活动跳转", 100),

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinCommonController.java

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.goblin;
 
 import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinCommonService;
 import com.liquidnet.service.base.ResponseDto;
@@ -34,5 +35,16 @@ public class GoblinCommonController extends BaseController {
         return ResponseDto.success(goblinCommonService.storeSearch(name, status));
     }
 
+    @Log(title = "商品搜索", businessType = BusinessType.LIST)
+    @GetMapping("goods")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "title", value = "商品名称[模糊]"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "type", value = "商品类型[0-常规|1-数字藏品]"),
+    })
+    @ResponseBody
+    public AjaxResult storeSearch(String title, Integer type) {
+        return AjaxResult.success(goblinCommonService.goodsSearch(title, type));
+    }
+
     /** ------------------------------------------------------------------------ **/
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java

@@ -41,6 +41,8 @@ public class KylinBannersAdminController extends BaseController {
     private String url6;
     @Value("${liquidnet.url-banner.url7}")
     private String url7;
+    @Value("${liquidnet.url-banner.url9}")
+    private String url9;
     @Value("${liquidnet.url-banner.url14}")
     private String url14;
 
@@ -61,6 +63,7 @@ public class KylinBannersAdminController extends BaseController {
 
         mmap.put("url6", url6);
         mmap.put("url7", url7);
+        mmap.put("url9", url9);
         mmap.put("url14", url14);
 
         return prefix + "/create";
@@ -96,6 +99,7 @@ public class KylinBannersAdminController extends BaseController {
 
         mmap.put("url6", url6);
         mmap.put("url7", url7);
+        mmap.put("url9", url9);
         mmap.put("url14", url14);
 
         return prefix + "/update";

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html

@@ -135,6 +135,7 @@
     var platformUrl = "[[${platformUrl}]]";
     var url6 = "[[${url6}]]";
     var url7 = "[[${url7}]]";
+    var url9 = "[[${url9}]]";
     var url14 = "[[${url14}]]";
 
     function submitHandler() {
@@ -372,7 +373,10 @@
                         } else if(26 == targetType) {
                             Id = dataList[i].id;
                             Title = dataList[i].name;
-                        } else {
+                        } else if(7 == targetType || 9 == targetType) {
+                            Id = dataList[i].spuId;
+                            Title = dataList[i].spuName;
+                        }else {
                             Id = dataList[i].id;
                             Title = dataList[i].title;
                         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/IGoblinCommonService.java

 package com.liquidnet.client.admin.zhengzai.goblin.service;
 
-import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSearchDto;
 import com.liquidnet.service.goblin.dto.GoblinStoreSearchDto;
-import com.liquidnet.service.goblin.dto.manage.GoblinInsertZhengzaiParam;
-import com.liquidnet.service.goblin.dto.vo.GoblinMarketSpuListVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfMarketingVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinSelfZhengzaiSkuVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinZhengzaiStoreListVo;
-import com.liquidnet.service.goblin.entity.GoblinSelfMarketing;
 
 import java.util.List;
 
@@ -18,5 +12,5 @@ public interface IGoblinCommonService {
 
    List<GoblinStoreSearchDto> storeSearch(String name,List<String> status);
 
-
+   List<GoblinGoodsSearchDto> goodsSearch(String name,  Integer type);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinCommonServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.goblin.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinCommonService;
-import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinStoreInfoService;
-import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.commons.lang.util.StringUtil;
+import com.liquidnet.service.goblin.dto.GoblinGoodsSearchDto;
 import com.liquidnet.service.goblin.dto.GoblinStoreSearchDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinStoreInfoVo;
+import com.liquidnet.service.goblin.entity.GoblinGoods;
 import com.liquidnet.service.goblin.entity.GoblinStoreInfo;
+import com.liquidnet.service.goblin.mapper.GoblinGoodsMapper;
 import com.liquidnet.service.goblin.mapper.GoblinStoreInfoMapper;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -38,6 +31,8 @@ public class GoblinCommonServiceImpl implements IGoblinCommonService {
 
     @Autowired
     GoblinStoreInfoMapper goblinStoreInfoMapper;
+    @Autowired
+    GoblinGoodsMapper goblinGoodsMapper;
 
     @Override
     public List<GoblinStoreSearchDto> storeSearch(String name, List<String> status) {
@@ -46,7 +41,7 @@ public class GoblinCommonServiceImpl implements IGoblinCommonService {
                 .in(GoblinStoreInfo::getStatus, status)
                 .select(GoblinStoreInfo::getStoreId, GoblinStoreInfo::getStoreName, GoblinStoreInfo::getStatus));
         List<GoblinStoreSearchDto> dtoList = new ArrayList<>();
-        for (GoblinStoreInfo item:list) {
+        for (GoblinStoreInfo item : list) {
             GoblinStoreSearchDto dto = GoblinStoreSearchDto.getNew();
             dto.setStatus(item.getStatus());
             dto.setStoreId(item.getStoreId());
@@ -55,4 +50,28 @@ public class GoblinCommonServiceImpl implements IGoblinCommonService {
         }
         return dtoList;
     }
+
+    @Override
+    public List<GoblinGoodsSearchDto> goodsSearch(String name, Integer type) {
+        if (type == null) {//普通商品
+            type = 1;
+        }
+        LambdaQueryWrapper<GoblinGoods> queryWrapper = Wrappers.lambdaQuery(GoblinGoods.class);
+        queryWrapper.ne(GoblinGoods::getDelFlg, "1");
+        queryWrapper.eq(GoblinGoods::getShelvesStatus, "3");
+        queryWrapper.eq(GoblinGoods::getSpuAppear, "0");
+        queryWrapper.eq(GoblinGoods::getSpuType, type);
+        if (StringUtil.isNotBlank(name)) {
+            queryWrapper.like(GoblinGoods::getName, name);
+        }
+        List<GoblinGoods> list = goblinGoodsMapper.selectList(queryWrapper.last("limit 20"));
+        List<GoblinGoodsSearchDto> dtoList = new ArrayList<>();
+        for (GoblinGoods item : list) {
+            GoblinGoodsSearchDto dto = GoblinGoodsSearchDto.getNew();
+            dto.setSpuId(item.getStoreId());
+            dto.setSpuName(item.getName());
+            dtoList.add(dto);
+        }
+        return dtoList;
+    }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -17,7 +17,8 @@ ruoyi:
 liquidnet:
   url-banner:
     url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
-    url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
+    url7: "/goblin/common/goods?type=0" #商品
+    url9: "/goblin/common/goods?type=1" #NFT
     url14: "${liquidnet.client.admin.phpMallUrl}/admin/good/collective/quick?page=1&per_page=50" #商品集合
 
 # 开发环境配置

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0315_jxl_nft.sql

@@ -215,4 +215,8 @@ CREATE TABLE goblin_nft_order_refund
   ROW_FORMAT = DYNAMIC COMMENT 'NFT订单退款表';
 # -- >>------------------------------------------------------------------------------------
 # -- >>------------------------------------------------------------------------------------
-# -- >>------------------------------------------------------------------------------------
+# -- >>------------------------------------------------------------------------------------
\ No newline at end of file
+
+
+# ----              CONFIG 修改               ----
+# ---- liquidnet-client-admin-web.yml url7: "/goblin/common/goods?type=0" #商品 url9: "/goblin/common/goods?type=1" #NFT
\ No newline at end of file