记得上下班打卡 | git大法好,push需谨慎

Commit 2680fd66 authored by zhangguobing's avatar zhangguobing

~api:券商品业务-完善skuType;

parent f870e7a9
...@@ -35,7 +35,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable { ...@@ -35,7 +35,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
@ApiModelProperty(position = 12, value = "ERP仓库编号") @ApiModelProperty(position = 12, value = "ERP仓库编号")
private String erpWarehouseNo; private String erpWarehouseNo;
@ApiModelProperty(position = 12, value = "商品类型[0-常规|1-数字藏品|2-券类商品]") @ApiModelProperty(position = 12, value = "商品类型[0-常规|1-数字藏品|2-券类商品]")
private Integer skuType; private int skuType;
@ApiModelProperty(position = 13, value = "单品的名称[100]") @ApiModelProperty(position = 13, value = "单品的名称[100]")
private String name; private String name;
@ApiModelProperty(position = 14, value = "单品的副标题[128]") @ApiModelProperty(position = 14, value = "单品的副标题[128]")
......
...@@ -258,7 +258,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -258,7 +258,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
if (!(skuVo.getStatus().equals("3") && skuVo.getShelvesStatus().equals("3")) || skuVo.getDelFlg().equals("1")) { if (!(skuVo.getStatus().equals("3") && skuVo.getShelvesStatus().equals("3")) || skuVo.getDelFlg().equals("1")) {
throw new Exception("不可购买"); throw new Exception("不可购买");
} }
if (2 == skuVo.getSkuType()) {// 券类商品 if (Objects.equals(skuVo.getSkuType(), 2)) {// 券类商品
if (Objects.equals(skuVo.getIsTrueName(), 1)) {// 需要实名关联 if (Objects.equals(skuVo.getIsTrueName(), 1)) {// 需要实名关联
if (Objects.isNull(skuParam.getIdType()) || Objects.isNull(skuParam.getIdName()) || Objects.isNull(skuParam.getIdNo())) { if (Objects.isNull(skuParam.getIdType()) || Objects.isNull(skuParam.getIdName()) || Objects.isNull(skuParam.getIdNo())) {
throw new LiquidnetServiceException("-1", "关联人信息缺失,请核实"); throw new LiquidnetServiceException("-1", "关联人信息缺失,请核实");
...@@ -690,6 +690,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService { ...@@ -690,6 +690,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
} else { } else {
GoblinGoodsSkuInfoVo goodsSkuInfoVo = redisUtils.getGoodsSkuInfoVo(orderSku.getSkuId()); GoblinGoodsSkuInfoVo goodsSkuInfoVo = redisUtils.getGoodsSkuInfoVo(orderSku.getSkuId());
orderSkuVo.setSkuType(goodsSkuInfoVo.getSkuType()); orderSkuVo.setSkuType(goodsSkuInfoVo.getSkuType());
orderSkuVo.setIsTrueName(goodsSkuInfoVo.getIsTrueName());
} }
redisUtils.setGoblinOrderSku(orderSkuVo.getOrderSkuId(), orderSkuVo); redisUtils.setGoblinOrderSku(orderSkuVo.getOrderSkuId(), orderSkuVo);
goblinOrderSkuIdList.add(orderSkuVo.getOrderSkuId()); goblinOrderSkuIdList.add(orderSkuVo.getOrderSkuId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment