修改 志愿者 未满十八岁的提示

修改 库存接口

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

@@ -14,6 +14,7 @@ public class GoblinPosGoodsVo implements Serializable, Cloneable {
     private BigDecimal price;
     private String spuId;
     private String spuName;
+    private Integer restStock;
 
     private static final GoblinPosGoodsVo obj = new GoblinPosGoodsVo();
 

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

@@ -6,6 +6,7 @@ import com.liquidnet.common.exception.constant.ErrorCode;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.constant.GoblinStatusConst;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -100,6 +101,9 @@ public class GoblinPosController {
                     posGoodsVo.setPrice(goodsSkuInfoVo.getPrice());
                     posGoodsVo.setSpuId(spuId);
                     posGoodsVo.setSpuName(goodsInfoVo.getName());
+                    String pre = GoblinStatusConst.MarketPreStatus.getPre(spuId);
+                    int stock = goblinRedisUtils.getSkuStock(pre, skuId);
+                    posGoodsVo.setRestStock(stock);
 
                     posGoodsVoList.add(posGoodsVo);
                 }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/service/impl/SmileVolunteerServerImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.service.impl;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.IDCard;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -110,6 +111,10 @@ public class SmileVolunteerServerImpl implements SmileVolunteersService {
             if (smileRedisUtils.getProjectIdCard(param.getProjectId(), param.getIdCard()) != null) {
                 return ResponseDto.failure("该证件已经报名");
             }
+            int age = IDCard.getAgeByIdCard(param.getIdCard());
+            if (age < 18) {
+                return ResponseDto.failure("招募对象为年满18岁的成年公民");
+            }
 
             if (!utils.validate(param.getName(), param.getIdCard())) {
                 return ResponseDto.failure("验证身份证失败！");