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

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

@@ -174,8 +174,6 @@ public class InnerService {
     //上报场地
     public boolean reportField(SlimeFieldsVo vo) {
         try {
-
-
             MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
             headers.add("Accept", "application/json;charset=UTF-8");
             HashMap<String, String> params = CollectionUtil.mapStringString();

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

@@ -97,7 +97,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
 //        String orderId = "324561214127595525805856";
 //        innerService.reportO(dataUtils.getOrderTicketVo(orderId),"摩登天空");
 
-        innerService.reportField(dataUtils.getFieldsVoByFieldId("7"));
+//        innerService.reportField(dataUtils.getFieldsVoByFieldId("7"));
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/slime/service/impl/SlimeFieldAppliesAdminServiceImpl.java

@@ -185,7 +185,7 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
             List<SlimeFieldAppliesVo> fieldAppliesVos = slimeRedisUtil.getFieldAppliesVosByUid(fieldAppliesVo.getUid());
             slimeRedisUtil.setFieldAppliesVoByUid(fieldAppliesVo.getUid(), fieldAppliesVos, fieldAppliesVo);
             //上传场地
-            innerService.reportField(fieldsVo);
+//            innerService.reportField(fieldsVo);
         } else {
             // 创建逻辑
 
@@ -294,7 +294,7 @@ public class SlimeFieldAppliesAdminServiceImpl extends ServiceImpl<SlimeFieldApp
             List<SlimeFieldAppliesVo> fieldAppliesVos = slimeRedisUtil.getFieldAppliesVosByUid(fieldAppliesVo.getUid());
             slimeRedisUtil.setFieldAppliesVoByUid(fieldAppliesVo.getUid(), fieldAppliesVos, fieldAppliesVo);
             //上传场地
-            innerService.reportField(fieldsVo);
+//            innerService.reportField(fieldsVo);
         }
 
         return true;

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/SlimeStationService.java

@@ -50,8 +50,8 @@ public class SlimeStationService {
     @Autowired
     RedisUtil redisUtil;
 
-    @Autowired
-    FeignPlatformTicketSystemClient feignPlatformTicketSystemClient;
+//    @Autowired
+//    FeignPlatformTicketSystemClient feignPlatformTicketSystemClient;
 
     /**
      * 查取用户存在权限的演出
@@ -184,29 +184,29 @@ public class SlimeStationService {
 
 
             /* ====================================== 同步票务系统 */
-            ArrayList<CheckVo> checkVos = ObjectUtil.getCheckVoArrayList();
-            Query orderTicketEntitiesVoQuery = Query.query(Criteria.where("orderTicketEntitiesId").in(orderTicketEntitiesIdList));
-            orderTicketEntitiesVoQuery.fields().include("ticketId").include("timeId").include("enterIdCode").include("checkedAt");
-            List<KylinOrderTicketEntitiesVo> checkOrderVos = mongoTemplate.find(orderTicketEntitiesVoQuery, KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
-            checkOrderVos.forEach(r -> {
-                CheckVo checkVo = CheckVo.getNew();
-                checkVo.setTicketId(r.getTicketId());
-                checkVo.setPriceId(this.getPriceId(r.getTicketId()));
-                checkVo.setSessionId(r.getTimeId());
-                checkVo.setSessionCode(this.getSessionCode(r.getTimeId()));
-                checkVo.setCheckingTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(r.getCheckedAt()));
-                checkVo.setCheckingType(1);
-                checkVo.setAuthType(StringUtils.isEmpty(r.getEnterIdCode()) ? 2 : 1);
-
-                checkVos.add(checkVo);
-            });
-            if (!CollectionUtils.isEmpty(checkVos)) {
-                try {
-                    feignPlatformTicketSystemClient.insertCheck(checkVos);
-                } catch (Exception e) {
-                    log.error("验票:上载验票数据:同步票务系统请求异常");
-                }
-            }
+//            ArrayList<CheckVo> checkVos = ObjectUtil.getCheckVoArrayList();
+//            Query orderTicketEntitiesVoQuery = Query.query(Criteria.where("orderTicketEntitiesId").in(orderTicketEntitiesIdList));
+//            orderTicketEntitiesVoQuery.fields().include("ticketId").include("timeId").include("enterIdCode").include("checkedAt");
+//            List<KylinOrderTicketEntitiesVo> checkOrderVos = mongoTemplate.find(orderTicketEntitiesVoQuery, KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+//            checkOrderVos.forEach(r -> {
+//                CheckVo checkVo = CheckVo.getNew();
+//                checkVo.setTicketId(r.getTicketId());
+//                checkVo.setPriceId(this.getPriceId(r.getTicketId()));
+//                checkVo.setSessionId(r.getTimeId());
+//                checkVo.setSessionCode(this.getSessionCode(r.getTimeId()));
+//                checkVo.setCheckingTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(r.getCheckedAt()));
+//                checkVo.setCheckingType(1);
+//                checkVo.setAuthType(StringUtils.isEmpty(r.getEnterIdCode()) ? 2 : 1);
+//
+//                checkVos.add(checkVo);
+//            });
+//            if (!CollectionUtils.isEmpty(checkVos)) {
+//                try {
+//                    feignPlatformTicketSystemClient.insertCheck(checkVos);
+//                } catch (Exception e) {
+//                    log.error("验票:上载验票数据:同步票务系统请求异常");
+//                }
+//            }
             /* ====================================== ========== */
         }
     }