Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java

@@ -85,7 +85,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
 
             obj1.setPicUrl(performanceData.getImgPoster());
-            obj1.setProjectId(Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12))));
+            long performanceKey = 0l;
+            if(performanceData.getPerformancesId().length()<13){
+                performanceKey = Long.valueOf(performanceData.getPerformancesId());
+            }else {
+                performanceKey = Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12)));
+            }
+            obj1.setProjectId(performanceKey);
             obj1.setProjectName(performanceData.getTitle());
             obj1.setCityId(performanceData.getCityId().longValue());
             obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
@@ -98,7 +104,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
                 for (int i = 0; i < timeRelation.size(); i++) {
                     KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId()));
-                    boolean result = sycTimes(Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12))), timeData);
+                    boolean result = sycTimes(performanceKey, timeData);
                     if (!result) {
                         return false;
                     }
@@ -121,7 +127,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam();
 
             obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
-            obj1.setPerformId(Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12))));
+            long ticketTimesKey = 0l;
+            if(timesData.getTicketTimesId().length()>13){
+                ticketTimesKey=Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12)));
+            }else{
+                ticketTimesKey = Long.valueOf(timesData.getTicketTimesId());
+            }
+
+            obj1.setPerformId(ticketTimesKey);
             obj1.setPerformName(timesData.getTitle());
             obj1.setProjectId(performancesmId);
             obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
@@ -134,7 +147,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                 for (int i = 0; i < ticketRelation.size(); i++) {
                     if (null != ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelation.get(i).getTicketId()).eq("sync_damai", 1))) {
                         KylinTickets ticketData = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketRelation.get(i).getTicketId()));
-                        boolean result = sycTicket(Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12))), ticketData);
+                        boolean result = sycTicket(ticketTimesKey, ticketData);
                         if (!result) {
                             return false;
                         }
@@ -157,7 +170,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest();
             PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam();
 
-            obj1.setItemId(Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12))));
+            long ticketIdKey = 0l;
+            if(ticketsData.getTicketsId().length()>13){
+                ticketIdKey=Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12)));
+            }else{
+                ticketIdKey = Long.valueOf(ticketsData.getTicketsId());
+            }
+            obj1.setItemId(ticketIdKey);
             obj1.setItemName(ticketsData.getTitle());
             obj1.setItemPrice(ticketsData.getPrice().longValue());
             obj1.setPerformId(timemId);
@@ -167,7 +186,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             req.setPushItemParam(obj1);
             AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
             if (rsp.getResult().getSuccess()) {
-                return sycOrder(timemId, ticketsData.getTicketsId(), Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12))));
+                return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
             } else {
                 return false;
             }
@@ -207,7 +226,11 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     }
 
                     obj3.setOrderId(Long.parseLong(item.getOrderTicketsId()));//订单id orderId
-                    obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12))));//票单号 入场人id
+                    if(item.getOrderTicketEntitiesId().length()>13){
+                        obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12))));//票单号 入场人id
+                    }else{
+                        obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId()));//票单号 入场人id
+                    }
 
                     obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
                     obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());

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

@@ -197,10 +197,17 @@ public class AdamUserController {
                                           @RequestParam String code) {
         log.debug("mobile:{},code:{}", mobile, code);
 
-        ResponseDto checkSmsCodeDto = this.checkSmsCode(mobile, code);
+        String currentUid = CurrentUtil.getCurrentUid();
+
+        String bindMobileExistUid = adamRdmService.getUidByMobile(mobile);
+        if (StringUtils.isNotEmpty(bindMobileExistUid)) {
+            return ResponseDto.failure(ErrorMapping.get("10009"));
+        }
+
+        ResponseDto<String> checkSmsCodeDto = this.checkSmsCode(mobile, code);
         if (!checkSmsCodeDto.isSuccess()) return checkSmsCodeDto;
 
-        return ResponseDto.success(adamUserInfoService.editMobile(CurrentUtil.getCurrentUid(), mobile));
+        return ResponseDto.success(adamUserInfoService.editMobile(currentUid, mobile));
     }
 
     @ApiOperationSupport(order = 5)
@@ -311,7 +318,7 @@ public class AdamUserController {
 
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
-    private ResponseDto checkSmsCode(String mobile, String code) {
+    private ResponseDto<String> checkSmsCode(String mobile, String code) {
         if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
                 && CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
             return ResponseDto.success();

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

@@ -154,6 +154,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
             s = System.currentTimeMillis();
             adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid);
+            adamRdmService.setUidByMobile(param.getMobile(), uid);
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             s = System.currentTimeMillis();

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

@@ -12,7 +12,7 @@
 10006=第三方账号未注册
 10007=该第三方账号已经被其他用户绑定
 10008=已经绑定过该类型的第三方账号
-10009=
+10009=手机号已经注册
 10010=
 10011=性别标签无效
 10012=音乐风格标签无效