Merge branch 'jxl-settlementPrice' into 'master'

Jxl settlement price

See merge request !422

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

@@ -34,6 +34,8 @@ public class GoblinFrontGoodDetailVo implements Serializable {
     @ApiModelProperty(value = "条码识别到的SKUID列表", notes = "仅当条码识别时有效")
     private List<String> hitSkuIdList;
 
+    @ApiModelProperty(value = "当前用户是否已购买本场演出门票（与收钱吧下单换购价校验一致）；仅收钱吧商品(spuType=33)且传入 performancesId 时返回 true/false，其他情况为 null；未登录为 false")
+    private Boolean boughtPerformance;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -41,6 +41,9 @@ public class GoblinGoodsSkuInfoDetailVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 20, value = "单品销售价-原价[20,2]")
     private BigDecimal sellPrice;
 
+    @ApiModelProperty(value = "收钱吧商品(spuType=33)演出关联换购价（元）；其他商品类型恒为 null；SQB 且传入 performancesId 且后台已配置时返回")
+    private BigDecimal settlementPrice;
+
     @ApiModelProperty(position = 26, value = "限量[0-无限制|X:限购数量]")
     private Integer buyLimit;
     @ApiModelProperty(position = 27, value = "剩余库存（实时：Redis getSkuStock）")

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

@@ -19,7 +19,7 @@ public class GoblinSqbPerformanceGoodsInfoVo extends GoblinGoodsInfoVo {
     @ApiModelProperty(value = "正常售价")
     private BigDecimal price;
 
-    @ApiModelProperty(value = "换购价（不设置则按正常价）")
+    @ApiModelProperty(value = "收钱吧商品(spuType=33)换购价展示（元）：关联 SKU 换购价最小值；非 SQB 商品恒为 null；未配置换购价时不返回")
     private BigDecimal settlementPrice;
 
     @ApiModelProperty(value = "已上架 SKU 明细（含 restStock、stockLess、canBuy 等，与商品详情接口字段一致）")

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

@@ -77,7 +77,7 @@ public class GoblinFrontController {
     @GetMapping("getGoodsDetail")
     @ApiOperation("获得商品详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", required = false, dataType = "String", name = "performancesId", value = "演出ID，可选；收钱吧商品(spuType=33)时传入则仅返回该演出已关联的 SKU")
+            @ApiImplicitParam(paramType = "query", required = false, dataType = "String", name = "performancesId", value = "演出ID，可选；收钱吧商品(spuType=33)时传入则仅返回该演出已关联的 SKU，并返回 boughtPerformance 是否已购本场票")
     })
     public ResponseDto<GoblinFrontGoodDetailVo> getGoodsDetail(
             @RequestParam(name = "spuId", required = true) String spuId,

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

@@ -3092,6 +3092,29 @@ public class GoblinRedisUtils {
         return performanceData;
     }
 
+    /**
+     * 用户维度本场演出已购票数量（与 order {@code DataUtils#getUserPBuyCount} 一致）
+     */
+    public int getUserPerformanceBuyCount(String userId, String performanceId) {
+        if (!StringUtils.hasText(userId) || !StringUtils.hasText(performanceId)) {
+            return 0;
+        }
+        try {
+            String key = KylinRedisConst.USERID_BUY_INFO + userId.trim() + ":"
+                    + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId.trim();
+            Object val = redisUtil.get(key);
+            if (val == null) {
+                return 0;
+            }
+            if (val instanceof Number) {
+                return ((Number) val).intValue();
+            }
+            return Integer.parseInt(String.valueOf(val));
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
     public void setSqbPerformanceGoodsListCache(String performancesId, List<GoblinSqbPerformanceGoods> relations) {
         String key = GoblinRedisConst.SQB_PERFORMANCE_GOODS.concat(performancesId);
         redisUtil.set(key, relations, RedisKeyExpireConst.SQB_PERFORMANCE_GOODS_EXPIRE);