收钱 商品详情增加 sqb store；编辑商品放开类型

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

@@ -146,6 +146,11 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 63, value = "skuList")
     private List<GoblinGoodsSkuInfoVo> goblinOrderSkuVos;
 
+    @ApiModelProperty(position = 70, value = "收钱吧SPU ID")
+    private String sqbSpuId;
+    @ApiModelProperty(position = 71, value = "收钱吧商城编号")
+    private String mallSn;
+
     public String getMarketType() {
         if (marketId == null) {
             return "";

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

@@ -685,7 +685,7 @@ public class GoblinStoreMgtGoodsController {
                 || !mgtGoodsInfoVo.getDelFlg().equals("0")) {
             return ResponseDto.failure(ErrorMapping.get("149010"));
         }
-        if (mgtGoodsInfoVo.getSpuType() != 0) {
+        if (mgtGoodsInfoVo.getSpuType() != 0 && mgtGoodsInfoVo.getSpuType() != 33) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效操作，该商品非常规商品");
         }
         if (!mgtGoodsInfoVo.getName().equals(mgtGoodsAddParam.getName())
@@ -884,7 +884,7 @@ public class GoblinStoreMgtGoodsController {
         if (null == goodsInfoVo || !goodsInfoVo.getDelFlg().equals("0")) {
             return ResponseDto.failure(ErrorMapping.get("149010"));
         }
-        if (goodsInfoVo.getSpuType() != 0) {
+        if (goodsInfoVo.getSpuType() != 0 && goodsInfoVo.getSpuType() != 33) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效操作，该商品非常规商品");
         }
         {// 分类、ISBN校验
@@ -1237,7 +1237,7 @@ public class GoblinStoreMgtGoodsController {
                 || !goodsInfoVo.getStoreId().equals(storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149010"));
         }
-        if (goodsInfoVo.getSpuType() != 0) {
+        if (goodsInfoVo.getSpuType() != 0 && goodsInfoVo.getSpuType() != 33) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效操作，该商品非常规商品");
         }
         {// 分类、ISBN校验
@@ -1456,7 +1456,7 @@ public class GoblinStoreMgtGoodsController {
         if (null == mgtGoodsSkuInfoVo || !mgtGoodsSkuInfoVo.getDelFlg().equals("0") || !mgtGoodsSkuInfoVo.getStoreId().equals(storeId)) {
             return ResponseDto.failure(ErrorMapping.get("149011"));
         }
-        if (mgtGoodsSkuInfoVo.getSkuType() != 0) {
+        if (mgtGoodsSkuInfoVo.getSkuType() != 0 && mgtGoodsSkuInfoVo.getSkuType() != 33) {
             return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getCode(), "无效操作，该商品非常规商品");
         }
         if (mgtGoodsSkuInfoVo.getShelvesStatus().equals("3")) {

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

@@ -13,7 +13,9 @@ import com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto;
 import com.liquidnet.service.goblin.dto.manage.*;
 import com.liquidnet.service.goblin.dto.manage.vo.*;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.entity.GoblinSqbGoodsExt;
 import com.liquidnet.service.goblin.enums.GoblinStoreConf;
+import com.liquidnet.service.goblin.mapper.GoblinSqbGoodsExtMapper;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreMgtExtraService;
 import com.liquidnet.service.goblin.service.manage.IGoblinZhengzaiService;
 import com.liquidnet.service.goblin.service.manage.IGoblinstoreMgtGoodsService;
@@ -21,6 +23,7 @@ import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +48,8 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
     IGoblinStoreMgtExtraService goblinStoreMgtExtraService;
     @Autowired
     IGoblinZhengzaiService goblinZhengzaiService;
+    @Autowired
+    GoblinSqbGoodsExtMapper goblinSqbGoodsExtMapper;
 
     @Override
     public PagedResult<GoblinStoreMgtGoodsListVo> goodsList(GoblinStoreMgtGoodsFilterParam mgtGoodsFilterParam) {
@@ -495,6 +500,22 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         GoblinGoodsInfoVo goodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuId);
         if (null != goodsInfoVo && goodsInfoVo.getStoreId().equals(storeId) && goodsInfoVo.getDelFlg().equals("0")) {
             vo.setGoodsInfoVo(goodsInfoVo);
+
+            // 获取收钱吧扩展信息 (spuId 级别，取第一条即可) - 仅针对 spuType 为 33 的收钱吧商品
+            if (goodsInfoVo.getSpuType() == 33) {
+                List<GoblinSqbGoodsExt> extList = goblinSqbGoodsExtMapper.selectList(
+                        new LambdaQueryWrapper<GoblinSqbGoodsExt>()
+                                .eq(GoblinSqbGoodsExt::getSpuId, spuId)
+                                .eq(GoblinSqbGoodsExt::getDelFlg, "0")
+                                .last("limit 1")
+                );
+                if (!CollectionUtils.isEmpty(extList)) {
+                    GoblinSqbGoodsExt ext = extList.get(0);
+                    goodsInfoVo.setSqbSpuId(ext.getSqbSpuId());
+                    goodsInfoVo.setMallSn(ext.getMallSn());
+                }
+            }
+
             List<String> skuIdList = goodsInfoVo.getSkuIdList();
             if (!CollectionUtils.isEmpty(skuIdList)) {
                 List<GoblinGoodsSkuInfoVo> goodsSkuInfoVoList = ObjectUtil.getGoblinGoodsSkuInfoVoArrayList();