Merge remote-tracking branch 'origin/master' into ajb_dev_zxinchain_tranfer

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

@@ -34,12 +34,13 @@ public class KylinArActiveController {
     @PostMapping("getUserStatus")
     @ApiOperation("查看用户是否绑定(0没有绑定、1绑定了、2失效[目前失效没有用]")
     public ResponseDto<String> getUserStatus() {
-        String uid = CurrentUtil.getCurrentUid();
-        if(null==dataUtils.getUserStatus(uid)){
-            return  ResponseDto.success("0");
-        }else{
-            return   ResponseDto.success(dataUtils.getUserStatus(uid));
-        }
+        return  ResponseDto.success("1");
+//        String uid = CurrentUtil.getCurrentUid();
+//        if(null==dataUtils.getUserStatus(uid)){
+//            return  ResponseDto.success("0");
+//        }else{
+//            return   ResponseDto.success(dataUtils.getUserStatus(uid));
+//        }
     }
     @PostMapping("exchangeCode")
     @ApiOperation("兑换码兑换")

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

@@ -173,8 +173,9 @@ public class TempServiceImpl implements IKylinTempService {
         List<KylinOrderTicketEntitiesVo> dataList = mongoTemplate.find(Query.query(Criteria.where("performanceId").is(performance_id).and("ticketId").in(ticket_ids).and("enterIdCode").is(idcode))
                 , KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
         for (KylinOrderTicketEntitiesVo entitiesVo : dataList) {
+            if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1 ) {
                 String ticketType = dataUtils.getOrderTicketVo(entitiesVo.getOrderId()).getGetTicketType();
-            if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1 && !"express".equals(ticketType)) {
+                if( !"express".equals(ticketType)){
                     CheckData vo = CheckData.getNew();
                     vo.setCheck_status(entitiesVo.getStatus());
                     vo.setCheck_time(entitiesVo.getCheckedAt());
@@ -204,6 +205,7 @@ public class TempServiceImpl implements IKylinTempService {
                     voList.add(vo);
                 }
             }
+        }
         return ResponseDto.success(voList);
     }
 
@@ -214,8 +216,9 @@ public class TempServiceImpl implements IKylinTempService {
             List<KylinOrderTicketEntitiesVo> dataList = mongoTemplate.find(Query.query(Criteria.where("performanceId").is(performance_id).and("ticketId").in(ticket_ids).and("enterIdCode").is(idcode))
                     , KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
             for (KylinOrderTicketEntitiesVo entitiesVo : dataList) {
+                if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1) {
                     String ticketType = dataUtils.getOrderTicketVo(entitiesVo.getOrderId()).getGetTicketType();
-                if (entitiesVo.getEnterIdCode().equals(idcode) && entitiesVo.getIsPayment() == 1 && !"express".equals(ticketType)) {
+                    if(!"express".equals(ticketType)){
                         CheckData vo = CheckData.getNew();
                         vo.setCheck_status(entitiesVo.getStatus());
                         vo.setCheck_time(entitiesVo.getCheckedAt());
@@ -246,6 +249,7 @@ public class TempServiceImpl implements IKylinTempService {
                         voList.add(vo);
                     }
                     }
+            }
 
             List<WriteModel<Document>> list = ObjectUtil.getWriteModelDocumentArrayList();
             LinkedList<Object[]> paramsList = CollectionUtil.linkedListObjectArr();