收钱 admin

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class GoblinAdminSqbGoodsVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "商品skuId")
+    private String skuId;
+
+    @ApiModelProperty(value = "单品默认图片的url")
+    private String skuPic;
+
+    @ApiModelProperty(value = "商品描述")
+    private String productIntroduction;
+
+    @ApiModelProperty(value = "商品标题")
+    private String title;
+
+    @ApiModelProperty(value = "单品现价")
+    private BigDecimal price;
+
+    @ApiModelProperty(value = "单品库存")
+    private Integer skuStock;
+}

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

@@ -5,6 +5,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.goblin.dto.SqbPerfGoodsBindItemParam;
 import com.liquidnet.client.admin.zhengzai.goblin.service.ISqbPerformanceGoodsService;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinAdminSqbGoodsVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSqbPerfGoodsVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSqbPerfListRespVo;
 import io.swagger.annotations.*;
@@ -49,7 +50,7 @@ public class SqbPerformanceGoodsController extends BaseController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "keyword", value = "关键词", required = false),
     })
     public AjaxResult searchGoods(@RequestParam(value = "keyword", required = false) String keyword) {
-        ResponseDto<List<GoblinSqbPerfGoodsVo>> resp = sqbPerformanceGoodsService.searchGoods(keyword);
+        ResponseDto<List<GoblinAdminSqbGoodsVo>> resp = sqbPerformanceGoodsService.searchGoods(keyword);
         if (resp.isSuccess()) {
             return AjaxResult.success(resp.getData());
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/sqbGoods/index.html

@@ -105,7 +105,7 @@
                     // 接口无数据时回退到 mock
                     if (list.length === 0) { list = filterMock($('#goodsSelect').data('select2').options.get('ajax').data({ term: '' }).keyword); }
                     return { results: list.map(function (item) {
-                        return { id: item.skuId, text: (item.spuName || item.skuName), _raw: item };
+                        return { id: item.skuId, text: (item.title || item.spuName || item.skuName), _raw: item };
                     })};
                 },
                 error: function () {
@@ -202,8 +202,11 @@
         }
         linkedGoods.push({
             skuId: item.skuId, spuId: item.spuId || '',
-            spuName: item.spuName, skuName: item.skuName,
-            coverPic: item.coverPic || '', price: item.price, stock: item.stock,
+            spuName: item.title || item.spuName || item.skuName,
+            skuName: item.title || item.skuName || item.spuName,
+            coverPic: item.skuPic || item.coverPic || '',
+            price: item.price,
+            stock: (item.skuStock != null ? item.skuStock : item.stock),
             settlementPrice: null, autoOffline: 0
         });
         renderLinkedGoods();

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

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.goblin.service;
 
 import com.liquidnet.client.admin.zhengzai.goblin.dto.SqbPerfGoodsBindItemParam;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinAdminSqbGoodsVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSqbPerfGoodsVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSqbPerfListRespVo;
 
@@ -45,5 +46,5 @@ public interface ISqbPerformanceGoodsService {
      * @param keyword 商品名称关键词
      * @return 商品列表
      */
-    ResponseDto<List<GoblinSqbPerfGoodsVo>> searchGoods(String keyword);
+    ResponseDto<List<GoblinAdminSqbGoodsVo>> searchGoods(String keyword);
 }

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

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.zhengzai.goblin.dto.SqbPerfGoodsBindItemParam;
 import com.liquidnet.client.admin.zhengzai.goblin.service.ISqbPerformanceGoodsService;
 import com.liquidnet.client.admin.zhengzai.goblin.utils.GoblinRedisUtils;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinAdminSqbGoodsVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSqbPerfGoodsVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinSqbPerfListRespVo;
 import com.liquidnet.service.goblin.entity.GoblinGoodsSku;
@@ -228,7 +229,7 @@ public class SqbPerformanceGoodsServiceImpl implements ISqbPerformanceGoodsServi
     }
 
     @Override
-    public ResponseDto<List<GoblinSqbPerfGoodsVo>> searchGoods(String keyword) {
+    public ResponseDto<List<GoblinAdminSqbGoodsVo>> searchGoods(String keyword) {
         try {
             // 收钱吧商品的所有核心展示信息均已同步到 SKU（Type=33）表中，直接一次查询避免二次查 SPU
             LambdaQueryWrapper<GoblinGoodsSku> skuQuery = new LambdaQueryWrapper<>();
@@ -243,16 +244,14 @@ public class SqbPerformanceGoodsServiceImpl implements ISqbPerformanceGoodsServi
                 return ResponseDto.success(new ArrayList<>());
             }
 
-            List<GoblinSqbPerfGoodsVo> result = new ArrayList<>();
+            List<GoblinAdminSqbGoodsVo> result = new ArrayList<>();
             for (GoblinGoodsSku sku : skuList) {
-                GoblinSqbPerfGoodsVo vo = new GoblinSqbPerfGoodsVo();
-//                vo.setSkuId(sku.getSkuId());
-//                vo.setSpuId(sku.getSpuId());
-//                vo.setSkuName(sku.getName());
-//                vo.setSpuName(sku.getName()); // 前端显示需要，统一赋值为 sku 名称
-//                vo.setCoverPic(sku.getSkuPic()); // 同步阶段已将图片存入了 skuPic
-//                vo.setPrice(sku.getPrice() != null ? sku.getPrice().longValue() : null);
-//                vo.setStock(sku.getSkuStock());
+                GoblinAdminSqbGoodsVo vo = new GoblinAdminSqbGoodsVo();
+                vo.setSkuId(sku.getSkuId());
+                vo.setTitle(sku.getName());
+                vo.setSkuPic(sku.getSkuPic());
+                vo.setPrice(sku.getPrice());
+                vo.setSkuStock(sku.getSkuStock());
                 result.add(vo);
             }
             return ResponseDto.success(result);