修改bug

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/controller/MerchantStationController.java

@@ -147,7 +147,6 @@ public class MerchantStationController {
                     for (MerchantStationPerformanceVo r : voList) {
                         List<String> permissionIds = authorizationPerformanceVoMap.getOrDefault(r.getPerformancesId(), defaultAuthorizationPerformanceVo).getPermissionIds();
                         r.setPermissionIds(StringUtils.join(permissionIds.toArray(), "."));
-                        r.setTicketTimeList(null);
 
                         MerchantAuthorizationPerformanceVo authorizationPerformanceVo = authorizationPerformanceVoMap.get(r.getPerformancesId());
                         if (authorizationPerformanceVo.getPermissionIds().contains(MerchantAuthorizationConst.PerformancePermission.SALES.getId())) {
@@ -158,6 +157,7 @@ public class MerchantStationController {
                                 merchantStationService.salesStatisticsSetter(r, performanceTicketEntitiesVoList);
                             }
                         }
+                        r.setTicketTimeList(null);
                     }
                 } else {
                     voList.forEach(r -> {

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

@@ -167,6 +167,8 @@ public class DataImpl {
                 MerchantFieldsVo vo = MerchantFieldsVo.getNew().copy(fields);
 
                 MerchantFieldApplies applies = new MerchantFieldApplies();
+                MerchantFieldAppliesVo appliesVo = null;
+                if (fields.getClaimStatus() != 0) {
                     applies.setFieldApplyId(IDGenerator.nextSnowId());
                     applies.setApplyStatus(1);
                     applies.setUid(fields.getUid());
@@ -200,11 +202,13 @@ public class DataImpl {
                         applies.setLegalIdentityReverse(row.getString("identity_card_img_back"));
                     }
                     applies.setCreatedAt(LocalDateTime.now());
-                MerchantFieldAppliesVo appliesVo = MerchantFieldAppliesVo.getNew().copy(applies);
-
+                    appliesVo = MerchantFieldAppliesVo.getNew().copy(applies);
+                }
                 //MYSQL
                 merchantFieldsMapper.insert(fields);
+                if (fields.getClaimStatus() != 0) {
                     merchantFieldAppliesMapper.insert(applies);
+                }
                 //OTHER
                 judgeFields(fields.getFieldId(), fields.getUid(), appliesVo, vo);
                 //场地权限
@@ -370,6 +374,7 @@ public class DataImpl {
 
     //相关权限迁移
     public void checkTicket() {
+//        initPermission("check", "585768981301944329909622", "201357233419837447752118", null, "王斐", "3065512271283404835770393", "18518013286");
         try {
             String sql = "select kcup.performance_id,kcu.mobile,kpr.merchant_id\n" +
                     "from kylin_check_user_performances kcup\n" +
@@ -420,18 +425,19 @@ public class DataImpl {
     }
 
     private void judgeFields(String fieldId, String uid, MerchantFieldAppliesVo appliesVo, MerchantFieldsVo vo) {
+        if (appliesVo != null) {
             //MerchantFieldAppliesVo MONGO
             mongoTemplate.insert(appliesVo, MerchantFieldAppliesVo.class.getSimpleName());
+            //MerchantFieldAppliesVo MONGO
+            List<MerchantFieldAppliesVo> vos = new ArrayList();
+            vos.add(appliesVo);
+            redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
+        }
         // MerchantFieldsVo MONGO
         Query query = Query.query(Criteria.where("fieldId").is(fieldId));
         Document document = (Document) mongoConverter.convertToMongoType(vo);
         Update update = Update.fromDocument(document);
         mongoTemplate.upsert(query, update, MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
-
-        //MerchantFieldAppliesVo MONGO
-        List<MerchantFieldAppliesVo> vos = new ArrayList();
-        vos.add(appliesVo);
-        redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD_APPLIES.concat(uid), vos);
         // MerchantFieldsVo REDIS
         redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo);
     }