Merge branch 'pre' into 'master'

Pre

See merge request !164

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

@@ -92,6 +92,10 @@ public class AdamEntersController {
             if (any.isPresent()) {
                 return ResponseDto.failure(ErrorMapping.get("10019"));
             }
+
+            if (vos.size() >= 10) {
+                return ResponseDto.failure(ErrorMapping.get("10025"));
+            }
         }
 
         String entersId = adamEntersService.add(parameter);
@@ -161,7 +165,7 @@ public class AdamEntersController {
         AdamEntersVo enters = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
         if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
 
-        adamEntersService.remove(currentUid, entersId);
+//        adamEntersService.remove(currentUid, entersId);
 
         return ResponseDto.success();
     }

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

@@ -28,6 +28,7 @@
 10022=头像不合规
 10023=背景图不合规
 10024=该账号已被主动注销
+10025=入场人已达上限
 
 
 10101=姓名或身份证件号无效

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

@@ -208,11 +208,17 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             // 缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = KylinOrderRefundsVo.getNew();
             BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
-            UpdateResult result = mongoTemplate.updateFirst(
+            /*UpdateResult result = mongoTemplate.updateFirst(
                     Query.query(Criteria.where("orderRefundsId").is(refundId)),
                     Update.fromDocument(Document.parse(JsonUtils.toJson(kylinOrderRefundsVo))),
                     KylinOrderRefundsVo.class, KylinOrderRefundsVo.class.getSimpleName()
+            );*/
+            BasicDBObject objectUpdate = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
+            mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
+                    Query.query(Criteria.where("orderRefundsId").is(refundId)).getQueryObject(),
+                    objectUpdate
             );
+
             dataUtils.delOrderRefundVo(refundId);
             dataUtils.delOrderRefundVoByOrderId(orderId);