Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserInfoService.java

@@ -16,5 +16,5 @@ public interface IAdamUserInfoService extends IService<AdamUserInfo> {
 
     void edit(AdamUserInfoVo userInfoVo);
 
-    void editMobile(String uid, String mobile);
+    String editMobile(String uid, String mobile);
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceOrderStatisticalVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: PerformanceOrderStatisticalVo
+ * @Package com.liquidnet.service.kylin.dto.vo
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/19 16:44
+ */
+@Data
+public class PerformanceOrderStatisticalVo {
+    private String performancesId;
+    private String ticketsId;
+    @ApiModelProperty(value = "票种名称")
+    private String title;
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+    @ApiModelProperty(value = "票种类型")
+    private Integer type;
+    @ApiModelProperty(value = "适用时间")
+    private String useStart;
+    @ApiModelProperty(value = "总库存")
+    private BigDecimal totalGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "销售数量")
+    private BigDecimal saleGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "剩余库存")
+    private BigDecimal surplusGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "销售额")
+    private BigDecimal totalSalePrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "兑换数量")
+    private BigDecimal totalExchange = BigDecimal.ZERO;
+    @ApiModelProperty(value = "退款数量")
+    private BigDecimal totalRefundGeneral = BigDecimal.ZERO;
+    @ApiModelProperty(value = "退款金额")
+    private BigDecimal totalRefundPrice = BigDecimal.ZERO;
+    @ApiModelProperty(value = "会员销售数量")
+    private BigDecimal totalMemberNumber = BigDecimal.ZERO;
+    @ApiModelProperty(value = "正在支付数量")
+    private BigDecimal totalPayingNumber = BigDecimal.ZERO;
+    @ApiModelProperty(value = "购买人数")
+    private BigDecimal totalBuyUsers = BigDecimal.ZERO;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java

@@ -3,12 +3,12 @@ package com.liquidnet.service.kylin.service.partner;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
 import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 import java.util.List;
@@ -129,5 +129,5 @@ public interface IKylinPerformancesPartnerService extends IService<KylinPerforma
      */
     ResponseDto<String> withdraw(String performancesId);
 
-    List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId);
+    List<PerformanceOrderStatisticalVo> getPerformanceOrderStatisticalList(String performancesId);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -36,10 +36,12 @@ public class AdamRedisConst {
 
     public static final String INCR_MEMBER_NO = INCR.concat("member_no");
 
-    public static final String INFO_MEMBERS = ADAM.concat(":list:members");
-    public static final String INFO_MEMBERS_INFO = ADAM.concat(":list:members:info:");
-    public static final String INFO_MEMBERS_PRICE_INFO = ADAM.concat(":list:members:price:info:");
-    public static final String INFO_MEMBERS_CODE_INFO = ADAM.concat(":list:members:code:info:");
-    public static final String INFO_MEMBERS_REPERTORY_INFO = ADAM.concat(":list:members:repertory:");
-    public static final String INFO_MEMBERS_ORDER_INFO = ADAM.concat(":list:members:order:");
+
+    /* ----------------------------------------------------------------- */
+
+    public static final String LOCK_KEY_UMEMBER_NO = "adam:lk:member_no";
+    // // // // // // // // // //
+    public static final String LOCK_KEY_UREGISTER = "adam:lk:register:";
+
+    /* ----------------------------------------------------------------- */
 }

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

