商品详情返回关联演出ID

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

@@ -21,16 +21,20 @@ import java.util.List;
 public class GoblinFrontGoodDetailVo implements Serializable {
     //spu
     GoblinGoodsInfoDetailVo goblinGoodsInfoVo;
+
     //sku
     List<GoblinGoodsSkuInfoDetailVo> goblinGoodsSkuInfoVolist;
+
     @ApiModelProperty(value = "商铺名称")
     String storeName;
+
     @ApiModelProperty(value = "商品可参与券类型")
     ArrayList<String>  getSpuType;
 
     @ApiModelProperty(value = "条码识别到的SKUID列表", notes = "仅当条码识别时有效")
     private List<String> hitSkuIdList;
 
+
     private static final long serialVersionUID = 1L;
 
     private static final GoblinFrontGoodDetailVo obj = new GoblinFrontGoodDetailVo();

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

@@ -48,6 +48,9 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 51, value = "是否实名[0-否｜1-是，表示该商品需要实名关联]")
     private Integer isTrueName;
 
+    @ApiModelProperty(position = 52, value = "关联演出ID")
+    private String performancesId;
+
     private static final GoblinGoodsSkuInfoDetailVo obj = new GoblinGoodsSkuInfoDetailVo();
 
     public static GoblinGoodsSkuInfoDetailVo getNew() {

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.*;
@@ -335,6 +336,18 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     } else {
                         goblinGoodsSkuInfoDetailVo.setStockLess(false);
                     }
+                    if (goblinGoodsInfoVo.getSpuType() == 33) {
+                        // 是关联收钱吧商品
+                        LambdaQueryWrapper<GoblinSqbPerformanceGoods> queryWrapper = new QueryWrapper<GoblinSqbPerformanceGoods>()
+                                .lambda()
+                                .eq(GoblinSqbPerformanceGoods::getSpuId, spuId)
+                                .eq(GoblinSqbPerformanceGoods::getSkuId, sku)
+                                .eq(GoblinSqbPerformanceGoods::getStatus, 1);
+                        GoblinSqbPerformanceGoods goods = goblinSqbPerformanceGoodsMapper.selectOne(queryWrapper);
+                        if (goods != null) {
+                            goblinGoodsSkuInfoDetailVo.setPerformancesId(goods.getPerformancesId());
+                        }
+                    }
                     goblinGoodsSkuInfoDetailVo.setRestStock(stock);
                     list.add(goblinGoodsSkuInfoDetailVo);
                 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinSqbOrderServiceImpl.java

@@ -185,6 +185,7 @@ public class GoblinSqbOrderServiceImpl implements IGoblinSqbOrderService {
             Map<String, Object> channelExt = new HashMap<>();
             channelExt.put("sub_appid", "wx4732efeaa2b08086");
 
+            // 创建微信预支付订单
             CreateWechatPrepayOrderData prepayData = sqbBiz.createWechatPrepayOrder(sqbAcquiringSn,
                     sqbAcquiringSign,
                     userId,