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

@@ -86,9 +86,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
             obj1.setPicUrl(performanceData.getImgPoster());
             long performanceKey = 0l;
-            if(performanceData.getPerformancesId().length()<13){
+            if (performanceData.getPerformancesId().length() < 13) {
                 performanceKey = Long.valueOf(performanceData.getPerformancesId());
-            }else {
+            } else {
                 performanceKey = Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12)));
             }
             obj1.setProjectId(performanceKey);
@@ -128,9 +128,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
 
             obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
             long ticketTimesKey = 0l;
-            if(timesData.getTicketTimesId().length()>13){
-                ticketTimesKey=Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12)));
-            }else{
+            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());
             }
 
@@ -171,9 +171,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam();
 
             long ticketIdKey = 0l;
-            if(ticketsData.getTicketsId().length()>13){
-                ticketIdKey=Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12)));
-            }else{
+            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);
@@ -218,19 +218,23 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
                     obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
                     obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间
                     obj3.setPerformId(timemId);//场次id
-//                obj3.setTicketItemId(ticketsmId);
+                    obj3.setTicketItemId(ticketsmId);
+
+                    obj3.setOrderId(Long.parseLong(item.getOrderTicketsId()));//订单id orderId
                     if (item.getIsMember() == 1) {
-                        obj3.setTicketItemId(Long.parseLong(ticketsmId + "010"));//票品id ticketId+01会员 ticketId+0非会员
+                        if (item.getOrderTicketEntitiesId().length() > 13) {
+                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12))+"010"));//票单号 入场人id
                         } else {
-                        obj3.setTicketItemId(Long.parseLong(ticketsmId + "020"));
+                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId()+"010"));//票单号 入场人id
                         }
-
-                    obj3.setOrderId(Long.parseLong(item.getOrderTicketsId()));//订单id orderId
-                    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
+                    } else {
+                        if (item.getOrderTicketEntitiesId().length() > 13) {
+                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12)+"020")));//票单号 入场人id
+                        } else {
+                            obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId()+"020"));//票单号 入场人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/service/impl/AdamUserServiceImpl.java

@@ -172,7 +172,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
             } else if (thirdPartVo.getOpenId().equals(param.getOpenId())) {
                 userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
             } else {
-                return ResponseDto.failure(ErrorMapping.get("10007"));
+                return ResponseDto.failure(ErrorMapping.get("10010"));
             }
         }
         return ResponseDto.success(userInfoVo);

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

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