@@ -128,12 +128,19 @@ public class AdamLoginController {
         if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure(ErrorMapping.get("10002"));
 
         String uid = adamRdmService.getUidByMobile(mobile);
-
         boolean toRegister = StringUtils.isEmpty(uid);
-        AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
+
+        AdamUserInfoVo userInfoVo;
+        if (toRegister) {
+            userInfoVo = adamUserService.register(mobile);
+            if (null == userInfoVo) {
+                return ResponseDto.failure(ErrorMapping.get("10003"));
+            }
+        } else {
+            userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+        }
 
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
-//        if (userInfoVo.getIsComplete() == 1) {
         if (!toRegister) {
             loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
@@ -160,10 +167,17 @@ public class AdamLoginController {
         String uid = adamRdmService.getUidByMobile(mobile);
         boolean toRegister = StringUtils.isEmpty(uid);
 
-        AdamUserInfoVo userInfoVo = toRegister ? adamUserService.register(mobile) : adamRdmService.getUserInfoVoByUid(uid);
+        AdamUserInfoVo userInfoVo;
+        if (toRegister) {
+            userInfoVo = adamUserService.register(mobile);
+            if (null == userInfoVo) {
+                return ResponseDto.failure(ErrorMapping.get("10003"));
+            }
+        } else {
+            userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+        }
 
         AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
-//        if (loginInfoVo.getUserInfo().getIsComplete() == 1) {
         if (!toRegister) {
             loginInfoVo.setRealNameInfo(adamRdmService.getRealInfoVoByUid(userInfoVo.getUid()));
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(userInfoVo.getUid()));
@@ -197,10 +211,13 @@ public class AdamLoginController {
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
             loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         } else {// 新账号注册
-            if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode()))
+            if (!this.checkSmsCode(parameter.getMobile(), parameter.getCode())) {
                 return ResponseDto.failure(ErrorMapping.get("10002"));
-
+            }
             AdamUserInfoVo registerUserInfo = adamUserService.register(parameter);
+            if (null == registerUserInfo) {
+                return ResponseDto.failure(ErrorMapping.get("10003"));
+            }
             loginInfoVo.setUserInfo(registerUserInfo);
             loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
             loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());

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

@@ -164,7 +164,7 @@ public class AdamMemberOrderController {
         if (vo.getState() != 0) {
             return ResponseDto.failure(ErrorMapping.get(vo.getState() == 1 ? "10208" : "10209"));
         }
-        return ResponseDto.success();
+        return ResponseDto.success(0);
     }
 
     @ApiOperationSupport(order = 4)

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

@@ -176,13 +176,13 @@ public class AdamUserController {
     }
 
     @ApiOperationSupport(order = 4)
-    @ApiOperation(value = "手机号修改")
+    @ApiOperation(value = "手机号修改", notes = "手机号修改会刷新TOKEN，刷新后的TOKEN对应响应参数中[`data`]")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "新手机号"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "验证码"),
     })
     @PostMapping(value = {"edit/mobile"})
-    public ResponseDto<Object> editMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
+    public ResponseDto<String> editMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
                                           @RequestParam String mobile,
                                           @Pattern(regexp = "\\d{6}", message = "验证码格式有误")
                                           @RequestParam String code) {
@@ -190,11 +190,7 @@ public class AdamUserController {
 
         if (!this.checkSmsCode(mobile, code)) return ResponseDto.failure(ErrorMapping.get("10002"));
 
-        String uid = CurrentUtil.getCurrentUid();
-
-        adamUserInfoService.editMobile(uid, mobile);
-
-        return ResponseDto.success();
+        return ResponseDto.success(adamUserInfoService.editMobile(CurrentUtil.getCurrentUid(), mobile));
     }
 
     @ApiOperationSupport(order = 5)

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.mq.constant.MQConst;
+import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.BsonUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
@@ -20,8 +22,12 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
 
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,9 +43,13 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
+    IAdamRdmService adamRdmService;
+    @Autowired
     RabbitTemplate rabbitTemplate;
     @Autowired
-    IAdamRdmService adamRdmService;
+    RedisUtil redisUtil;
+    @Autowired
+    JwtValidator jwtValidator;
 
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@@ -81,7 +91,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
 
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void editMobile(String uid, String mobile) {
+    public String editMobile(String uid, String mobile) {
         LocalDateTime now = LocalDateTime.now();
 //        AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
 //        updateInfoVo.setUpdatedAt(now);
@@ -108,5 +118,24 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
         rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
                 SqlMapping.get("adam_user.edit.mobile", mobile, now, uid));
         log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+
+        return  this.flushSsoProcess(beforeUserInfoVo);
+    }
+
+    private String flushSsoProcess(AdamUserInfoVo userInfoVo) {
+        Map<String, Object> claimsMap = new HashMap<>();
+        claimsMap.put("sub", userInfoVo.getUid());
+        claimsMap.put("mobile", userInfoVo.getMobile());
+        claimsMap.put("nickname", userInfoVo.getNickname());
+        claimsMap.put("type", "user");
+
+        String token = jwtValidator.create(claimsMap);
+
+        redisUtil.set(
+                jwtValidator.getSsoRedisKey().concat(userInfoVo.getUid()),
+                DigestUtils.md5DigestAsHex(token.getBytes(StandardCharsets.UTF_8)),
+                jwtValidator.getExpireTtl() * 60
+        );
+        return token;
     }
 }

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
-import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
@@ -19,6 +18,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.regex.Pattern;
 
