Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamProPerformMarkVo.java

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "AdamProPerformMarkVo", description = "用户演出标记信息")
+@Data
+public class AdamProPerformMarkVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -8613727485190342352L;
+    private String pid;
+    private String pname;
+    private String time;
+    private int count;
+
+    private static final AdamProPerformMarkVo obj = new AdamProPerformMarkVo();
+
+    public static AdamProPerformMarkVo getNew() {
+        try {
+            return (AdamProPerformMarkVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamProPerformMarkVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamProScanitVo.java

+package com.liquidnet.service.adam.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "AdamProScanitVo", description = "现场用户扫码信息")
+@Data
+public class AdamProScanitVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 5633320792752494064L;
+    @ApiModelProperty(position = 11, value = "会员标记[0-普通用户｜2-过期会员｜10-老会员｜11-新会员]")
+    private Integer stageMarker;
+    @ApiModelProperty(position = 12, value = "用户演出标记信息List")
+    private List<AdamProPerformMarkVo> performMarkVos;
+
+    private static final AdamProScanitVo obj = new AdamProScanitVo();
+
+    public static AdamProScanitVo getNew() {
+        try {
+            return (AdamProScanitVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamProScanitVo();
+        }
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontNavigationServiceImpl.java

@@ -128,8 +128,11 @@ public class GoblinFrontNavigationServiceImpl extends ServiceImpl<GoblinFrontNav
                 queryWrappers.ne(GoblinGoods::getDelFlg,"1");
                 queryWrappers.eq(GoblinGoods::getSpuId,goblinFrontNavigationBuildParam.getSpuId());
                 List<GoblinGoods> goodsList= goblinGoodsMapper.selectList(queryWrappers);
+                if(goodsList.size()>0){
                     goblinFrontNavigationBuildParam.setGoblinGoods(goodsList.get(0));
                 }
+
+            }
             list1.add(goblinFrontNavigationBuildParam);
         }
         return list1;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/adam/PlatformAdamProController.java

+package com.liquidnet.service.platform.controller.adam;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.liquidnet.common.exception.constant.ErrorCode;
+import com.liquidnet.service.adam.dto.vo.AdamProScanitVo;
+import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.platform.service.impl.adam.PlatformAdamProService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+
+@Api(tags = "专业版APP:用户相关")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("pro")
+public class PlatformAdamProController {
+    @Autowired
+    PlatformAdamProService platformAdamProService;
+
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "扫一扫")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "pidcode", value = "用户QRCODE@演出ID"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "pname", value = "演出名称"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "cod", value = "用户QRCODE"),
+    })
+    @PutMapping(value = {"scanit"})
+    public ResponseDto<AdamProScanitVo> sendSms(@NotBlank(message = "参数有误") @RequestParam String pidco,
+                                                @NotBlank(message = "参数有误") @RequestParam String pname) {
+        String[] split = pidco.split("@");
+        if (split.length < 2) {
+            log.warn("#PRO:SCANIT[pidco={},pname={}]", pidco, pname);
+            return ResponseDto.failure(ErrorCode.HTTP_PARAM_ERROR.getMessage());
+        }
+        log.info("PRO:SCANIT[pidco={},pname={}]", pidco, pname);
+        return ResponseDto.success(platformAdamProService.scanitProcess(split[0], split[1], split[2]));
+    }
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformAdamProService.java

+package com.liquidnet.service.platform.service.impl.adam;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.dto.vo.AdamProPerformMarkVo;
+import com.liquidnet.service.adam.dto.vo.AdamProScanitVo;
+import com.liquidnet.service.adam.entity.AdamUserInfo;
+import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
+import com.liquidnet.service.platform.utils.ObjectUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+
+@Service
+public class PlatformAdamProService extends ServiceImpl<AdamUserInfoMapper, AdamUserInfo> {
+    @Autowired
+    private RedisDataSourceUtil redisDataSourceUtil;
+
+    public AdamProScanitVo scanitProcess(String pid, String pna, String cod) {
+
+        AdamProScanitVo scanitVo = AdamProScanitVo.getNew();
+        scanitVo.setStageMarker(11);
+
+        ArrayList<AdamProPerformMarkVo> performMarkVoArrayList = ObjectUtil.getAdamProPerformMarkVoArrayList();
+        AdamProPerformMarkVo performMarkVo = AdamProPerformMarkVo.getNew();
+        performMarkVo.setPid("1");
+        performMarkVo.setPname("aname");
+        performMarkVo.setTime(DateUtil.Formatter.yyyy_MM_dd.format(LocalDate.now()));
+        performMarkVo.setCount(1);
+        performMarkVoArrayList.add(performMarkVo);
+        scanitVo.setPerformMarkVos(performMarkVoArrayList);
+
+        return scanitVo;
+    }
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java

@@ -50,6 +50,7 @@ public class ObjectUtil {
     private static final ArrayList<AdamEntersVo> adamEntersVoArrayList = new ArrayList<>();
     private static final ArrayList<AdamAddressesVo> adamAddressesVoArrayList = new ArrayList<>();
     private static final ArrayList<AdamMemberOrderVo> adamMemberOrderVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamProPerformMarkVo> adamProPerformMarkVoArrayList = new ArrayList<>();
     private static final ArrayList<CandyCommonCoupon> candyCommonCouponArrayList = new ArrayList<>();
     private static final ArrayList<CandyCouponCode> candyCouponCodeArrayList = new ArrayList<>();
     private static final ArrayList<CandyUserCoupon> candyUserCouponArrayList = new ArrayList<>();
@@ -88,6 +89,10 @@ public class ObjectUtil {
         return (ArrayList<AdamMemberOrderVo>) adamMemberOrderVoArrayList.clone();
     }
 
+    public static ArrayList<AdamProPerformMarkVo> getAdamProPerformMarkVoArrayList() {
+        return (ArrayList<AdamProPerformMarkVo>) adamProPerformMarkVoArrayList.clone();
+    }
+
     public static ArrayList<CandyCommonCoupon> getCandyCommonCouponArrayList() {
         return (ArrayList<CandyCommonCoupon>) candyCommonCouponArrayList.clone();
     }