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

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CheckPerformanceRelationParam.java

 package com.liquidnet.service.kylin.dto.param;
 
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 
 @Data
-public class CheckPerformanceRelationParam {
+public class CheckPerformanceRelationParam implements Cloneable {
     @ApiModelProperty(value = "演出id")
     @NotNull(message = "演出ID不能为空")
     private String performanceId;
     @ApiModelProperty(value = "可下载时间")
     @NotNull(message = "可下载时间不能为空")
     private String canDownTime;
+
+    private static final CheckPerformanceRelationParam obj = new CheckPerformanceRelationParam();
+    public static CheckPerformanceRelationParam getNew() {
+        try {
+            return (CheckPerformanceRelationParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CheckPerformanceRelationParam();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerVo.java

 package com.liquidnet.service.kylin.dto.param;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,7 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class PerformancePartnerVo implements Serializable {
+public class PerformancePartnerVo implements Serializable,Cloneable {
 
     @ApiModelProperty(value = "演出id", example = "")
     @JsonIgnore
@@ -112,4 +113,13 @@ public class PerformancePartnerVo implements Serializable {
 
     @ApiModelProperty(value = "是否保存", example = "")
     private Integer isCreateSave;
+
+    private static final PerformancePartnerVo obj = new PerformancePartnerVo();
+    public static PerformancePartnerVo getNew() {
+        try {
+            return (PerformancePartnerVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PerformancePartnerVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class PerformanceStep2Param implements Serializable {
+public class PerformanceStep2Param implements Serializable,Cloneable {
 
     @ApiModelProperty(value = "演出id", example = "")
     @NotNull(message = "不能为空")
@@ -35,4 +35,13 @@ public class PerformanceStep2Param implements Serializable {
 
     @ApiModelProperty(value = "场次数据",hidden = true)
     private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
+
+    private static final PerformanceStep2Param obj = new PerformanceStep2Param();
+    public static PerformanceStep2Param getNew() {
+        try {
+            return (PerformanceStep2Param) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PerformanceStep2Param();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceOrderStatisticalVo.java

 package com.liquidnet.service.kylin.dto.vo;
 
+import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,7 +16,7 @@ import java.math.BigDecimal;
  * @date 2021/6/19 16:44
  */
 @Data
-public class PerformanceOrderStatisticalVo {
+public class PerformanceOrderStatisticalVo implements Cloneable {
     private String performancesId;
     private String ticketsId;
     @ApiModelProperty(value = "票种名称")
@@ -48,4 +49,13 @@ public class PerformanceOrderStatisticalVo {
     private BigDecimal totalPayingNumber = BigDecimal.ZERO;
     @ApiModelProperty(value = "购买人数")
     private BigDecimal totalBuyUsers = BigDecimal.ZERO;
+
+    private static final PerformanceOrderStatisticalVo obj = new PerformanceOrderStatisticalVo();
+    public static PerformanceOrderStatisticalVo getNew() {
+        try {
+            return (PerformanceOrderStatisticalVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PerformanceOrderStatisticalVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinBuyNoticeVo.java

 package com.liquidnet.service.kylin.dto.vo.middle;
 
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import lombok.Data;
 
 @Data
-public class KylinBuyNoticeVo {
+public class KylinBuyNoticeVo implements Cloneable {
 
     private String buyNoticeId;
 
@@ -14,4 +15,13 @@ public class KylinBuyNoticeVo {
     private String message;
 
     private Integer sort;
+
+    private static final KylinBuyNoticeVo obj = new KylinBuyNoticeVo();
+    public static KylinBuyNoticeVo getNew() {
+        try {
+            return (KylinBuyNoticeVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinBuyNoticeVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCheckUserPerformanceVo.java

@@ -10,10 +10,19 @@ import java.util.List;
 
 @Data
 @ApiModel
-public class KylinCheckUserPerformanceVo implements Serializable {
+public class KylinCheckUserPerformanceVo implements Serializable,Cloneable {
     @ApiModelProperty(value = "id")
     private String checkUserId;
 
     @ApiModelProperty(value = "演出id数组")
     private List<CheckPerformanceRelationParam> relationParams;
+
+    private static final KylinCheckUserPerformanceVo obj = new KylinCheckUserPerformanceVo();
+    public static KylinCheckUserPerformanceVo getNew() {
+        try {
+            return (KylinCheckUserPerformanceVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinCheckUserPerformanceVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCheckUserVo.java

 package com.liquidnet.service.kylin.dto.vo.mongo;
 
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +9,7 @@ import java.io.Serializable;
 
 @Data
 @ApiModel
-public class KylinCheckUserVo implements Serializable {
+public class KylinCheckUserVo implements Serializable ,Cloneable{
 
     @ApiModelProperty(value = "id")
     private String checkUserId;
@@ -28,4 +29,12 @@ public class KylinCheckUserVo implements Serializable {
     @ApiModelProperty(value = "状态")
     private String status;
 
+    private static final KylinCheckUserVo obj = new KylinCheckUserVo();
+    public static KylinCheckUserVo getNew() {
+        try {
+            return (KylinCheckUserVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinCheckUserVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinPerformancePartnerListVo.java

 package com.liquidnet.service.kylin.dto.vo.partner;
 
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
+import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class KylinPerformancePartnerListVo {
+public class KylinPerformancePartnerListVo implements Cloneable{
 
     //演出数据
     @ApiModelProperty(value = "主键id")
@@ -47,4 +48,13 @@ public class KylinPerformancePartnerListVo {
         this.rejectTxt="";
         this.createdAt=item.getCreatedAt();
     }
+
+    private static final KylinPerformancePartnerListVo obj = new KylinPerformancePartnerListVo();
+    public static KylinPerformancePartnerListVo getNew() {
+        try {
+            return (KylinPerformancePartnerListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinPerformancePartnerListVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
  * 修改场地全部显示数据参数
  */
 @Data
-public class KylinTicketPartnerVo implements Serializable {
+public class KylinTicketPartnerVo implements Serializable,Cloneable {
     @ApiModelProperty(value = "主键")
     private String ticketsId;
 
@@ -116,4 +116,13 @@ public class KylinTicketPartnerVo implements Serializable {
         this.setSurplusExchange(this.getTotalExchange());
         this.setSurplusGeneral(this.getTotalGeneral());
     }
+
+    private static final KylinTicketPartnerVo obj = new KylinTicketPartnerVo();
+    public static KylinTicketPartnerVo getNew() {
+        try {
+            return (KylinTicketPartnerVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinTicketPartnerVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketTimesPartnerVo.java

 package com.liquidnet.service.kylin.dto.vo.partner;
 
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,7 +9,7 @@ import java.io.Serializable;
 //返回
 
 @Data
-public class KylinTicketTimesPartnerVo implements Serializable {
+public class KylinTicketTimesPartnerVo implements Serializable ,Cloneable{
     @ApiModelProperty(value = "主键id")
     private String ticketTimesId;
 
@@ -39,4 +40,13 @@ public class KylinTicketTimesPartnerVo implements Serializable {
 
     @ApiModelProperty(value = "修改时间")
     private String updatedAt;
+
+    private static final KylinTicketTimesPartnerVo obj = new KylinTicketTimesPartnerVo();
+    public static KylinTicketTimesPartnerVo getNew() {
+        try {
+            return (KylinTicketTimesPartnerVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinTicketTimesPartnerVo();
+        }
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesTicketCreatePartnerVo.java

@@ -9,7 +9,7 @@ import java.util.List;
 //包含 票
 
 @Data
-public class TicketTimesTicketCreatePartnerVo implements Serializable {
+public class TicketTimesTicketCreatePartnerVo implements Serializable ,Cloneable{
     @ApiModelProperty(value = "主键id")
     private String ticketTimesId;
 
@@ -40,4 +40,13 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
     //票
     @ApiModelProperty(value = "票数据")
     private List<KylinTicketPartnerVo> ticket;
+
+    private static final TicketTimesTicketCreatePartnerVo obj = new TicketTimesTicketCreatePartnerVo();
+    public static TicketTimesTicketCreatePartnerVo getNew() {
+        try {
+            return (TicketTimesTicketCreatePartnerVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new TicketTimesTicketCreatePartnerVo();
+        }
+    }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceOrderStatisticalDao.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
  * @date 2021/6/3 16:39
  */
 @Data
-public class PerformanceOrderStatisticalDao {
+public class PerformanceOrderStatisticalDao implements Cloneable{
     private String performancesId;
     private String ticketsId;
     private String title;
@@ -33,4 +33,13 @@ public class PerformanceOrderStatisticalDao {
     private BigDecimal totalMemberNumber = BigDecimal.ZERO;
     private BigDecimal totalPayingNumber = BigDecimal.ZERO;
     private BigDecimal totalBuyUsers = BigDecimal.ZERO;
+
+    private static final PerformanceOrderStatisticalDao obj = new PerformanceOrderStatisticalDao();
+    public static PerformanceOrderStatisticalDao getNew() {
+        try {
+            return (PerformanceOrderStatisticalDao) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PerformanceOrderStatisticalDao();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -683,7 +683,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime));
                 sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain"));
                 LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
-                Object[] objectB= ObjectUtil.cloneObjectsArray();
+                Object[] objectB= ObjectUtil.cloneObjectsArray(4);
                 objectB[0]= orderTickets.getUpdatedAt();
                 objectB[1]= orderTickets.getOrderTicketsId();
                 objectB[2]= strTime;
@@ -691,7 +691,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 sqlsDataB.add(objectB);
                 sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
                 LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
-                Object[] objectC = ObjectUtil.cloneObjectsArray();
+                Object[] objectC = ObjectUtil.cloneObjectsArray(4);
                 objectC[0]= orderTickets.getUpdatedAt();
                 objectC[1]= orderTickets.getOrderTicketsId();
                 objectC[2]= strTime;
@@ -699,7 +699,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 sqlsDataC.add(objectC);
                 sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain"));
                 LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj();
-                Object[] objectD = ObjectUtil.cloneObjectsArray();
+                Object[] objectD = ObjectUtil.cloneObjectsArray(4);
                 objectD[0]= orderTickets.getUpdatedAt();
                 objectD[1]= orderTickets.getOrderTicketsId();
                 objectD[2]= strTime;
@@ -727,6 +727,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             LocalDateTime now = LocalDateTime.now();
             String lock = "order_lock:" + syncOrderParam.getOrderCode();
             if (!redisLockUtil.tryLock(lock, 1, 5)) {
+                log.error("参数错误");
                 return "fail";//参数错误
             }
 
@@ -734,23 +735,27 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrderCode())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
             if (orderTicketData == null) {
                 redisLockUtil.unlock(lock);
+                log.error("订单不存在");
                 return "fail";//订单不存在
             }
 
             if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
                 if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
                     redisLockUtil.unlock(lock);
+                    log.error("已经支付");
                     return "success";//已经支付
                 }
 
                 if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) {
                     redisLockUtil.unlock(lock);
+                    log.error("重复支付");
                     return "fail";//重复支付
                 }
             }
 
             if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
                 redisLockUtil.unlock(lock);
+                log.error("价格不符");
                 return "fail";//价格不符
             }
 
@@ -773,6 +778,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
                 log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
             } else {
+                log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
                 orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
                 orderTickets.setPaymentType(syncOrderParam.getPaymentType());
                 orderTickets.setPayCode(syncOrderParam.getCode());
@@ -791,7 +797,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
 
                 sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
-                Object[] objectC = ObjectUtil.cloneObjectsArray();
+                Object[] objectC = ObjectUtil.cloneObjectsArray(4);
                 objectC[0]= orderTickets.getUpdatedAt();
                 objectC[1]= orderTickets.getOrderTicketsId();
                 objectC[2]= strTime;
@@ -883,7 +889,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";
         } catch (Exception e) {
-            log.error("SYNCE ORDER E = " + e.getMessage());
+            log.error("SYNCE ORDER E = " , e);
             e.printStackTrace();
             return "fail";
         }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinRefundsStatusServiceImpl.java

@@ -102,7 +102,7 @@ public class KylinRefundsStatusServiceImpl {
 
         LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
         for (String v : ticketEntityIds) {
-            Object[] objectB = ObjectUtil.cloneObjectsArray();
+            Object[] objectB = ObjectUtil.cloneObjectsArray(5);
             objectB[0] = entitiesTable.getIsPayment();
             objectB[1] = entitiesTable.getUpdatedAt();
             objectB[2] = v;
@@ -159,7 +159,7 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefundEntities.setRefundPrice(entitiesPrice.get(i));
             kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i));
 
-            Object[] objectD = ObjectUtil.cloneObjectsArray();
+            Object[] objectD = ObjectUtil.cloneObjectsArray(5);
             objectD[0] = kylinOrderRefundEntities.getOrderRefundsEntitiesId();
             objectD[1] = kylinOrderRefundEntities.getOrderRefundsId();
             objectD[2] = kylinOrderRefundEntities.getRefundPrice();
@@ -184,7 +184,7 @@ public class KylinRefundsStatusServiceImpl {
         sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
         sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
 
-        Object[] objectE = ObjectUtil.cloneObjectsArray();
+        Object[] objectE = ObjectUtil.cloneObjectsArray(5);
         objectE[0] = paymentId;
         objectE[1] = orderStatusTable.getUpdatedAt();
         objectE[2] = orderInfo.getOrderTicketsId();
@@ -192,7 +192,7 @@ public class KylinRefundsStatusServiceImpl {
         objectE[4] = orderInfo.getChangeDate();
         sqlsDataE.add(objectE);
 
-        Object[] objectA = ObjectUtil.cloneObjectsArray();
+        Object[] objectA = ObjectUtil.cloneObjectsArray(5);
         objectA[0] = orderStatusTable.getStatus();
         objectA[1] = orderStatusTable.getUpdatedAt();
         objectA[2] = orderInfo.getOrderTicketsId();
@@ -200,7 +200,7 @@ public class KylinRefundsStatusServiceImpl {
         objectA[4] = orderInfo.getChangeDate();
         sqlsDataA.add(objectA);
 
-        Object[] objectC = ObjectUtil.cloneObjectsArray();
+        Object[] objectC = ObjectUtil.cloneObjectsArray(13);
         objectC[0] = kylinOrderRefunds.getOrderRefundsId();
         objectC[1] = kylinOrderRefunds.getOrderTicketsId();
         objectC[2] = kylinOrderRefunds.getOrderRefundCode();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/ObjectUtil.java

@@ -33,7 +33,7 @@ public class ObjectUtil {
     private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
-    public static final Object[] objectsArray = new Object[100];
+    public static Object[] objectsArray;
     public static final Integer[] integerArray2 = new Integer[2];
 
     public static LinkedList<Object[]> cloneLinkedListObj() {
@@ -72,8 +72,9 @@ public class ObjectUtil {
         return linkedMultiValueMapStringAndString.clone();
     }
 
-    public static Object[] cloneObjectsArray() {
-        return objectsArray.clone();
+    public static Object[] cloneObjectsArray(int size) {
+        objectsArray = new Object[size];
+        return objectsArray;
     }
 
     public static Integer[] cloneInteger2Array() {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinBuyNoticePartnerServiceImpl.java

 package com.liquidnet.service.platform.service.impl.partner;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -34,11 +35,11 @@ public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNotice
         PageInfo<KylinBuyNoticeVo> pageInfoTmp = null;
 
         PageHelper.startPage(1, 20);
-        List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().eq("status", 1).orderByDesc("sort").orderByDesc("mid"));
+        List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(Wrappers.lambdaQuery(KylinBuyNotice.class).eq(KylinBuyNotice::getStatus, 1).orderByDesc(KylinBuyNotice::getSort).orderByDesc(KylinBuyNotice::getMid));
 
         List<KylinBuyNoticeVo> kylinBuyNoticeVoList = new ArrayList<>();
         for (KylinBuyNotice item : buyNoticeList) {
-            KylinBuyNoticeVo kylinBuyNoticeVo = new KylinBuyNoticeVo();
+            KylinBuyNoticeVo kylinBuyNoticeVo = KylinBuyNoticeVo.getNew();
             BeanUtils.copyProperties(item, kylinBuyNoticeVo);
             kylinBuyNoticeVoList.add(kylinBuyNoticeVo);
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinCheckUserPartnerServiceImpl.java

 package com.liquidnet.service.platform.service.impl.partner;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -14,6 +16,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser;
 import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
 import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
 import com.liquidnet.service.platform.utils.DataUtils;
+import com.liquidnet.service.platform.utils.ObjectUtil;
 import com.mongodb.BasicDBObject;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,18 +67,14 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     @Override
     public ResponseDto<String> del(String merchantId, String checkUserId) {
         try {
-            KylinCheckUser checkUser = new KylinCheckUser();
+            KylinCheckUser checkUser = KylinCheckUser.getNew();
             checkUser.setUpdatedAt(LocalDateTime.now());
             checkUser.setStatus(0);
-            checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId));
+            checkUserMapper.update(checkUser, Wrappers.lambdaUpdate(KylinCheckUser.class).eq(KylinCheckUser::getCheckUserId, checkUserId));
             dataUtils.delCheckUserRedis(checkUserId);
 
-            HashMap<String, Object> map = new HashMap<>();
+            HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
             map.put("status", 0);
-//            BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-//            mongoTemplate.getCollection(CheckUserVo.class.getSimpleName()).updateOne(
-//                    Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
-//                    obj
             mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserVo.class, KylinCheckUserVo.class.getSimpleName());
             return ResponseDto.success("删除成功");
         } catch (Exception e) {
@@ -86,7 +85,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     @Override
     public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
         try {
-            KylinCheckUser checkUser = new KylinCheckUser();
+            KylinCheckUser checkUser = KylinCheckUser.getNew();
             checkUser.setName(name);
             checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
             checkUser.setMobile(mobile);
@@ -96,7 +95,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
             checkUser.setStatus(1);
             checkUserMapper.insert(checkUser);
 
-            KylinCheckUserVo kylinCheckUserVo = new KylinCheckUserVo();
+            KylinCheckUserVo kylinCheckUserVo = KylinCheckUserVo.getNew();
             BeanUtils.copyProperties(checkUser, kylinCheckUserVo);
             mongoTemplate.insert(kylinCheckUserVo, KylinCheckUserVo.class.getSimpleName());
 
@@ -109,15 +108,15 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     @Override
     public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
         try {
-            KylinCheckUser checkUser = new KylinCheckUser();
+            KylinCheckUser checkUser = KylinCheckUser.getNew();
             checkUser.setName(name);
-            if(null!=pwd) {
+            if (null != pwd) {
                 checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
             }
             checkUser.setMobile(mobile);
             checkUser.setUpdatedAt(LocalDateTime.now());
-            checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId).eq("merchant_id", merchantId));
-            BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(checkUser));
+            checkUserMapper.update(checkUser, Wrappers.lambdaUpdate(KylinCheckUser.class).eq(KylinCheckUser::getCheckUserId, checkUserId).eq(KylinCheckUser::getMerchantId, merchantId));
+            BasicDBObject obj = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(checkUser));
             mongoTemplate.getCollection(KylinCheckUserVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
                     obj

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinCheckUserPerformancesPartnerServiceImpl.java

 package com.liquidnet.service.platform.service.impl.partner;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -79,7 +80,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
                 if (null == item.getCanDownTime()) {
                     return ResponseDto.failure(ErrorMapping.get(20101));
                 }
-                KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
+                KylinCheckUserPerformances checkUserPerformances = KylinCheckUserPerformances.getNew();
                 checkUserPerformances.setCheckUserId(param.getCheckUserId());
                 checkUserPerformances.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(item.getCanDownTime()));
                 checkUserPerformances.setPerformanceId(item.getPerformanceId());
@@ -90,11 +91,11 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
             }
             mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(param.getCheckUserId())), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
 
-            KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
+            KylinCheckUserPerformanceVo userPerformanceVo = KylinCheckUserPerformanceVo.getNew();
             List<CheckPerformanceRelationParam> performanceRelationParamsList = new ArrayList<>();
-            List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", param.getCheckUserId()));
+            List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(Wrappers.lambdaQuery(KylinCheckUserPerformances.class).eq(KylinCheckUserPerformances::getCheckUserId, param.getCheckUserId()));
             for (KylinCheckUserPerformances item : data) {
-                CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
+                CheckPerformanceRelationParam performanceRelationParam = CheckPerformanceRelationParam.getNew();
                 performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 performanceRelationParam.setPerformanceId(item.getPerformanceId());
                 performanceRelationParamsList.add(performanceRelationParam);
@@ -115,15 +116,15 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
     public ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId) {
         try {
             for (String performanceId : performanceIds) {
-                checkUserPerformancesMapper.delete(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", checkUserId).eq("performance_id", performanceId));
+                checkUserPerformancesMapper.delete(Wrappers.lambdaUpdate(KylinCheckUserPerformances.class).eq(KylinCheckUserPerformances::getCheckUserId, checkUserId).eq(KylinCheckUserPerformances::getPerformanceId, performanceId));
             }
             mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
 
-            KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
+            KylinCheckUserPerformanceVo userPerformanceVo = KylinCheckUserPerformanceVo.getNew();
             List<CheckPerformanceRelationParam> performanceRelationParamsList = new ArrayList<>();
-            List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", checkUserId));
+            List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(Wrappers.lambdaUpdate(KylinCheckUserPerformances.class).eq(KylinCheckUserPerformances::getCheckUserId, checkUserId));
             for (KylinCheckUserPerformances item : data) {
-                CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
+                CheckPerformanceRelationParam performanceRelationParam = CheckPerformanceRelationParam.getNew();
                 performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 performanceRelationParam.setPerformanceId(item.getPerformanceId());
                 performanceRelationParamsList.add(performanceRelationParam);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.service.impl.partner;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -16,6 +17,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketTimeRelationMapper;
 import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
+import com.liquidnet.service.platform.utils.ObjectUtil;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
@@ -63,7 +65,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
         ResponseDto<KylinTicketTimesPartnerVo> ticketTimesPartnerVo = null;
         //获取演出状态
         KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
-                new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId()));
+                Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId()));
         if (null == performanceStatus) {
             ticketTimesPartnerVo = createTimes(createTicketTimesParam);
         } else if(performanceStatus.getAuditStatus()==0){
@@ -80,7 +82,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     public ResponseDto<KylinTicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam) {
         try {
             // 获取 主键id
-            String ticketTimesId = IDGenerator.nextSnowId().toString();
+            String ticketTimesId = IDGenerator.nextSnowId();
             // 获取 当前时间 -> 创建时间
             LocalDateTime createdAt = LocalDateTime.now();
             // 标题
@@ -97,7 +99,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
                 title = useStart + "-" + useEnd;
             }
             // mongo 操作
-            KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
+            KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
             kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
             kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             if(createTicketTimesParam.getType() == 2) {
@@ -141,7 +143,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             }
 
             // mongo 操作
-            KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
+            KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
             kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
             kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -169,24 +171,23 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
                 return ResponseDto.failure(ErrorMapping.get(20106));
             }
             KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
-                    new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimesId));
+                    Wrappers.lambdaQuery(KylinTicketTimeRelation.class).eq(KylinTicketTimeRelation::getTimesId, ticketTimesId));
             if (ticketTimeRelation != null) {
                 KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
-                        new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", ticketTimeRelation.getPerformanceId()));
+                        Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, ticketTimeRelation.getPerformanceId()));
                 if(performanceStatus.getAuditStatus()==0){
                     return ResponseDto.failure(ErrorMapping.get(20101));
                 }
 
                 if (performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝
-                    HashMap<String, Object> map = new HashMap<>();
+                    HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
                     map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     map.put("status", 0);
 
-                    BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                    Document doc = mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
+                    BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
+                    mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
                             Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(),
-                            object,
-                            new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                            object
                     );
                     return ResponseDto.success("删除成功");
                 } else {
@@ -214,7 +215,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             createTicketTimesParam.setTitle(title);
 
             // mongo 操作
-            KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
+            KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
             BeanUtils.copyProperties(createTicketTimesParam, kylinTicketTimesPartnerVo);
             kylinTicketTimesPartnerVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
             kylinTicketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
@@ -222,7 +223,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
             kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             kylinTicketTimesPartnerVo.setStatus(null);
 
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinTicketTimesPartnerVo)));
+            BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinTicketTimesPartnerVo)));
             Document doc = mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("ticketTimesId").is(createTicketTimesParam.getTicketTimesId())).getQueryObject(),
                     object,

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java

+package com.liquidnet.service.platform.utils;
+
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.mongodb.BasicDBObject;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: ObjectUtil
+ * @Package com.liquidnet.service.dragon.utils
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/21 16:00
+ */
+@Component
+public class ObjectUtil {
+    private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
+    private static final BasicDBObject basicDBObject = new BasicDBObject();
+
+    public static HashMap<String, Object> cloneHashMapStringAndObject() {
+        return (HashMap<String, Object>) hashMapStringAndObject.clone();
+    }
+
+    public static BasicDBObject cloneBasicDBObject() {
+        return (BasicDBObject) basicDBObject.clone();
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/pom.xml

@@ -54,4 +54,13 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 </project>