+import static com.liquidnet.service.adam.constant.AdamRedisConst.LOCK_KEY_UMEMBER_NO;
+
 @Slf4j
 @Service
 public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper, AdamUserMember> implements IAdamUserMemberService {
@@ -27,14 +28,12 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
     @Autowired
     IAdamRdmService adamRdmService;
 
-    private static final String LOCK_KEY_UMEMBER_NO = "adam:lk:member_no";
-
     @Override
     public String getNextMemberNo(String memberId) {
         long s = System.currentTimeMillis();
         int memberMaxNo = adamRdmService.getMaxMemberNo();
         if (-1 == memberMaxNo) {
-            if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3000)) {
+            if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3)) {
                 memberMaxNo = adamRdmService.getMaxMemberNo();
                 if (-1 == memberMaxNo) {
                     Query query = Query.query(Criteria.where("memberId").is(memberId)).with(Sort.by(Sort.Direction.DESC, "memberNo")).limit(1);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -5,7 +5,7 @@
 
 10001=验证码发送失败
 10002=验证码无效
-10003=
+10003=系统繁忙，请稍候重试
 10004=
 10005=手机号获取失败，请更换登录方式
 10006=第三方账号未注册

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

@@ -2,12 +2,12 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
-import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageConfigVo;
-import com.liquidnet.service.kylin.dto.vo.middle.message.MessageDataVo;
-import com.liquidnet.service.kylin.service.impl.partner.KylinPerformancesPartnerServiceImpl;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.utils.OtherUtils;
 import io.swagger.annotations.Api;
@@ -118,8 +118,8 @@ public class PerformancePartnerController {
     @GetMapping(value = "orderStatistical")
     @ApiOperation(value = "演出订单统计",position = 9)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<List<PerformanceOrderStatisticalDao>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {
-        List<PerformanceOrderStatisticalDao> list =performancesPartnerService.getPerformanceOrderStatisticalList(performancesId);
+    public ResponseDto<List<PerformanceOrderStatisticalVo>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {
+        List<PerformanceOrderStatisticalVo> list =performancesPartnerService.getPerformanceOrderStatisticalList(performancesId);
         return ResponseDto.success(list);
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -13,20 +13,17 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
-import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
-import com.liquidnet.service.kylin.dto.vo.ignore.KylinPerformanceIgnoreVo;
-import com.liquidnet.service.kylin.dto.vo.ignore.KylinTicketIgnoreVo;
-import com.liquidnet.service.kylin.dto.vo.ignore.KylinTicketTimesIgnoreVo;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
+import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
+import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
-import com.liquidnet.service.kylin.utils.MongoVoUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -40,7 +37,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -635,12 +631,17 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     }
 
     @Override
-    public List<PerformanceOrderStatisticalDao> getPerformanceOrderStatisticalList(String performancesId) {
+    public List<PerformanceOrderStatisticalVo> getPerformanceOrderStatisticalList(String performancesId) {
         PerformanceOrderStatisticalDao countBean = new PerformanceOrderStatisticalDao();
         countBean.setTitle("总计：");
 
+        List<PerformanceOrderStatisticalVo> voList = new ArrayList<>();
         List<PerformanceOrderStatisticalDao> dtoList = performancesMapper.getPerformanceOrderStatisticalList(performancesId);
         dtoList.forEach(dto -> {
+            PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
+            BeanUtil.copy(dto,vo);
+            voList.add(vo);
+
             countBean.setTotalGeneral(countBean.getTotalGeneral().add(dto.getTotalGeneral()));
             countBean.setSaleGeneral(countBean.getSaleGeneral().add(dto.getSaleGeneral()));
             countBean.setSurplusGeneral(countBean.getSurplusGeneral().add(dto.getSurplusGeneral()));
@@ -652,7 +653,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             countBean.setTotalPayingNumber(countBean.getTotalPayingNumber().add(dto.getTotalPayingNumber()));
             countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
         });
-        dtoList.add(countBean);
-        return dtoList;
+        PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
+        BeanUtil.copy(countBean,vo);
+        voList.add(vo);
+        return voList;
     }
 }