记得上下班打卡 | git大法好,push需谨慎

Commit 04ed1b8b authored by anjiabin's avatar anjiabin

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

parents 87396466 ee98e829
package com.liquidnet.service.kylin.dto.param; package com.liquidnet.service.kylin.dto.param;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@Data @Data
public class CheckPerformanceRelationParam { public class CheckPerformanceRelationParam implements Cloneable {
@ApiModelProperty(value = "演出id") @ApiModelProperty(value = "演出id")
@NotNull(message = "演出ID不能为空") @NotNull(message = "演出ID不能为空")
private String performanceId; private String performanceId;
@ApiModelProperty(value = "可下载时间") @ApiModelProperty(value = "可下载时间")
@NotNull(message = "可下载时间不能为空") @NotNull(message = "可下载时间不能为空")
private String canDownTime; 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();
}
}
} }
package com.liquidnet.service.kylin.dto.param; package com.liquidnet.service.kylin.dto.param;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -8,7 +9,7 @@ import java.io.Serializable; ...@@ -8,7 +9,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
@Data @Data
public class PerformancePartnerVo implements Serializable { public class PerformancePartnerVo implements Serializable,Cloneable {
@ApiModelProperty(value = "演出id", example = "") @ApiModelProperty(value = "演出id", example = "")
@JsonIgnore @JsonIgnore
...@@ -112,4 +113,13 @@ public class PerformancePartnerVo implements Serializable { ...@@ -112,4 +113,13 @@ public class PerformancePartnerVo implements Serializable {
@ApiModelProperty(value = "是否保存", example = "") @ApiModelProperty(value = "是否保存", example = "")
private Integer isCreateSave; 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();
}
}
} }
...@@ -9,7 +9,7 @@ import java.io.Serializable; ...@@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
@Data @Data
public class PerformanceStep2Param implements Serializable { public class PerformanceStep2Param implements Serializable,Cloneable {
@ApiModelProperty(value = "演出id", example = "") @ApiModelProperty(value = "演出id", example = "")
@NotNull(message = "不能为空") @NotNull(message = "不能为空")
...@@ -35,4 +35,13 @@ public class PerformanceStep2Param implements Serializable { ...@@ -35,4 +35,13 @@ public class PerformanceStep2Param implements Serializable {
@ApiModelProperty(value = "场次数据",hidden = true) @ApiModelProperty(value = "场次数据",hidden = true)
private List<TicketTimesTicketCreatePartnerVo> ticketTimes; 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();
}
}
} }
package com.liquidnet.service.kylin.dto.vo; package com.liquidnet.service.kylin.dto.vo;
import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -15,7 +16,7 @@ import java.math.BigDecimal; ...@@ -15,7 +16,7 @@ import java.math.BigDecimal;
* @date 2021/6/19 16:44 * @date 2021/6/19 16:44
*/ */
@Data @Data
public class PerformanceOrderStatisticalVo { public class PerformanceOrderStatisticalVo implements Cloneable {
private String performancesId; private String performancesId;
private String ticketsId; private String ticketsId;
@ApiModelProperty(value = "票种名称") @ApiModelProperty(value = "票种名称")
...@@ -48,4 +49,13 @@ public class PerformanceOrderStatisticalVo { ...@@ -48,4 +49,13 @@ public class PerformanceOrderStatisticalVo {
private BigDecimal totalPayingNumber = BigDecimal.ZERO; private BigDecimal totalPayingNumber = BigDecimal.ZERO;
@ApiModelProperty(value = "购买人数") @ApiModelProperty(value = "购买人数")
private BigDecimal totalBuyUsers = BigDecimal.ZERO; 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();
}
}
} }
package com.liquidnet.service.kylin.dto.vo.middle; package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import lombok.Data; import lombok.Data;
@Data @Data
public class KylinBuyNoticeVo { public class KylinBuyNoticeVo implements Cloneable {
private String buyNoticeId; private String buyNoticeId;
...@@ -14,4 +15,13 @@ public class KylinBuyNoticeVo { ...@@ -14,4 +15,13 @@ public class KylinBuyNoticeVo {
private String message; private String message;
private Integer sort; 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();
}
}
} }
...@@ -10,10 +10,19 @@ import java.util.List; ...@@ -10,10 +10,19 @@ import java.util.List;
@Data @Data
@ApiModel @ApiModel
public class KylinCheckUserPerformanceVo implements Serializable { public class KylinCheckUserPerformanceVo implements Serializable,Cloneable {
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private String checkUserId; private String checkUserId;
@ApiModelProperty(value = "演出id数组") @ApiModelProperty(value = "演出id数组")
private List<CheckPerformanceRelationParam> relationParams; 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();
}
}
} }
package com.liquidnet.service.kylin.dto.vo.mongo; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -8,7 +9,7 @@ import java.io.Serializable; ...@@ -8,7 +9,7 @@ import java.io.Serializable;
@Data @Data
@ApiModel @ApiModel
public class KylinCheckUserVo implements Serializable { public class KylinCheckUserVo implements Serializable ,Cloneable{
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private String checkUserId; private String checkUserId;
...@@ -28,4 +29,12 @@ public class KylinCheckUserVo implements Serializable { ...@@ -28,4 +29,12 @@ public class KylinCheckUserVo implements Serializable {
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
private String status; 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();
}
}
} }
package com.liquidnet.service.kylin.dto.vo.partner; package com.liquidnet.service.kylin.dto.vo.partner;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo; import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@Data @Data
public class KylinPerformancePartnerListVo { public class KylinPerformancePartnerListVo implements Cloneable{
//演出数据 //演出数据
@ApiModelProperty(value = "主键id") @ApiModelProperty(value = "主键id")
...@@ -47,4 +48,13 @@ public class KylinPerformancePartnerListVo { ...@@ -47,4 +48,13 @@ public class KylinPerformancePartnerListVo {
this.rejectTxt=""; this.rejectTxt="";
this.createdAt=item.getCreatedAt(); 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();
}
}
} }
...@@ -11,7 +11,7 @@ import java.math.BigDecimal; ...@@ -11,7 +11,7 @@ import java.math.BigDecimal;
* 修改场地全部显示数据参数 * 修改场地全部显示数据参数
*/ */
@Data @Data
public class KylinTicketPartnerVo implements Serializable { public class KylinTicketPartnerVo implements Serializable,Cloneable {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String ticketsId; private String ticketsId;
...@@ -116,4 +116,13 @@ public class KylinTicketPartnerVo implements Serializable { ...@@ -116,4 +116,13 @@ public class KylinTicketPartnerVo implements Serializable {
this.setSurplusExchange(this.getTotalExchange()); this.setSurplusExchange(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalGeneral()); 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();
}
}
} }
package com.liquidnet.service.kylin.dto.vo.partner; package com.liquidnet.service.kylin.dto.vo.partner;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -8,7 +9,7 @@ import java.io.Serializable; ...@@ -8,7 +9,7 @@ import java.io.Serializable;
//返回 //返回
@Data @Data
public class KylinTicketTimesPartnerVo implements Serializable { public class KylinTicketTimesPartnerVo implements Serializable ,Cloneable{
@ApiModelProperty(value = "主键id") @ApiModelProperty(value = "主键id")
private String ticketTimesId; private String ticketTimesId;
...@@ -39,4 +40,13 @@ public class KylinTicketTimesPartnerVo implements Serializable { ...@@ -39,4 +40,13 @@ public class KylinTicketTimesPartnerVo implements Serializable {
@ApiModelProperty(value = "修改时间") @ApiModelProperty(value = "修改时间")
private String updatedAt; 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();
}
}
} }
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
//包含 票 //包含 票
@Data @Data
public class TicketTimesTicketCreatePartnerVo implements Serializable { public class TicketTimesTicketCreatePartnerVo implements Serializable ,Cloneable{
@ApiModelProperty(value = "主键id") @ApiModelProperty(value = "主键id")
private String ticketTimesId; private String ticketTimesId;
...@@ -40,4 +40,13 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable { ...@@ -40,4 +40,13 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
//票 //票
@ApiModelProperty(value = "票数据") @ApiModelProperty(value = "票数据")
private List<KylinTicketPartnerVo> ticket; 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();
}
}
} }
package com.liquidnet.service.kylin.dto.vo.returns; package com.liquidnet.service.kylin.dto.vo.returns;
import com.liquidnet.service.kylin.entity.KylinBannersRelations;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
public class KylinOrderListVo implements Serializable { public class KylinOrderListVo implements Serializable,Cloneable {
private static final long serialVersionUID = 6554829077875538374L; private static final long serialVersionUID = 6554829077875538374L;
private String orderTicketsId; private String orderTicketsId;
private String performanceId; private String performanceId;
...@@ -25,4 +26,13 @@ public class KylinOrderListVo implements Serializable { ...@@ -25,4 +26,13 @@ public class KylinOrderListVo implements Serializable {
private Integer expressStatus; private Integer expressStatus;
private String getTicketType; private String getTicketType;
private String createdAt; private String createdAt;
private static final KylinOrderListVo obj = new KylinOrderListVo();
public static KylinOrderListVo getNew() {
try {
return (KylinOrderListVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderListVo();
}
}
} }
...@@ -103,6 +103,16 @@ liquidnet: ...@@ -103,6 +103,16 @@ liquidnet:
service: service:
appid: wx3498304dda39c5a1 appid: wx3498304dda39c5a1
secret: a1307fab0a5f2380086a7c636f7339ea secret: a1307fab0a5f2380086a7c636f7339ea
applet:
strawberry:
appid: wx08b852ade69f8019
secret: 0aac285fd1fbc6aa4e562b7ad81de392
five:
appid: wxb5371c8c95226957
secret: a6a909ae1ab25a79d4addd154eafbb7e
mdsk:
appid: wxc278ddf30f515188
secret: 21c0daa5d7d323f86c70c29db3c0613b
umeng: umeng:
ios: ios:
appkey: 54fe819bfd98c546b50004f0 appkey: 54fe819bfd98c546b50004f0
......
...@@ -103,6 +103,16 @@ liquidnet: ...@@ -103,6 +103,16 @@ liquidnet:
service: service:
appid: wx3498304dda39c5a1 appid: wx3498304dda39c5a1
secret: a1307fab0a5f2380086a7c636f7339ea secret: a1307fab0a5f2380086a7c636f7339ea
applet:
strawberry:
appid: wx08b852ade69f8019
secret: 0aac285fd1fbc6aa4e562b7ad81de392
five:
appid: wxb5371c8c95226957
secret: a6a909ae1ab25a79d4addd154eafbb7e
mdsk:
appid: wxc278ddf30f515188
secret: 21c0daa5d7d323f86c70c29db3c0613b
umeng: umeng:
ios: ios:
appkey: 54fe819bfd98c546b50004f0 appkey: 54fe819bfd98c546b50004f0
......
...@@ -69,6 +69,8 @@ spring: ...@@ -69,6 +69,8 @@ spring:
max-request-size: 10MB max-request-size: 10MB
profiles: profiles:
include: common-service #这里加载management相关公共配置 include: common-service #这里加载management相关公共配置
autoconfigure:
exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
rabbitmq: rabbitmq:
addresses: ${liquidnet.rabbitmq.host} addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port} port: ${liquidnet.rabbitmq.port}
...@@ -114,26 +116,6 @@ spring: ...@@ -114,26 +116,6 @@ spring:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100 uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled} sslEnabled: ${liquidnet.mongodb.sslEnabled}
database: ${liquidnet.mongodb.database} database: ${liquidnet.mongodb.database}
datasource:
name: ${liquidnet.mysql.database-name}
url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false
username: ${liquidnet.mysql.username}
password: ${liquidnet.mysql.password}
# type: org.apache.tomcat.jdbc.pool.DataSource
driver-class-name: com.mysql.cj.jdbc.Driver
filters: stat
maxActive: 20
initialSize: 1
maxWait: 60000
minIdle: 1
timeBetweenEvictionRunsMillis: 60000
minEvictableIdleTimeMillis: 300000
validationQuery: select 'x'
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
poolPreparedStatements: true
maxOpenPreparedStatements: 20
# ----------------------------------------------------------- # -----------------------------------------------------------
# ----------------------------------------------------------- # -----------------------------------------------------------
......
...@@ -69,6 +69,9 @@ spring: ...@@ -69,6 +69,9 @@ spring:
max-request-size: 10MB max-request-size: 10MB
profiles: profiles:
include: common-service #这里加载management相关公共配置 include: common-service #这里加载management相关公共配置
autoconfigure:
exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
rabbitmq: rabbitmq:
addresses: ${liquidnet.rabbitmq.host} addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port} port: ${liquidnet.rabbitmq.port}
......
...@@ -69,6 +69,8 @@ spring: ...@@ -69,6 +69,8 @@ spring:
max-request-size: 10MB max-request-size: 10MB
profiles: profiles:
include: common-service #这里加载management相关公共配置 include: common-service #这里加载management相关公共配置
autoconfigure:
exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
rabbitmq: rabbitmq:
addresses: ${liquidnet.rabbitmq.host} addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port} port: ${liquidnet.rabbitmq.port}
......
...@@ -15,7 +15,7 @@ import java.time.LocalDateTime; ...@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* @date 2021/6/3 16:39 * @date 2021/6/3 16:39
*/ */
@Data @Data
public class PerformanceOrderStatisticalDao { public class PerformanceOrderStatisticalDao implements Cloneable{
private String performancesId; private String performancesId;
private String ticketsId; private String ticketsId;
private String title; private String title;
...@@ -33,4 +33,13 @@ public class PerformanceOrderStatisticalDao { ...@@ -33,4 +33,13 @@ public class PerformanceOrderStatisticalDao {
private BigDecimal totalMemberNumber = BigDecimal.ZERO; private BigDecimal totalMemberNumber = BigDecimal.ZERO;
private BigDecimal totalPayingNumber = BigDecimal.ZERO; private BigDecimal totalPayingNumber = BigDecimal.ZERO;
private BigDecimal totalBuyUsers = 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();
}
}
} }
package com.liquidnet.service.adam.util; package com.liquidnet.service.adam.util;
import com.liquidnet.commons.lang.util.CollectionUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.connection.stream.StreamRecords;
...@@ -34,7 +35,7 @@ public class QueueUtils { ...@@ -34,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串 * @param jsonMsg Json字符串
*/ */
public void sendMsgByRedis(String streamKey, String jsonMsg) { public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg); map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey)); stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
} }
......
package com.liquidnet.service.kylin.utils; package com.liquidnet.service.kylin.utils;
import com.liquidnet.commons.lang.util.CollectionUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.connection.stream.StreamRecords;
...@@ -34,7 +35,7 @@ public class QueueUtils { ...@@ -34,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串 * @param jsonMsg Json字符串
*/ */
public void sendMsgByRedis(String streamKey, String jsonMsg) { public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg); map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey)); stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
} }
......
...@@ -38,9 +38,4 @@ public class ServiceOrderApplication implements CommandLineRunner { ...@@ -38,9 +38,4 @@ public class ServiceOrderApplication implements CommandLineRunner {
e.printStackTrace(); e.printStackTrace();
} }
} }
// @Bean
// MongoTransactionManager transactionManager(MongoDbFactory factory){
// return new MongoTransactionManager(factory);
// }
} }
...@@ -10,6 +10,7 @@ import com.liquidnet.service.kylin.dto.param.PayOrderParam; ...@@ -10,6 +10,7 @@ import com.liquidnet.service.kylin.dto.param.PayOrderParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam; import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.returns.*; import com.liquidnet.service.kylin.dto.vo.returns.*;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService; import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
import com.liquidnet.service.order.utils.ObjectUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponse;
...@@ -81,7 +82,7 @@ public class KylinOrderTicketsController { ...@@ -81,7 +82,7 @@ public class KylinOrderTicketsController {
if (null == status) { if (null == status) {
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
} else { } else {
HashMap<String, Integer> map = new HashMap<>(); HashMap<String, Integer> map = ObjectUtil.cloneHashMapStringAndInteger();
map.put("status", status); map.put("status", status);
return ResponseDto.success(map); return ResponseDto.success(map);
} }
......
...@@ -683,7 +683,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -683,7 +683,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime)); sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime));
sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain")); sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain"));
LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
Object[] objectB= ObjectUtil.cloneObjectsArray(); Object[] objectB= ObjectUtil.cloneObjectsArray(4);
objectB[0]= orderTickets.getUpdatedAt(); objectB[0]= orderTickets.getUpdatedAt();
objectB[1]= orderTickets.getOrderTicketsId(); objectB[1]= orderTickets.getOrderTicketsId();
objectB[2]= strTime; objectB[2]= strTime;
...@@ -691,7 +691,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -691,7 +691,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataB.add(objectB); sqlsDataB.add(objectB);
sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain")); sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
Object[] objectC = ObjectUtil.cloneObjectsArray(); Object[] objectC = ObjectUtil.cloneObjectsArray(4);
objectC[0]= orderTickets.getUpdatedAt(); objectC[0]= orderTickets.getUpdatedAt();
objectC[1]= orderTickets.getOrderTicketsId(); objectC[1]= orderTickets.getOrderTicketsId();
objectC[2]= strTime; objectC[2]= strTime;
...@@ -699,7 +699,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -699,7 +699,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataC.add(objectC); sqlsDataC.add(objectC);
sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain")); sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain"));
LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj();
Object[] objectD = ObjectUtil.cloneObjectsArray(); Object[] objectD = ObjectUtil.cloneObjectsArray(4);
objectD[0]= orderTickets.getUpdatedAt(); objectD[0]= orderTickets.getUpdatedAt();
objectD[1]= orderTickets.getOrderTicketsId(); objectD[1]= orderTickets.getOrderTicketsId();
objectD[2]= strTime; objectD[2]= strTime;
...@@ -727,6 +727,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -727,6 +727,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String lock = "order_lock:" + syncOrderParam.getOrderCode(); String lock = "order_lock:" + syncOrderParam.getOrderCode();
if (!redisLockUtil.tryLock(lock, 1, 5)) { if (!redisLockUtil.tryLock(lock, 1, 5)) {
log.error("参数错误");
return "fail";//参数错误 return "fail";//参数错误
} }
...@@ -734,23 +735,27 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -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()); KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrderCode())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
if (orderTicketData == null) { if (orderTicketData == null) {
redisLockUtil.unlock(lock); redisLockUtil.unlock(lock);
log.error("订单不存在");
return "fail";//订单不存在 return "fail";//订单不存在
} }
if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) { if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) { if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
redisLockUtil.unlock(lock); redisLockUtil.unlock(lock);
log.error("已经支付");
return "success";//已经支付 return "success";//已经支付
} }
if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) { if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) {
redisLockUtil.unlock(lock); redisLockUtil.unlock(lock);
log.error("重复支付");
return "fail";//重复支付 return "fail";//重复支付
} }
} }
if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) { if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
redisLockUtil.unlock(lock); redisLockUtil.unlock(lock);
log.error("价格不符");
return "fail";//价格不符 return "fail";//价格不符
} }
...@@ -773,6 +778,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -773,6 +778,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) { } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode()); log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
} else { } else {
log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId()); orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
orderTickets.setPaymentType(syncOrderParam.getPaymentType()); orderTickets.setPaymentType(syncOrderParam.getPaymentType());
orderTickets.setPayCode(syncOrderParam.getCode()); orderTickets.setPayCode(syncOrderParam.getCode());
...@@ -791,7 +797,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -791,7 +797,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime)); sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay")); sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
Object[] objectC = ObjectUtil.cloneObjectsArray(); Object[] objectC = ObjectUtil.cloneObjectsArray(4);
objectC[0]= orderTickets.getUpdatedAt(); objectC[0]= orderTickets.getUpdatedAt();
objectC[1]= orderTickets.getOrderTicketsId(); objectC[1]= orderTickets.getOrderTicketsId();
objectC[2]= strTime; objectC[2]= strTime;
...@@ -883,7 +889,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -883,7 +889,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, "")); log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
return "success"; return "success";
} catch (Exception e) { } catch (Exception e) {
log.error("SYNCE ORDER E = " + e.getMessage()); log.error("SYNCE ORDER E = " , e);
e.printStackTrace(); e.printStackTrace();
return "fail"; return "fail";
} }
......
...@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl {
public Boolean orderTicketRefunding( public Boolean orderTicketRefunding(
KylinOrderTicketVo orderInfo, String orderTicketsId, KylinOrderTicketVo orderInfo, String orderTicketsId,
BigDecimal RefundPriceExpress, BigDecimal RefundPriceExpress,
List<String> ticketEntityIds, List<BigDecimal> entitiesPrice,String paymentId List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId
) { ) {
if (CollectionUtil.isEmpty(ticketEntityIds)) { if (CollectionUtil.isEmpty(ticketEntityIds)) {
return false; return false;
...@@ -81,7 +81,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -81,7 +81,7 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew(); KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3); kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3);
kylinOrderTicketVo.setUpdatedAt(nowTimeStr); kylinOrderTicketVo.setUpdatedAt(nowTimeStr);
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo))); BasicDBObject orderObject = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(), Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
orderObject orderObject
...@@ -98,11 +98,11 @@ public class KylinRefundsStatusServiceImpl { ...@@ -98,11 +98,11 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew(); KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2); kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr); kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo))); BasicDBObject entitiesObject = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
for (String v : ticketEntityIds) { for (String v : ticketEntityIds) {
Object[] objectB = ObjectUtil.cloneObjectsArray(); Object[] objectB = ObjectUtil.cloneObjectsArray(5);
objectB[0] = entitiesTable.getIsPayment(); objectB[0] = entitiesTable.getIsPayment();
objectB[1] = entitiesTable.getUpdatedAt(); objectB[1] = entitiesTable.getUpdatedAt();
objectB[2] = v; objectB[2] = v;
...@@ -159,12 +159,12 @@ public class KylinRefundsStatusServiceImpl { ...@@ -159,12 +159,12 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefundEntities.setRefundPrice(entitiesPrice.get(i)); kylinOrderRefundEntities.setRefundPrice(entitiesPrice.get(i));
kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i)); kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i));
Object[] objectD = ObjectUtil.cloneObjectsArray(); Object[] objectD = ObjectUtil.cloneObjectsArray(5);
objectD[0]=kylinOrderRefundEntities.getOrderRefundsEntitiesId(); objectD[0] = kylinOrderRefundEntities.getOrderRefundsEntitiesId();
objectD[1]=kylinOrderRefundEntities.getOrderRefundsId(); objectD[1] = kylinOrderRefundEntities.getOrderRefundsId();
objectD[2]=kylinOrderRefundEntities.getRefundPrice(); objectD[2] = kylinOrderRefundEntities.getRefundPrice();
objectD[3]=kylinOrderRefundEntities.getOrderTicketEntitiesId(); objectD[3] = kylinOrderRefundEntities.getOrderTicketEntitiesId();
objectD[4]=kylinOrderRefundEntities.getCreatedAt(); objectD[4] = kylinOrderRefundEntities.getCreatedAt();
sqlsDataD.add(objectD); sqlsDataD.add(objectD);
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew(); KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew();
...@@ -184,40 +184,40 @@ public class KylinRefundsStatusServiceImpl { ...@@ -184,40 +184,40 @@ public class KylinRefundsStatusServiceImpl {
sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund")); sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund")); sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
Object[] objectE = ObjectUtil.cloneObjectsArray(); Object[] objectE = ObjectUtil.cloneObjectsArray(5);
objectE[0]=paymentId; objectE[0] = paymentId;
objectE[1]=orderStatusTable.getUpdatedAt(); objectE[1] = orderStatusTable.getUpdatedAt();
objectE[2]=orderInfo.getOrderTicketsId(); objectE[2] = orderInfo.getOrderTicketsId();
objectE[3]=orderInfo.getChangeDate(); objectE[3] = orderInfo.getChangeDate();
objectE[4]=orderInfo.getChangeDate(); objectE[4] = orderInfo.getChangeDate();
sqlsDataE.add(objectE); sqlsDataE.add(objectE);
Object[] objectA = ObjectUtil.cloneObjectsArray(); Object[] objectA = ObjectUtil.cloneObjectsArray(5);
objectA[0]=orderStatusTable.getStatus(); objectA[0] = orderStatusTable.getStatus();
objectA[1]=orderStatusTable.getUpdatedAt(); objectA[1] = orderStatusTable.getUpdatedAt();
objectA[2]=orderInfo.getOrderTicketsId(); objectA[2] = orderInfo.getOrderTicketsId();
objectA[3]=orderInfo.getChangeDate(); objectA[3] = orderInfo.getChangeDate();
objectA[4]=orderInfo.getChangeDate(); objectA[4] = orderInfo.getChangeDate();
sqlsDataA.add(objectA); sqlsDataA.add(objectA);
Object[] objectC = ObjectUtil.cloneObjectsArray(); Object[] objectC = ObjectUtil.cloneObjectsArray(13);
objectC[0]=kylinOrderRefunds.getOrderRefundsId(); objectC[0] = kylinOrderRefunds.getOrderRefundsId();
objectC[1]=kylinOrderRefunds.getOrderTicketsId(); objectC[1] = kylinOrderRefunds.getOrderTicketsId();
objectC[2]= kylinOrderRefunds.getOrderRefundCode(); objectC[2] = kylinOrderRefunds.getOrderRefundCode();
objectC[3]=kylinOrderRefunds.getPrice(); objectC[3] = kylinOrderRefunds.getPrice();
objectC[4]=kylinOrderRefunds.getPriceExpress(); objectC[4] = kylinOrderRefunds.getPriceExpress();
objectC[5]=kylinOrderRefunds.getStatus(); objectC[5] = kylinOrderRefunds.getStatus();
objectC[6]=kylinOrderRefunds.getType(); objectC[6] = kylinOrderRefunds.getType();
objectC[7]=kylinOrderRefunds.getApplicantId(); objectC[7] = kylinOrderRefunds.getApplicantId();
objectC[8]=kylinOrderRefunds.getApplicantName(); objectC[8] = kylinOrderRefunds.getApplicantName();
objectC[9]=kylinOrderRefunds.getApplicantAt(); objectC[9] = kylinOrderRefunds.getApplicantAt();
objectC[10]=kylinOrderRefunds.getReason(); objectC[10] = kylinOrderRefunds.getReason();
objectC[11]=kylinOrderRefunds.getRefundCate(); objectC[11] = kylinOrderRefunds.getRefundCate();
objectC[12]=kylinOrderRefunds.getCreatedAt(); objectC[12] = kylinOrderRefunds.getCreatedAt();
sqlsDataC.add(objectC); sqlsDataC.add(objectC);
queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_OVERTIME_REFUND.getKey(), queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_OVERTIME_REFUND.getKey(),
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD,sqlsDataE)); SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
return true; return true;
} }
......
...@@ -108,7 +108,7 @@ public class DataUtils { ...@@ -108,7 +108,7 @@ public class DataUtils {
HashMap<String, ArrayList<String>> allTicketId = new HashMap<>(); HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
for (int x = 0; x < vo.getTicketTimeList().size(); x++) { for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x); KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
ArrayList<String> ticketList = new ArrayList<>(); ArrayList<String> ticketList = ObjectUtil.cloneArrayListString();
for (int y = 0; y < timeItem.getTicketList().size(); y++) { for (int y = 0; y < timeItem.getTicketList().size(); y++) {
KylinTicketVo ticketItem = timeItem.getTicketList().get(y); KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
if (ticketItem.getType() == 1) { if (ticketItem.getType() == 1) {
......
package com.liquidnet.service.order.utils; package com.liquidnet.service.order.utils;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo; import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
...@@ -25,11 +26,15 @@ public class ObjectUtil { ...@@ -25,11 +26,15 @@ public class ObjectUtil {
private static final LinkedList<String> linkedListStr = new LinkedList<String>(); private static final LinkedList<String> linkedListStr = new LinkedList<String>();
private static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>(); private static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>(); private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
private static final HashMap<String, Integer> hashMapStringAndInteger = new HashMap();
private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>(); private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
private static final ArrayList<String> arrayListString = new ArrayList<>();
private static final ArrayList<KylinOrderListVo> arrayKylinOrderListVo = new ArrayList<>();
private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>(); private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
private static final BasicDBObject basicDBObject = new BasicDBObject(); 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() { public static LinkedList<Object[]> cloneLinkedListObj() {
return (LinkedList<Object[]>) linkedListObj.clone(); return (LinkedList<Object[]>) linkedListObj.clone();
...@@ -47,16 +52,33 @@ public class ObjectUtil { ...@@ -47,16 +52,33 @@ public class ObjectUtil {
return (HashMap<String, Object>) hashMapStringAndObject.clone(); return (HashMap<String, Object>) hashMapStringAndObject.clone();
} }
public static HashMap<String, Integer> cloneHashMapStringAndInteger() {
return (HashMap<String, Integer>) hashMapStringAndInteger.clone();
}
public static ArrayList<AdamEntersVo> cloneArrayListObject() { public static ArrayList<AdamEntersVo> cloneArrayListObject() {
return (ArrayList<AdamEntersVo>) arrayListObject.clone(); return (ArrayList<AdamEntersVo>) arrayListObject.clone();
} }
public static ArrayList<KylinOrderListVo> cloneArrayKylinOrderListVo() {
return (ArrayList<KylinOrderListVo>) arrayKylinOrderListVo.clone();
}
public static ArrayList<String> cloneArrayListString() {
return (ArrayList<String>) arrayListString.clone();
}
public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() { public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
return linkedMultiValueMapStringAndString.clone(); return linkedMultiValueMapStringAndString.clone();
} }
public static Object[] cloneObjectsArray() { public static Object[] cloneObjectsArray(int size) {
return objectsArray.clone(); objectsArray = new Object[size];
return objectsArray;
}
public static Integer[] cloneInteger2Array() {
return integerArray2.clone();
} }
public static BasicDBObject cloneBasicDBObject() { public static BasicDBObject cloneBasicDBObject() {
......
...@@ -62,7 +62,10 @@ public class OrderUtils { ...@@ -62,7 +62,10 @@ public class OrderUtils {
performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId); performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId); ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
} }
return new Integer[]{performanceBuyCount, ticketBuyCount}; Integer[] array = ObjectUtil.cloneInteger2Array();
array[0]=performanceBuyCount;
array[1]=ticketBuyCount;
return array;
} }
public Integer[] festivalOrderLimit( public Integer[] festivalOrderLimit(
...@@ -82,7 +85,10 @@ public class OrderUtils { ...@@ -82,7 +85,10 @@ public class OrderUtils {
ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId); ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
} }
return new Integer[]{performanceBuyCount, ticketBuyCount}; Integer[] array = ObjectUtil.cloneInteger2Array();
array[0]=performanceBuyCount;
array[1]=ticketBuyCount;
return array;
} }
public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) { public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) {
...@@ -128,9 +134,9 @@ public class OrderUtils { ...@@ -128,9 +134,9 @@ public class OrderUtils {
* @param orderId 订单id [需要新增或者修改的订单id] * @param orderId 订单id [需要新增或者修改的订单id]
*/ */
public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) { public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
List<KylinOrderListVo> vo = new ArrayList<>(); List<KylinOrderListVo> vo = ObjectUtil.cloneArrayKylinOrderListVo();
List<KylinOrderListVo> redisVo = new ArrayList(); List<KylinOrderListVo> redisVo = ObjectUtil.cloneArrayKylinOrderListVo();
KylinOrderListVo voItem = new KylinOrderListVo(); KylinOrderListVo voItem = KylinOrderListVo.getNew();
KylinOrderTicketVo data; KylinOrderTicketVo data;
if (dataSingle == null) { if (dataSingle == null) {
data = dataUtils.getOrderTicketVo(orderId); data = dataUtils.getOrderTicketVo(orderId);
......
...@@ -35,7 +35,7 @@ public class QueueUtils { ...@@ -35,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串 * @param jsonMsg Json字符串
*/ */
public void sendMsgByRedis(String streamKey, String jsonMsg) { public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
map.put("message", jsonMsg); map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey)); stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
} }
......
package com.liquidnet.service.platform.service.impl.partner; package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -34,11 +35,11 @@ public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNotice ...@@ -34,11 +35,11 @@ public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNotice
PageInfo<KylinBuyNoticeVo> pageInfoTmp = null; PageInfo<KylinBuyNoticeVo> pageInfoTmp = null;
PageHelper.startPage(1, 20); 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<>(); List<KylinBuyNoticeVo> kylinBuyNoticeVoList = new ArrayList<>();
for (KylinBuyNotice item : buyNoticeList) { for (KylinBuyNotice item : buyNoticeList) {
KylinBuyNoticeVo kylinBuyNoticeVo = new KylinBuyNoticeVo(); KylinBuyNoticeVo kylinBuyNoticeVo = KylinBuyNoticeVo.getNew();
BeanUtils.copyProperties(item, kylinBuyNoticeVo); BeanUtils.copyProperties(item, kylinBuyNoticeVo);
kylinBuyNoticeVoList.add(kylinBuyNoticeVo); kylinBuyNoticeVoList.add(kylinBuyNoticeVo);
} }
......
package com.liquidnet.service.platform.service.impl.partner; 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.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -14,6 +16,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser; ...@@ -14,6 +16,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser;
import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper; import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
import com.liquidnet.service.platform.utils.DataUtils; import com.liquidnet.service.platform.utils.DataUtils;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -64,18 +67,14 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser ...@@ -64,18 +67,14 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Override @Override
public ResponseDto<String> del(String merchantId, String checkUserId) { public ResponseDto<String> del(String merchantId, String checkUserId) {
try { try {
KylinCheckUser checkUser = new KylinCheckUser(); KylinCheckUser checkUser = KylinCheckUser.getNew();
checkUser.setUpdatedAt(LocalDateTime.now()); checkUser.setUpdatedAt(LocalDateTime.now());
checkUser.setStatus(0); 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); dataUtils.delCheckUserRedis(checkUserId);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("status", 0); 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()); mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserVo.class, KylinCheckUserVo.class.getSimpleName());
return ResponseDto.success("删除成功"); return ResponseDto.success("删除成功");
} catch (Exception e) { } catch (Exception e) {
...@@ -86,7 +85,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser ...@@ -86,7 +85,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Override @Override
public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) { public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
try { try {
KylinCheckUser checkUser = new KylinCheckUser(); KylinCheckUser checkUser = KylinCheckUser.getNew();
checkUser.setName(name); checkUser.setName(name);
checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes())); checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
checkUser.setMobile(mobile); checkUser.setMobile(mobile);
...@@ -96,7 +95,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser ...@@ -96,7 +95,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
checkUser.setStatus(1); checkUser.setStatus(1);
checkUserMapper.insert(checkUser); checkUserMapper.insert(checkUser);
KylinCheckUserVo kylinCheckUserVo = new KylinCheckUserVo(); KylinCheckUserVo kylinCheckUserVo = KylinCheckUserVo.getNew();
BeanUtils.copyProperties(checkUser, kylinCheckUserVo); BeanUtils.copyProperties(checkUser, kylinCheckUserVo);
mongoTemplate.insert(kylinCheckUserVo, KylinCheckUserVo.class.getSimpleName()); mongoTemplate.insert(kylinCheckUserVo, KylinCheckUserVo.class.getSimpleName());
...@@ -109,15 +108,15 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser ...@@ -109,15 +108,15 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Override @Override
public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) { public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
try { try {
KylinCheckUser checkUser = new KylinCheckUser(); KylinCheckUser checkUser = KylinCheckUser.getNew();
checkUser.setName(name); checkUser.setName(name);
if(null!=pwd) { if (null != pwd) {
checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes())); checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
} }
checkUser.setMobile(mobile); checkUser.setMobile(mobile);
checkUser.setUpdatedAt(LocalDateTime.now()); checkUser.setUpdatedAt(LocalDateTime.now());
checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId).eq("merchant_id", merchantId)); checkUserMapper.update(checkUser, Wrappers.lambdaUpdate(KylinCheckUser.class).eq(KylinCheckUser::getCheckUserId, checkUserId).eq(KylinCheckUser::getMerchantId, merchantId));
BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(checkUser)); BasicDBObject obj = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(checkUser));
mongoTemplate.getCollection(KylinCheckUserVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinCheckUserVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(), Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
obj obj
......
package com.liquidnet.service.platform.service.impl.partner; package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -79,7 +80,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky ...@@ -79,7 +80,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
if (null == item.getCanDownTime()) { if (null == item.getCanDownTime()) {
return ResponseDto.failure(ErrorMapping.get(20101)); return ResponseDto.failure(ErrorMapping.get(20101));
} }
KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances(); KylinCheckUserPerformances checkUserPerformances = KylinCheckUserPerformances.getNew();
checkUserPerformances.setCheckUserId(param.getCheckUserId()); checkUserPerformances.setCheckUserId(param.getCheckUserId());
checkUserPerformances.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(item.getCanDownTime())); checkUserPerformances.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(item.getCanDownTime()));
checkUserPerformances.setPerformanceId(item.getPerformanceId()); checkUserPerformances.setPerformanceId(item.getPerformanceId());
...@@ -90,11 +91,11 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky ...@@ -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()); 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<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) { 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.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceRelationParam.setPerformanceId(item.getPerformanceId()); performanceRelationParam.setPerformanceId(item.getPerformanceId());
performanceRelationParamsList.add(performanceRelationParam); performanceRelationParamsList.add(performanceRelationParam);
...@@ -115,15 +116,15 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky ...@@ -115,15 +116,15 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
public ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId) { public ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId) {
try { try {
for (String performanceId : performanceIds) { 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()); 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<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) { 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.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceRelationParam.setPerformanceId(item.getPerformanceId()); performanceRelationParam.setPerformanceId(item.getPerformanceId());
performanceRelationParamsList.add(performanceRelationParam); performanceRelationParamsList.add(performanceRelationParam);
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.service.impl.partner; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.service.impl.partner;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
...@@ -16,6 +17,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper; ...@@ -16,6 +17,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper;
import com.liquidnet.service.kylin.mapper.KylinTicketTimeRelationMapper; import com.liquidnet.service.kylin.mapper.KylinTicketTimeRelationMapper;
import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper; import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService; import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument; import com.mongodb.client.model.ReturnDocument;
...@@ -63,7 +65,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -63,7 +65,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
ResponseDto<KylinTicketTimesPartnerVo> ticketTimesPartnerVo = null; ResponseDto<KylinTicketTimesPartnerVo> ticketTimesPartnerVo = null;
//获取演出状态 //获取演出状态
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne( KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId())); Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
} else if(performanceStatus.getAuditStatus()==0){ } else if(performanceStatus.getAuditStatus()==0){
...@@ -80,7 +82,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -80,7 +82,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
public ResponseDto<KylinTicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam) { public ResponseDto<KylinTicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam) {
try { try {
// 获取 主键id // 获取 主键id
String ticketTimesId = IDGenerator.nextSnowId().toString(); String ticketTimesId = IDGenerator.nextSnowId();
// 获取 当前时间 -> 创建时间 // 获取 当前时间 -> 创建时间
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
// 标题 // 标题
...@@ -97,7 +99,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -97,7 +99,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
title = useStart + "-" + useEnd; title = useStart + "-" + useEnd;
} }
// mongo 操作 // mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo(); KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId); kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
if(createTicketTimesParam.getType() == 2) { if(createTicketTimesParam.getType() == 2) {
...@@ -141,7 +143,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -141,7 +143,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
} }
// mongo 操作 // mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo(); KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId); kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); 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"))); kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
...@@ -169,24 +171,23 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -169,24 +171,23 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
return ResponseDto.failure(ErrorMapping.get(20106)); return ResponseDto.failure(ErrorMapping.get(20106));
} }
KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne( KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimesId)); Wrappers.lambdaQuery(KylinTicketTimeRelation.class).eq(KylinTicketTimeRelation::getTimesId, ticketTimesId));
if (ticketTimeRelation != null) { if (ticketTimeRelation != null) {
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne( 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){ if(performanceStatus.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20101)); return ResponseDto.failure(ErrorMapping.get(20101));
} }
if (performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝 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("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map.put("status", 0); map.put("status", 0);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map)); BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
Document doc = mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate( mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(), Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(),
object, object
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
); );
return ResponseDto.success("删除成功"); return ResponseDto.success("删除成功");
} else { } else {
...@@ -214,7 +215,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -214,7 +215,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
createTicketTimesParam.setTitle(title); createTicketTimesParam.setTitle(title);
// mongo 操作 // mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo(); KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
BeanUtils.copyProperties(createTicketTimesParam, kylinTicketTimesPartnerVo); BeanUtils.copyProperties(createTicketTimesParam, kylinTicketTimesPartnerVo);
kylinTicketTimesPartnerVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId()); kylinTicketTimesPartnerVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
kylinTicketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
...@@ -222,7 +223,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -222,7 +223,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
kylinTicketTimesPartnerVo.setStatus(null); 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( Document doc = mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("ticketTimesId").is(createTicketTimesParam.getTicketTimesId())).getQueryObject(), Query.query(Criteria.where("ticketTimesId").is(createTicketTimesParam.getTicketTimesId())).getQueryObject(),
object, object,
......
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();
}
}
package com.liquidnet.service.platform.utils; package com.liquidnet.service.platform.utils;
import com.liquidnet.commons.lang.util.CollectionUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.stream.MapRecord;
import org.springframework.data.redis.connection.stream.StreamRecords; import org.springframework.data.redis.connection.stream.StreamRecords;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -36,7 +36,7 @@ public class QueueUtils { ...@@ -36,7 +36,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串 * @param jsonMsg Json字符串
*/ */
public void sendMsgByRedis(String streamKey, String jsonMsg) { public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg); map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey)); stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
} }
......
...@@ -54,4 +54,13 @@ ...@@ -54,4 +54,13 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project> </project>
package com.liquidnet.service.sweet.dto; package com.liquidnet.service.sweet.dto;
import com.liquidnet.service.sweet.entity.SweetManualSort;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
public class SweetManualAppletDto implements Serializable { public class SweetManualAppletDto implements Serializable ,Cloneable{
private String manualId; private String manualId;
private String performancesId; private String performancesId;
private String title; private String title;
...@@ -17,4 +18,14 @@ public class SweetManualAppletDto implements Serializable { ...@@ -17,4 +18,14 @@ public class SweetManualAppletDto implements Serializable {
private String longitude; private String longitude;
private String latitude; private String latitude;
private static final SweetManualAppletDto obj = new SweetManualAppletDto();
public static SweetManualAppletDto getNew() {
try {
return (SweetManualAppletDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualAppletDto();
}
}
} }
...@@ -6,8 +6,17 @@ import java.io.Serializable; ...@@ -6,8 +6,17 @@ import java.io.Serializable;
import java.util.List; import java.util.List;
@Data @Data
public class SweetManualArtistList2Dto implements Serializable { public class SweetManualArtistList2Dto implements Serializable ,Cloneable {
private List<SweetManualArtistListDto> data; private List<SweetManualArtistListDto> data;
private List<String> date; private List<String> date;
private List<SweetManualArtistStageListDto> stage; private List<SweetManualArtistStageListDto> stage;
private static final SweetManualArtistList2Dto obj = new SweetManualArtistList2Dto();
public static SweetManualArtistList2Dto getNew() {
try {
return (SweetManualArtistList2Dto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualArtistList2Dto();
}
}
} }
...@@ -6,7 +6,7 @@ import java.io.Serializable; ...@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
@Data @Data
public class SweetManualArtistListDto implements Serializable { public class SweetManualArtistListDto implements Serializable,Cloneable {
private String manualRelationId; private String manualRelationId;
private String artistId; private String artistId;
...@@ -19,4 +19,13 @@ public class SweetManualArtistListDto implements Serializable { ...@@ -19,4 +19,13 @@ public class SweetManualArtistListDto implements Serializable {
private String signatureEnd; private String signatureEnd;
private ArrayList<String> date; private ArrayList<String> date;
private static final SweetManualArtistListDto obj = new SweetManualArtistListDto();
public static SweetManualArtistListDto getNew() {
try {
return (SweetManualArtistListDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualArtistListDto();
}
}
} }
...@@ -6,6 +6,15 @@ import java.io.Serializable; ...@@ -6,6 +6,15 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
@Data @Data
public class SweetManualArtistStageListDto implements Serializable { public class SweetManualArtistStageListDto implements Serializable ,Cloneable{
private String title; private String title;
private static final SweetManualArtistStageListDto obj = new SweetManualArtistStageListDto();
public static SweetManualArtistStageListDto getNew() {
try {
return (SweetManualArtistStageListDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualArtistStageListDto();
}
}
} }
...@@ -5,7 +5,7 @@ import lombok.Data; ...@@ -5,7 +5,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
public class SweetManualDto implements Serializable { public class SweetManualDto implements Serializable ,Cloneable{
private String performancesId; private String performancesId;
private String title; private String title;
...@@ -16,4 +16,13 @@ public class SweetManualDto implements Serializable { ...@@ -16,4 +16,13 @@ public class SweetManualDto implements Serializable {
private Integer status; private Integer status;
private Integer manualStatus; private Integer manualStatus;
private Integer isRelease; private Integer isRelease;
private static final SweetManualDto obj = new SweetManualDto();
public static SweetManualDto getNew() {
try {
return (SweetManualDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualDto();
}
}
} }
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetArtists implements Serializable { public class SweetArtists implements Serializable,Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -64,5 +64,12 @@ public class SweetArtists implements Serializable { ...@@ -64,5 +64,12 @@ public class SweetArtists implements Serializable {
*/ */
private LocalDateTime updatdAt; private LocalDateTime updatdAt;
private static final SweetArtists obj = new SweetArtists();
public static SweetArtists getNew() {
try {
return (SweetArtists) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetArtists();
}
}
} }
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetManual implements Serializable { public class SweetManual implements Serializable,Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -54,5 +54,12 @@ public class SweetManual implements Serializable { ...@@ -54,5 +54,12 @@ public class SweetManual implements Serializable {
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private static final SweetManual obj = new SweetManual();
public static SweetManual getNew() {
try {
return (SweetManual) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManual();
}
}
} }
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetManualArtists implements Serializable { public class SweetManualArtists implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -79,5 +79,12 @@ public class SweetManualArtists implements Serializable { ...@@ -79,5 +79,12 @@ public class SweetManualArtists implements Serializable {
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private static final SweetManualArtists obj = new SweetManualArtists();
public static SweetManualArtists getNew() {
try {
return (SweetManualArtists) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualArtists();
}
}
} }
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetManualNotify implements Serializable { public class SweetManualNotify implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -59,5 +59,12 @@ public class SweetManualNotify implements Serializable { ...@@ -59,5 +59,12 @@ public class SweetManualNotify implements Serializable {
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private static final SweetManualNotify obj = new SweetManualNotify();
public static SweetManualNotify getNew() {
try {
return (SweetManualNotify) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualNotify();
}
}
} }
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetManualSort implements Serializable { public class SweetManualSort implements Serializable,Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -44,5 +44,12 @@ public class SweetManualSort implements Serializable { ...@@ -44,5 +44,12 @@ public class SweetManualSort implements Serializable {
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private static final SweetManualSort obj = new SweetManualSort();
public static SweetManualSort getNew() {
try {
return (SweetManualSort) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetManualSort();
}
}
} }
...@@ -2,8 +2,10 @@ package com.liquidnet.service.sweet.entity; ...@@ -2,8 +2,10 @@ package com.liquidnet.service.sweet.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetRichtext implements Serializable { public class SweetRichtext implements Serializable, Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -69,5 +71,12 @@ public class SweetRichtext implements Serializable { ...@@ -69,5 +71,12 @@ public class SweetRichtext implements Serializable {
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private static final SweetRichtext obj = new SweetRichtext();
public static SweetRichtext getNew() {
try {
return (SweetRichtext) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetRichtext();
}
}
} }
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class SweetStage implements Serializable { public class SweetStage implements Serializable,Cloneable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -49,5 +49,12 @@ public class SweetStage implements Serializable { ...@@ -49,5 +49,12 @@ public class SweetStage implements Serializable {
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private static final SweetStage obj = new SweetStage();
public static SweetStage getNew() {
try {
return (SweetStage) obj.clone();
} catch (CloneNotSupportedException e) {
return new SweetStage();
}
}
} }
...@@ -57,7 +57,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe ...@@ -57,7 +57,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
@Override @Override
public ResponseDto<Boolean> add(String picUrl, String name, String pinyin, String describe) { public ResponseDto<Boolean> add(String picUrl, String name, String pinyin, String describe) {
try { try {
SweetArtists sweetArtists = new SweetArtists(); SweetArtists sweetArtists = SweetArtists.getNew();
sweetArtists.setArtistsId(IDGenerator.nextSnowId()); sweetArtists.setArtistsId(IDGenerator.nextSnowId());
sweetArtists.setPicUrl(picUrl); sweetArtists.setPicUrl(picUrl);
sweetArtists.setName(name); sweetArtists.setName(name);
...@@ -83,7 +83,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe ...@@ -83,7 +83,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
@Override @Override
public ResponseDto<Boolean> change(String artistsId, String picUrl, String name, String pinyin, String describe) { public ResponseDto<Boolean> change(String artistsId, String picUrl, String name, String pinyin, String describe) {
try { try {
SweetArtists sweetArtists = new SweetArtists(); SweetArtists sweetArtists = SweetArtists.getNew();
sweetArtists.setPicUrl(picUrl); sweetArtists.setPicUrl(picUrl);
sweetArtists.setName(name); sweetArtists.setName(name);
sweetArtists.setPinyin(pinyin); sweetArtists.setPinyin(pinyin);
......
...@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.service.impl; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -42,7 +43,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist ...@@ -42,7 +43,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
PageInfo<SweetManualArtistListDto> pageInfoTmp; PageInfo<SweetManualArtistListDto> pageInfoTmp;
try { try {
PageHelper.startPage(page, size); PageHelper.startPage(page, size);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("manualId", manualId); map.put("manualId", manualId);
List<SweetManualArtistListDto> voList = sweetManualArtistsMapper.getManualList(map); List<SweetManualArtistListDto> voList = sweetManualArtistsMapper.getManualList(map);
pageInfoTmp = new PageInfo(voList); pageInfoTmp = new PageInfo(voList);
...@@ -56,7 +57,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist ...@@ -56,7 +57,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override @Override
public ResponseDto<Boolean> add(String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) { public ResponseDto<Boolean> add(String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
try { try {
SweetManualArtists sweetManualNotify = new SweetManualArtists(); SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId()); sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
sweetManualNotify.setManualId(manualId); sweetManualNotify.setManualId(manualId);
sweetManualNotify.setStageId(stageId); sweetManualNotify.setStageId(stageId);
...@@ -78,7 +79,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist ...@@ -78,7 +79,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override @Override
public ResponseDto<SweetManualArtistListDto> details(String manualRelationId) { public ResponseDto<SweetManualArtistListDto> details(String manualRelationId) {
try { try {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("manualRelationId", manualRelationId); map.put("manualRelationId", manualRelationId);
SweetManualArtistListDto dto = sweetManualArtistsMapper.getManualDetails(map); SweetManualArtistListDto dto = sweetManualArtistsMapper.getManualDetails(map);
return ResponseDto.success(dto); return ResponseDto.success(dto);
...@@ -91,7 +92,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist ...@@ -91,7 +92,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override @Override
public ResponseDto<Boolean> change(String manualRelationId, String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) { public ResponseDto<Boolean> change(String manualRelationId, String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
try { try {
SweetManualArtists sweetManualNotify = new SweetManualArtists(); SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
sweetManualNotify.setStageId(stageId); sweetManualNotify.setStageId(stageId);
sweetManualNotify.setArtistsId(artistId); sweetManualNotify.setArtistsId(artistId);
sweetManualNotify.setPerformanceEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceEnd)); sweetManualNotify.setPerformanceEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceEnd));
...@@ -111,7 +112,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist ...@@ -111,7 +112,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override @Override
public ResponseDto<Boolean> delete(String manualRelationId, String manualId) { public ResponseDto<Boolean> delete(String manualRelationId, String manualId) {
try { try {
SweetManualArtists sweetManualNotify = new SweetManualArtists(); SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId()); sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
sweetManualNotify.setStatus(0); sweetManualNotify.setStatus(0);
sweetManualNotify.setUpdatedAt(LocalDateTime.now()); sweetManualNotify.setUpdatedAt(LocalDateTime.now());
......
...@@ -49,7 +49,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM ...@@ -49,7 +49,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
@Override @Override
public ResponseDto<Boolean> add(String manualId, String title, String content) { public ResponseDto<Boolean> add(String manualId, String title, String content) {
try { try {
SweetManualNotify sweetManualNotify = new SweetManualNotify(); SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setManualNotifyId(IDGenerator.nextSnowId()); sweetManualNotify.setManualNotifyId(IDGenerator.nextSnowId());
sweetManualNotify.setManualId(manualId); sweetManualNotify.setManualId(manualId);
sweetManualNotify.setTitle(title); sweetManualNotify.setTitle(title);
...@@ -79,7 +79,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM ...@@ -79,7 +79,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
@Override @Override
public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) { public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) {
try { try {
SweetManualNotify sweetManualNotify = new SweetManualNotify(); SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setTitle(title); sweetManualNotify.setTitle(title);
sweetManualNotify.setContent(content); sweetManualNotify.setContent(content);
sweetManualNotify.setUpdatedAt(LocalDateTime.now()); sweetManualNotify.setUpdatedAt(LocalDateTime.now());
...@@ -104,7 +104,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM ...@@ -104,7 +104,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
@Override @Override
public ResponseDto<Boolean> delete(String manualNotifyId) { public ResponseDto<Boolean> delete(String manualNotifyId) {
try { try {
SweetManualNotify sweetManualNotify = new SweetManualNotify(); SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setStatus(0); sweetManualNotify.setStatus(0);
sweetManualNotify.setUpdatedAt(LocalDateTime.now()); sweetManualNotify.setUpdatedAt(LocalDateTime.now());
sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId)); sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId));
......
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
...@@ -44,7 +45,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet ...@@ -44,7 +45,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
PageInfo<SweetManualDto> pageInfoTmp; PageInfo<SweetManualDto> pageInfoTmp;
try { try {
PageHelper.startPage(page, size); PageHelper.startPage(page, size);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("title", name); map.put("title", name);
List<SweetManualDto> voList = sweetManualMapper.getManualList(BeanUtil.convertBeanToMap(map)); List<SweetManualDto> voList = sweetManualMapper.getManualList(BeanUtil.convertBeanToMap(map));
for (int i = 0; i < voList.size(); i++) { for (int i = 0; i < voList.size(); i++) {
...@@ -71,7 +72,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet ...@@ -71,7 +72,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
public ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status) { public ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status) {
try { try {
int count = sweetManualMapper.selectCount(Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId)); int count = sweetManualMapper.selectCount(Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId));
SweetManual sweetManual = new SweetManual(); SweetManual sweetManual = SweetManual.getNew();
if (count > 0) {//修改 if (count > 0) {//修改
sweetManual.setStatus(status); sweetManual.setStatus(status);
sweetManual.setUpdatedAt(LocalDateTime.now()); sweetManual.setUpdatedAt(LocalDateTime.now());
...@@ -94,7 +95,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet ...@@ -94,7 +95,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
@Override @Override
public ResponseDto<Boolean> changeRelease(String manualId, Integer isRelease) { public ResponseDto<Boolean> changeRelease(String manualId, Integer isRelease) {
try { try {
SweetManual sweetManual = new SweetManual(); SweetManual sweetManual = SweetManual.getNew();
sweetManual.setIsRelease(isRelease); sweetManual.setIsRelease(isRelease);
sweetManual.setUpdatedAt(LocalDateTime.now()); sweetManual.setUpdatedAt(LocalDateTime.now());
sweetManualMapper.update(sweetManual, Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId)); sweetManualMapper.update(sweetManual, Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId));
......
...@@ -43,13 +43,13 @@ public class SweetManualSortServiceImpl extends ServiceImpl<SweetManualSortMappe ...@@ -43,13 +43,13 @@ public class SweetManualSortServiceImpl extends ServiceImpl<SweetManualSortMappe
try { try {
int count = sweetManualSortMapper.selectCount(Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId)); int count = sweetManualSortMapper.selectCount(Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId));
if (count > 0) { if (count > 0) {
SweetManualSort sweetManualSort = new SweetManualSort(); SweetManualSort sweetManualSort = SweetManualSort.getNew();
sweetManualSort.setManualId(manualId); sweetManualSort.setManualId(manualId);
sweetManualSort.setShowPosition(content); sweetManualSort.setShowPosition(content);
sweetManualSort.setUpdatedAt(LocalDateTime.now()); sweetManualSort.setUpdatedAt(LocalDateTime.now());
sweetManualSortMapper.update(sweetManualSort, Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId)); sweetManualSortMapper.update(sweetManualSort, Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId));
} else { } else {
SweetManualSort sweetManualSort = new SweetManualSort(); SweetManualSort sweetManualSort = SweetManualSort.getNew();
sweetManualSort.setManualId(manualId); sweetManualSort.setManualId(manualId);
sweetManualSort.setShowPosition(content); sweetManualSort.setShowPosition(content);
sweetManualSort.setCreatedAt(LocalDateTime.now()); sweetManualSort.setCreatedAt(LocalDateTime.now());
......
...@@ -42,7 +42,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S ...@@ -42,7 +42,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
@Override @Override
public ResponseDto<Boolean> add(String manualId, String details, String local, String pirUrl, Integer type) { public ResponseDto<Boolean> add(String manualId, String details, String local, String pirUrl, Integer type) {
try { try {
SweetRichtext sweetRichtext = new SweetRichtext(); SweetRichtext sweetRichtext = SweetRichtext.getNew();
sweetRichtext.setRichtextId(IDGenerator.nextSnowId()); sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
sweetRichtext.setManualId(manualId); sweetRichtext.setManualId(manualId);
if (type == 5) { if (type == 5) {
...@@ -65,7 +65,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S ...@@ -65,7 +65,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
@Override @Override
public ResponseDto<Boolean> change(String manualId, String details, String local, String pirUrl, Integer type) { public ResponseDto<Boolean> change(String manualId, String details, String local, String pirUrl, Integer type) {
try { try {
SweetRichtext sweetRichtext = new SweetRichtext(); SweetRichtext sweetRichtext = SweetRichtext.getNew();
sweetRichtext.setRichtextId(IDGenerator.nextSnowId()); sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
sweetRichtext.setManualId(manualId); sweetRichtext.setManualId(manualId);
sweetRichtext.setDetails(details); sweetRichtext.setDetails(details);
......
...@@ -54,7 +54,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt ...@@ -54,7 +54,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
@Override @Override
public ResponseDto<Boolean> add(String name) { public ResponseDto<Boolean> add(String name) {
try { try {
SweetStage sweetStage = new SweetStage(); SweetStage sweetStage = SweetStage.getNew();
sweetStage.setStageId(IDGenerator.nextSnowId()); sweetStage.setStageId(IDGenerator.nextSnowId());
sweetStage.setTitle(name); sweetStage.setTitle(name);
sweetStage.setCreatedAt(LocalDateTime.now()); sweetStage.setCreatedAt(LocalDateTime.now());
...@@ -77,7 +77,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt ...@@ -77,7 +77,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
@Override @Override
public ResponseDto<Boolean> change(String name, String stageId) { public ResponseDto<Boolean> change(String name, String stageId) {
try { try {
SweetStage sweetStage = new SweetStage(); SweetStage sweetStage = SweetStage.getNew();
sweetStage.setTitle(name); sweetStage.setTitle(name);
sweetStage.setUpdatedAt(LocalDateTime.now()); sweetStage.setUpdatedAt(LocalDateTime.now());
sweetStageMapper.update(sweetStage, Wrappers.lambdaUpdate(SweetStage.class).eq(SweetStage::getStageId, stageId)); sweetStageMapper.update(sweetStage, Wrappers.lambdaUpdate(SweetStage.class).eq(SweetStage::getStageId, stageId));
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.sweet.utils; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.sweet.utils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.sweet.constant.SweetConstant; import com.liquidnet.service.sweet.constant.SweetConstant;
import com.liquidnet.service.sweet.dto.SweetManualAppletDto; import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
...@@ -64,7 +65,7 @@ public class RedisDataUtils { ...@@ -64,7 +65,7 @@ public class RedisDataUtils {
//获取电子手册演出详情 //获取电子手册演出详情
public SweetManualAppletDto getAppletPerformance(String manualId) { public SweetManualAppletDto getAppletPerformance(String manualId) {
List<SweetManualAppletDto> data = getPushList(); List<SweetManualAppletDto> data = getPushList();
SweetManualAppletDto returnData = new SweetManualAppletDto(); SweetManualAppletDto returnData = SweetManualAppletDto.getNew();
for (SweetManualAppletDto item : data) { for (SweetManualAppletDto item : data) {
if (item.getManualId().equalsIgnoreCase(manualId)) { if (item.getManualId().equalsIgnoreCase(manualId)) {
returnData = item; returnData = item;
...@@ -76,7 +77,7 @@ public class RedisDataUtils { ...@@ -76,7 +77,7 @@ public class RedisDataUtils {
public SweetManualArtistList2Dto setTimeList(String manualId,String content) { public SweetManualArtistList2Dto setTimeList(String manualId,String content) {
String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId); String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("manualId", manualId); map.put("manualId", manualId);
List<SweetManualArtistListDto> data = sweetManualArtistsMapper.getManualList(map); List<SweetManualArtistListDto> data = sweetManualArtistsMapper.getManualList(map);
...@@ -93,7 +94,7 @@ public class RedisDataUtils { ...@@ -93,7 +94,7 @@ public class RedisDataUtils {
//获取舞台 //获取舞台
List<SweetManualArtistStageListDto> stageData = sweetManualArtistsMapper.getStageNameList(map); List<SweetManualArtistStageListDto> stageData = sweetManualArtistsMapper.getStageNameList(map);
SweetManualArtistList2Dto returnData = new SweetManualArtistList2Dto(); SweetManualArtistList2Dto returnData = SweetManualArtistList2Dto.getNew();
returnData.setDate(list); returnData.setDate(list);
returnData.setData(data); returnData.setData(data);
returnData.setStage(stageData); returnData.setStage(stageData);
......
...@@ -269,5 +269,16 @@ ...@@ -269,5 +269,16 @@
<version>2.3.30</version> <version>2.3.30</version>
</dependency> </dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
<version>4.1.0</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
<version>4.1.0</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment