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

Skip to content

L
liquidnet-bus-v1
Commit 04ed1b8b authored by anjiabin's avatar anjiabin
Browse files
Options

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

parents 87396466 ee98e829
Show whitespace changes
Inline Side-by-side
Showing with 586 additions and 264 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CheckPerformanceRelationParam.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.param;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class CheckPerformanceRelationParam {
public class CheckPerformanceRelationParam implements Cloneable {
@ApiModelProperty(value = "演出id")
@NotNull(message = "演出ID不能为空")
private String performanceId;
@ApiModelProperty(value = "可下载时间")
@NotNull(message = "可下载时间不能为空")
private String canDownTime;
private static final CheckPerformanceRelationParam obj = new CheckPerformanceRelationParam();
public static CheckPerformanceRelationParam getNew() {
try {
return (CheckPerformanceRelationParam) obj.clone();
} catch (CloneNotSupportedException e) {
return new CheckPerformanceRelationParam();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformancePartnerVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.param;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -8,7 +9,7 @@ import java.io.Serializable;
import java.util.List;
@Data
public class PerformancePartnerVo implements Serializable {
public class PerformancePartnerVo implements Serializable,Cloneable {
@ApiModelProperty(value = "演出id", example = "")
@JsonIgnore
......@@ -112,4 +113,13 @@ public class PerformancePartnerVo implements Serializable {
@ApiModelProperty(value = "是否保存", example = "")
private Integer isCreateSave;
private static final PerformancePartnerVo obj = new PerformancePartnerVo();
public static PerformancePartnerVo getNew() {
try {
return (PerformancePartnerVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new PerformancePartnerVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceStep2Param.java
View file @ 04ed1b8b
......@@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.List;
@Data
public class PerformanceStep2Param implements Serializable {
public class PerformanceStep2Param implements Serializable,Cloneable {
@ApiModelProperty(value = "演出id", example = "")
@NotNull(message = "不能为空")
......@@ -35,4 +35,13 @@ public class PerformanceStep2Param implements Serializable {
@ApiModelProperty(value = "场次数据",hidden = true)
private List<TicketTimesTicketCreatePartnerVo> ticketTimes;
private static final PerformanceStep2Param obj = new PerformanceStep2Param();
public static PerformanceStep2Param getNew() {
try {
return (PerformanceStep2Param) obj.clone();
} catch (CloneNotSupportedException e) {
return new PerformanceStep2Param();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceOrderStatisticalVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.vo;
import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -15,7 +16,7 @@ import java.math.BigDecimal;
* @date 2021/6/19 16:44
*/
@Data
public class PerformanceOrderStatisticalVo {
public class PerformanceOrderStatisticalVo implements Cloneable {
private String performancesId;
private String ticketsId;
@ApiModelProperty(value = "票种名称")
......@@ -48,4 +49,13 @@ public class PerformanceOrderStatisticalVo {
private BigDecimal totalPayingNumber = BigDecimal.ZERO;
@ApiModelProperty(value = "购买人数")
private BigDecimal totalBuyUsers = BigDecimal.ZERO;
private static final PerformanceOrderStatisticalVo obj = new PerformanceOrderStatisticalVo();
public static PerformanceOrderStatisticalVo getNew() {
try {
return (PerformanceOrderStatisticalVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new PerformanceOrderStatisticalVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/KylinBuyNoticeVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.vo.middle;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import lombok.Data;
@Data
public class KylinBuyNoticeVo {
public class KylinBuyNoticeVo implements Cloneable {
private String buyNoticeId;
......@@ -14,4 +15,13 @@ public class KylinBuyNoticeVo {
private String message;
private Integer sort;
private static final KylinBuyNoticeVo obj = new KylinBuyNoticeVo();
public static KylinBuyNoticeVo getNew() {
try {
return (KylinBuyNoticeVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinBuyNoticeVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCheckUserPerformanceVo.java
View file @ 04ed1b8b
......@@ -10,10 +10,19 @@ import java.util.List;
@Data
@ApiModel
public class KylinCheckUserPerformanceVo implements Serializable {
public class KylinCheckUserPerformanceVo implements Serializable,Cloneable {
@ApiModelProperty(value = "id")
private String checkUserId;
@ApiModelProperty(value = "演出id数组")
private List<CheckPerformanceRelationParam> relationParams;
private static final KylinCheckUserPerformanceVo obj = new KylinCheckUserPerformanceVo();
public static KylinCheckUserPerformanceVo getNew() {
try {
return (KylinCheckUserPerformanceVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinCheckUserPerformanceVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCheckUserVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.vo.mongo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -8,7 +9,7 @@ import java.io.Serializable;
@Data
@ApiModel
public class KylinCheckUserVo implements Serializable {
public class KylinCheckUserVo implements Serializable ,Cloneable{
@ApiModelProperty(value = "id")
private String checkUserId;
......@@ -28,4 +29,12 @@ public class KylinCheckUserVo implements Serializable {
@ApiModelProperty(value = "状态")
private String status;
private static final KylinCheckUserVo obj = new KylinCheckUserVo();
public static KylinCheckUserVo getNew() {
try {
return (KylinCheckUserVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinCheckUserVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinPerformancePartnerListVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.vo.partner;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class KylinPerformancePartnerListVo {
public class KylinPerformancePartnerListVo implements Cloneable{
//演出数据
@ApiModelProperty(value = "主键id")
......@@ -47,4 +48,13 @@ public class KylinPerformancePartnerListVo {
this.rejectTxt="";
this.createdAt=item.getCreatedAt();
}
private static final KylinPerformancePartnerListVo obj = new KylinPerformancePartnerListVo();
public static KylinPerformancePartnerListVo getNew() {
try {
return (KylinPerformancePartnerListVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinPerformancePartnerListVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java
View file @ 04ed1b8b
......@@ -11,7 +11,7 @@ import java.math.BigDecimal;
* 修改场地全部显示数据参数
*/
@Data
public class KylinTicketPartnerVo implements Serializable {
public class KylinTicketPartnerVo implements Serializable,Cloneable {
@ApiModelProperty(value = "主键")
private String ticketsId;
......@@ -116,4 +116,13 @@ public class KylinTicketPartnerVo implements Serializable {
this.setSurplusExchange(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalGeneral());
}
private static final KylinTicketPartnerVo obj = new KylinTicketPartnerVo();
public static KylinTicketPartnerVo getNew() {
try {
return (KylinTicketPartnerVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketPartnerVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketTimesPartnerVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.vo.partner;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -8,7 +9,7 @@ import java.io.Serializable;
//返回
@Data
public class KylinTicketTimesPartnerVo implements Serializable {
public class KylinTicketTimesPartnerVo implements Serializable ,Cloneable{
@ApiModelProperty(value = "主键id")
private String ticketTimesId;
......@@ -39,4 +40,13 @@ public class KylinTicketTimesPartnerVo implements Serializable {
@ApiModelProperty(value = "修改时间")
private String updatedAt;
private static final KylinTicketTimesPartnerVo obj = new KylinTicketTimesPartnerVo();
public static KylinTicketTimesPartnerVo getNew() {
try {
return (KylinTicketTimesPartnerVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinTicketTimesPartnerVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesTicketCreatePartnerVo.java
View file @ 04ed1b8b
......@@ -9,7 +9,7 @@ import java.util.List;
//包含 票
@Data
public class TicketTimesTicketCreatePartnerVo implements Serializable {
public class TicketTimesTicketCreatePartnerVo implements Serializable ,Cloneable{
@ApiModelProperty(value = "主键id")
private String ticketTimesId;
......@@ -40,4 +40,13 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
//票
@ApiModelProperty(value = "票数据")
private List<KylinTicketPartnerVo> ticket;
private static final TicketTimesTicketCreatePartnerVo obj = new TicketTimesTicketCreatePartnerVo();
public static TicketTimesTicketCreatePartnerVo getNew() {
try {
return (TicketTimesTicketCreatePartnerVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new TicketTimesTicketCreatePartnerVo();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderListVo.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.dto.vo.returns;
import com.liquidnet.service.kylin.entity.KylinBannersRelations;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
@Data
public class KylinOrderListVo implements Serializable {
public class KylinOrderListVo implements Serializable,Cloneable {
private static final long serialVersionUID = 6554829077875538374L;
private String orderTicketsId;
private String performanceId;
......@@ -25,4 +26,13 @@ public class KylinOrderListVo implements Serializable {
private Integer expressStatus;
private String getTicketType;
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();
}
}
}
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 04ed1b8b
......@@ -103,6 +103,16 @@ liquidnet:
service:
appid: wx3498304dda39c5a1
secret: a1307fab0a5f2380086a7c636f7339ea
applet:
strawberry:
appid: wx08b852ade69f8019
secret: 0aac285fd1fbc6aa4e562b7ad81de392
five:
appid: wxb5371c8c95226957
secret: a6a909ae1ab25a79d4addd154eafbb7e
mdsk:
appid: wxc278ddf30f515188
secret: 21c0daa5d7d323f86c70c29db3c0613b
umeng:
ios:
appkey: 54fe819bfd98c546b50004f0
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 04ed1b8b
......@@ -103,6 +103,16 @@ liquidnet:
service:
appid: wx3498304dda39c5a1
secret: a1307fab0a5f2380086a7c636f7339ea
applet:
strawberry:
appid: wx08b852ade69f8019
secret: 0aac285fd1fbc6aa4e562b7ad81de392
five:
appid: wxb5371c8c95226957
secret: a6a909ae1ab25a79d4addd154eafbb7e
mdsk:
appid: wxc278ddf30f515188
secret: 21c0daa5d7d323f86c70c29db3c0613b
umeng:
ios:
appkey: 54fe819bfd98c546b50004f0
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon.yml
View file @ 04ed1b8b
......@@ -69,6 +69,8 @@ spring:
max-request-size: 10MB
profiles:
include: common-service #这里加载management相关公共配置
autoconfigure:
exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
rabbitmq:
addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port}
......@@ -114,26 +116,6 @@ spring:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
sslEnabled: ${liquidnet.mongodb.sslEnabled}
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
# -----------------------------------------------------------
# -----------------------------------------------------------
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml
View file @ 04ed1b8b
......@@ -69,6 +69,9 @@ spring:
max-request-size: 10MB
profiles:
include: common-service #这里加载management相关公共配置
autoconfigure:
exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
rabbitmq:
addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port}
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml
View file @ 04ed1b8b
......@@ -69,6 +69,8 @@ spring:
max-request-size: 10MB
profiles:
include: common-service #这里加载management相关公共配置
autoconfigure:
exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
rabbitmq:
addresses: ${liquidnet.rabbitmq.host}
port: ${liquidnet.rabbitmq.port}
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceOrderStatisticalDao.java
View file @ 04ed1b8b
......@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
* @date 2021/6/3 16:39
*/
@Data
public class PerformanceOrderStatisticalDao {
public class PerformanceOrderStatisticalDao implements Cloneable{
private String performancesId;
private String ticketsId;
private String title;
......@@ -33,4 +33,13 @@ public class PerformanceOrderStatisticalDao {
private BigDecimal totalMemberNumber = BigDecimal.ZERO;
private BigDecimal totalPayingNumber = BigDecimal.ZERO;
private BigDecimal totalBuyUsers = BigDecimal.ZERO;
private static final PerformanceOrderStatisticalDao obj = new PerformanceOrderStatisticalDao();
public static PerformanceOrderStatisticalDao getNew() {
try {
return (PerformanceOrderStatisticalDao) obj.clone();
} catch (CloneNotSupportedException e) {
return new PerformanceOrderStatisticalDao();
}
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/QueueUtils.java
View file @ 04ed1b8b
package com.liquidnet.service.adam.util;
import com.liquidnet.commons.lang.util.CollectionUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.stream.StreamRecords;
......@@ -34,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串
*/
public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>();
HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/QueueUtils.java
View file @ 04ed1b8b
package com.liquidnet.service.kylin.utils;
import com.liquidnet.commons.lang.util.CollectionUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.stream.StreamRecords;
......@@ -34,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串
*/
public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>();
HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
}
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/ServiceOrderApplication.java
View file @ 04ed1b8b
......@@ -38,9 +38,4 @@ public class ServiceOrderApplication implements CommandLineRunner {
e.printStackTrace();
}
}
// @Bean
// MongoTransactionManager transactionManager(MongoDbFactory factory){
// return new MongoTransactionManager(factory);
// }
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java
View file @ 04ed1b8b
......@@ -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.vo.returns.*;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
import com.liquidnet.service.order.utils.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
......@@ -81,7 +82,7 @@ public class KylinOrderTicketsController {
if (null == status) {
return ResponseDto.failure(ErrorMapping.get("20003"));
} else {
HashMap<String, Integer> map = new HashMap<>();
HashMap<String, Integer> map = ObjectUtil.cloneHashMapStringAndInteger();
map.put("status", status);
return ResponseDto.success(map);
}
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 04ed1b8b
......@@ -683,7 +683,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime));
sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain"));
LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
Object[] objectB= ObjectUtil.cloneObjectsArray();
Object[] objectB= ObjectUtil.cloneObjectsArray(4);
objectB[0]= orderTickets.getUpdatedAt();
objectB[1]= orderTickets.getOrderTicketsId();
objectB[2]= strTime;
......@@ -691,7 +691,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataB.add(objectB);
sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
Object[] objectC = ObjectUtil.cloneObjectsArray();
Object[] objectC = ObjectUtil.cloneObjectsArray(4);
objectC[0]= orderTickets.getUpdatedAt();
objectC[1]= orderTickets.getOrderTicketsId();
objectC[2]= strTime;
......@@ -699,7 +699,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataC.add(objectC);
sqls.add(SqlMapping.get("kylin_order_ticket_entities.payAgain"));
LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj();
Object[] objectD = ObjectUtil.cloneObjectsArray();
Object[] objectD = ObjectUtil.cloneObjectsArray(4);
objectD[0]= orderTickets.getUpdatedAt();
objectD[1]= orderTickets.getOrderTicketsId();
objectD[2]= strTime;
......@@ -727,6 +727,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
LocalDateTime now = LocalDateTime.now();
String lock = "order_lock:" + syncOrderParam.getOrderCode();
if (!redisLockUtil.tryLock(lock, 1, 5)) {
log.error("参数错误");
return "fail";//参数错误
}
......@@ -734,23 +735,27 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
KylinOrderTicketVo orderTicketData = mongoTemplate.findOne(Query.query(Criteria.where("orderCode").is(syncOrderParam.getOrderCode())), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
if (orderTicketData == null) {
redisLockUtil.unlock(lock);
log.error("订单不存在");
return "fail";//订单不存在
}
if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
if (orderTicketData.getPayCode().equals(syncOrderParam.getCode()) && orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
redisLockUtil.unlock(lock);
log.error("已经支付");
return "success";//已经支付
}
if (!orderTicketData.getPayCode().equals(syncOrderParam.getCode())) {
redisLockUtil.unlock(lock);
log.error("重复支付");
return "fail";//重复支付
}
}
if (orderTicketData.getPriceActual().compareTo(syncOrderParam.getPrice()) != 0) {
redisLockUtil.unlock(lock);
log.error("价格不符");
return "fail";//价格不符
}
......@@ -773,6 +778,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
} else {
log.error("订单号为 {} 的订单正常流程", syncOrderParam.getOrderCode());
orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
orderTickets.setPaymentType(syncOrderParam.getPaymentType());
orderTickets.setPayCode(syncOrderParam.getCode());
......@@ -791,7 +797,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
Object[] objectC = ObjectUtil.cloneObjectsArray();
Object[] objectC = ObjectUtil.cloneObjectsArray(4);
objectC[0]= orderTickets.getUpdatedAt();
objectC[1]= orderTickets.getOrderTicketsId();
objectC[2]= strTime;
......@@ -883,7 +889,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
return "success";
} catch (Exception e) {
log.error("SYNCE ORDER E = " + e.getMessage());
log.error("SYNCE ORDER E = " , e);
e.printStackTrace();
return "fail";
}
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 04ed1b8b
......@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl {
public Boolean orderTicketRefunding(
KylinOrderTicketVo orderInfo, String orderTicketsId,
BigDecimal RefundPriceExpress,
List<String> ticketEntityIds, List<BigDecimal> entitiesPrice,String paymentId
List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId
) {
if (CollectionUtil.isEmpty(ticketEntityIds)) {
return false;
......@@ -81,7 +81,7 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3);
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(
Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
orderObject
......@@ -98,11 +98,11 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
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();
for (String v : ticketEntityIds) {
Object[] objectB = ObjectUtil.cloneObjectsArray();
Object[] objectB = ObjectUtil.cloneObjectsArray(5);
objectB[0] = entitiesTable.getIsPayment();
objectB[1] = entitiesTable.getUpdatedAt();
objectB[2] = v;
......@@ -159,12 +159,12 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefundEntities.setRefundPrice(entitiesPrice.get(i));
kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i));
Object[] objectD = ObjectUtil.cloneObjectsArray();
objectD[0]=kylinOrderRefundEntities.getOrderRefundsEntitiesId();
objectD[1]=kylinOrderRefundEntities.getOrderRefundsId();
objectD[2]=kylinOrderRefundEntities.getRefundPrice();
objectD[3]=kylinOrderRefundEntities.getOrderTicketEntitiesId();
objectD[4]=kylinOrderRefundEntities.getCreatedAt();
Object[] objectD = ObjectUtil.cloneObjectsArray(5);
objectD[0] = kylinOrderRefundEntities.getOrderRefundsEntitiesId();
objectD[1] = kylinOrderRefundEntities.getOrderRefundsId();
objectD[2] = kylinOrderRefundEntities.getRefundPrice();
objectD[3] = kylinOrderRefundEntities.getOrderTicketEntitiesId();
objectD[4] = kylinOrderRefundEntities.getCreatedAt();
sqlsDataD.add(objectD);
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew();
......@@ -184,40 +184,40 @@ public class KylinRefundsStatusServiceImpl {
sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
Object[] objectE = ObjectUtil.cloneObjectsArray();
objectE[0]=paymentId;
objectE[1]=orderStatusTable.getUpdatedAt();
objectE[2]=orderInfo.getOrderTicketsId();
objectE[3]=orderInfo.getChangeDate();
objectE[4]=orderInfo.getChangeDate();
Object[] objectE = ObjectUtil.cloneObjectsArray(5);
objectE[0] = paymentId;
objectE[1] = orderStatusTable.getUpdatedAt();
objectE[2] = orderInfo.getOrderTicketsId();
objectE[3] = orderInfo.getChangeDate();
objectE[4] = orderInfo.getChangeDate();
sqlsDataE.add(objectE);
Object[] objectA = ObjectUtil.cloneObjectsArray();
objectA[0]=orderStatusTable.getStatus();
objectA[1]=orderStatusTable.getUpdatedAt();
objectA[2]=orderInfo.getOrderTicketsId();
objectA[3]=orderInfo.getChangeDate();
objectA[4]=orderInfo.getChangeDate();
Object[] objectA = ObjectUtil.cloneObjectsArray(5);
objectA[0] = orderStatusTable.getStatus();
objectA[1] = orderStatusTable.getUpdatedAt();
objectA[2] = orderInfo.getOrderTicketsId();
objectA[3] = orderInfo.getChangeDate();
objectA[4] = orderInfo.getChangeDate();
sqlsDataA.add(objectA);
Object[] objectC = ObjectUtil.cloneObjectsArray();
objectC[0]=kylinOrderRefunds.getOrderRefundsId();
objectC[1]=kylinOrderRefunds.getOrderTicketsId();
objectC[2]= kylinOrderRefunds.getOrderRefundCode();
objectC[3]=kylinOrderRefunds.getPrice();
objectC[4]=kylinOrderRefunds.getPriceExpress();
objectC[5]=kylinOrderRefunds.getStatus();
objectC[6]=kylinOrderRefunds.getType();
objectC[7]=kylinOrderRefunds.getApplicantId();
objectC[8]=kylinOrderRefunds.getApplicantName();
objectC[9]=kylinOrderRefunds.getApplicantAt();
objectC[10]=kylinOrderRefunds.getReason();
objectC[11]=kylinOrderRefunds.getRefundCate();
objectC[12]=kylinOrderRefunds.getCreatedAt();
Object[] objectC = ObjectUtil.cloneObjectsArray(13);
objectC[0] = kylinOrderRefunds.getOrderRefundsId();
objectC[1] = kylinOrderRefunds.getOrderTicketsId();
objectC[2] = kylinOrderRefunds.getOrderRefundCode();
objectC[3] = kylinOrderRefunds.getPrice();
objectC[4] = kylinOrderRefunds.getPriceExpress();
objectC[5] = kylinOrderRefunds.getStatus();
objectC[6] = kylinOrderRefunds.getType();
objectC[7] = kylinOrderRefunds.getApplicantId();
objectC[8] = kylinOrderRefunds.getApplicantName();
objectC[9] = kylinOrderRefunds.getApplicantAt();
objectC[10] = kylinOrderRefunds.getReason();
objectC[11] = kylinOrderRefunds.getRefundCate();
objectC[12] = kylinOrderRefunds.getCreatedAt();
sqlsDataC.add(objectC);
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;
}
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/DataUtils.java
View file @ 04ed1b8b
......@@ -108,7 +108,7 @@ public class DataUtils {
HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
for (int x = 0; x < vo.getTicketTimeList().size(); 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++) {
KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
if (ticketItem.getType() == 1) {
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/ObjectUtil.java
View file @ 04ed1b8b
package com.liquidnet.service.order.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;
......@@ -25,11 +26,15 @@ public class ObjectUtil {
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, 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<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 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() {
return (LinkedList<Object[]>) linkedListObj.clone();
......@@ -47,16 +52,33 @@ public class ObjectUtil {
return (HashMap<String, Object>) hashMapStringAndObject.clone();
}
public static HashMap<String, Integer> cloneHashMapStringAndInteger() {
return (HashMap<String, Integer>) hashMapStringAndInteger.clone();
}
public static ArrayList<AdamEntersVo> cloneArrayListObject() {
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() {
return linkedMultiValueMapStringAndString.clone();
}
public static Object[] cloneObjectsArray() {
return objectsArray.clone();
public static Object[] cloneObjectsArray(int size) {
objectsArray = new Object[size];
return objectsArray;
}
public static Integer[] cloneInteger2Array() {
return integerArray2.clone();
}
public static BasicDBObject cloneBasicDBObject() {
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java
View file @ 04ed1b8b
......@@ -62,7 +62,10 @@ public class OrderUtils {
performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
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(
......@@ -82,7 +85,10 @@ public class OrderUtils {
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) {
......@@ -128,9 +134,9 @@ public class OrderUtils {
* @param orderId 订单id [需要新增或者修改的订单id]
*/
public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
List<KylinOrderListVo> vo = new ArrayList<>();
List<KylinOrderListVo> redisVo = new ArrayList();
KylinOrderListVo voItem = new KylinOrderListVo();
List<KylinOrderListVo> vo = ObjectUtil.cloneArrayKylinOrderListVo();
List<KylinOrderListVo> redisVo = ObjectUtil.cloneArrayKylinOrderListVo();
KylinOrderListVo voItem = KylinOrderListVo.getNew();
KylinOrderTicketVo data;
if (dataSingle == null) {
data = dataUtils.getOrderTicketVo(orderId);
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/QueueUtils.java
View file @ 04ed1b8b
......@@ -35,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串
*/
public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>();
HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinBuyNoticePartnerServiceImpl.java
View file @ 04ed1b8b
package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -34,11 +35,11 @@ public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNotice
PageInfo<KylinBuyNoticeVo> pageInfoTmp = null;
PageHelper.startPage(1, 20);
List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().eq("status", 1).orderByDesc("sort").orderByDesc("mid"));
List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(Wrappers.lambdaQuery(KylinBuyNotice.class).eq(KylinBuyNotice::getStatus, 1).orderByDesc(KylinBuyNotice::getSort).orderByDesc(KylinBuyNotice::getMid));
List<KylinBuyNoticeVo> kylinBuyNoticeVoList = new ArrayList<>();
for (KylinBuyNotice item : buyNoticeList) {
KylinBuyNoticeVo kylinBuyNoticeVo = new KylinBuyNoticeVo();
KylinBuyNoticeVo kylinBuyNoticeVo = KylinBuyNoticeVo.getNew();
BeanUtils.copyProperties(item, kylinBuyNoticeVo);
kylinBuyNoticeVoList.add(kylinBuyNoticeVo);
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinCheckUserPartnerServiceImpl.java
View file @ 04ed1b8b
package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -14,6 +16,7 @@ import com.liquidnet.service.kylin.entity.KylinCheckUser;
import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
import com.liquidnet.service.platform.utils.DataUtils;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.mongodb.BasicDBObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -64,18 +67,14 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Override
public ResponseDto<String> del(String merchantId, String checkUserId) {
try {
KylinCheckUser checkUser = new KylinCheckUser();
KylinCheckUser checkUser = KylinCheckUser.getNew();
checkUser.setUpdatedAt(LocalDateTime.now());
checkUser.setStatus(0);
checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId));
checkUserMapper.update(checkUser, Wrappers.lambdaUpdate(KylinCheckUser.class).eq(KylinCheckUser::getCheckUserId, checkUserId));
dataUtils.delCheckUserRedis(checkUserId);
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("status", 0);
// BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
// mongoTemplate.getCollection(CheckUserVo.class.getSimpleName()).updateOne(
// Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
// obj
mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserVo.class, KylinCheckUserVo.class.getSimpleName());
return ResponseDto.success("删除成功");
} catch (Exception e) {
......@@ -86,7 +85,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Override
public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
try {
KylinCheckUser checkUser = new KylinCheckUser();
KylinCheckUser checkUser = KylinCheckUser.getNew();
checkUser.setName(name);
checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
checkUser.setMobile(mobile);
......@@ -96,7 +95,7 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
checkUser.setStatus(1);
checkUserMapper.insert(checkUser);
KylinCheckUserVo kylinCheckUserVo = new KylinCheckUserVo();
KylinCheckUserVo kylinCheckUserVo = KylinCheckUserVo.getNew();
BeanUtils.copyProperties(checkUser, kylinCheckUserVo);
mongoTemplate.insert(kylinCheckUserVo, KylinCheckUserVo.class.getSimpleName());
......@@ -109,15 +108,15 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
@Override
public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
try {
KylinCheckUser checkUser = new KylinCheckUser();
KylinCheckUser checkUser = KylinCheckUser.getNew();
checkUser.setName(name);
if(null!=pwd) {
if (null != pwd) {
checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
}
checkUser.setMobile(mobile);
checkUser.setUpdatedAt(LocalDateTime.now());
checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("check_user_id", checkUserId).eq("merchant_id", merchantId));
BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(checkUser));
checkUserMapper.update(checkUser, Wrappers.lambdaUpdate(KylinCheckUser.class).eq(KylinCheckUser::getCheckUserId, checkUserId).eq(KylinCheckUser::getMerchantId, merchantId));
BasicDBObject obj = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(checkUser));
mongoTemplate.getCollection(KylinCheckUserVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("checkUserId").is(checkUserId)).getQueryObject(),
obj
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinCheckUserPerformancesPartnerServiceImpl.java
View file @ 04ed1b8b
package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -79,7 +80,7 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
if (null == item.getCanDownTime()) {
return ResponseDto.failure(ErrorMapping.get(20101));
}
KylinCheckUserPerformances checkUserPerformances = new KylinCheckUserPerformances();
KylinCheckUserPerformances checkUserPerformances = KylinCheckUserPerformances.getNew();
checkUserPerformances.setCheckUserId(param.getCheckUserId());
checkUserPerformances.setCanDownTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(item.getCanDownTime()));
checkUserPerformances.setPerformanceId(item.getPerformanceId());
......@@ -90,11 +91,11 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
}
mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(param.getCheckUserId())), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
KylinCheckUserPerformanceVo userPerformanceVo = KylinCheckUserPerformanceVo.getNew();
List<CheckPerformanceRelationParam> performanceRelationParamsList = new ArrayList<>();
List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", param.getCheckUserId()));
List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(Wrappers.lambdaQuery(KylinCheckUserPerformances.class).eq(KylinCheckUserPerformances::getCheckUserId, param.getCheckUserId()));
for (KylinCheckUserPerformances item : data) {
CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
CheckPerformanceRelationParam performanceRelationParam = CheckPerformanceRelationParam.getNew();
performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceRelationParam.setPerformanceId(item.getPerformanceId());
performanceRelationParamsList.add(performanceRelationParam);
......@@ -115,15 +116,15 @@ public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<Ky
public ResponseDto<String> delPerformance(List<String> performanceIds, String checkUserId) {
try {
for (String performanceId : performanceIds) {
checkUserPerformancesMapper.delete(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", checkUserId).eq("performance_id", performanceId));
checkUserPerformancesMapper.delete(Wrappers.lambdaUpdate(KylinCheckUserPerformances.class).eq(KylinCheckUserPerformances::getCheckUserId, checkUserId).eq(KylinCheckUserPerformances::getPerformanceId, performanceId));
}
mongoTemplate.remove(Query.query(Criteria.where("checkUserId").is(checkUserId)), KylinCheckUserPerformanceVo.class, KylinCheckUserPerformanceVo.class.getSimpleName());
KylinCheckUserPerformanceVo userPerformanceVo = new KylinCheckUserPerformanceVo();
KylinCheckUserPerformanceVo userPerformanceVo = KylinCheckUserPerformanceVo.getNew();
List<CheckPerformanceRelationParam> performanceRelationParamsList = new ArrayList<>();
List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(new UpdateWrapper<KylinCheckUserPerformances>().eq("check_user_id", checkUserId));
List<KylinCheckUserPerformances> data = checkUserPerformancesMapper.selectList(Wrappers.lambdaUpdate(KylinCheckUserPerformances.class).eq(KylinCheckUserPerformances::getCheckUserId, checkUserId));
for (KylinCheckUserPerformances item : data) {
CheckPerformanceRelationParam performanceRelationParam = new CheckPerformanceRelationParam();
CheckPerformanceRelationParam performanceRelationParam = CheckPerformanceRelationParam.getNew();
performanceRelationParam.setCanDownTime(item.getCanDownTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceRelationParam.setPerformanceId(item.getPerformanceId());
performanceRelationParamsList.add(performanceRelationParam);
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @ 04ed1b8b
package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -23,6 +24,7 @@ import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
import com.liquidnet.service.platform.utils.DataUtils;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.liquidnet.service.platform.utils.PerformanceVoTask;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j;
......@@ -126,7 +128,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
try {
step1Param.setPerformancesId(performanceId);
PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
BeanUtils.copyProperties(step1Param, performancePartnerVo);
performancePartnerVo.setIsTrueName(0);
performancePartnerVo.setLimitCount(0);
......@@ -164,7 +166,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
}
step1Param.setPerformancesId(performanceId);
PerformancePartnerVo performancePartnerVo = new PerformancePartnerVo();
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
BeanUtils.copyProperties(step1Param, performancePartnerVo);
performancePartnerVo.setCreatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performancePartnerVo.setUpdatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -179,14 +181,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
performancePartnerVo.setStatusSell(data.getStatusSell());
performancePartnerVo.setRoadShowId(data.getRoadShowId());
performancePartnerVo.setProjectId(data.getProjectId());
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performancePartnerVo));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(performancePartnerVo));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
object
);
} else { // 无修改记录
KylinPerformanceStatus statusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performanceId", performanceId));
KylinPerformanceRelations relationsData = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performancesId", performanceId));
KylinPerformanceStatus statusData = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performanceId));
KylinPerformanceRelations relationsData = performanceRelationsMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getPerformanceId, performanceId));
performancePartnerVo.setIsTrueName(statusData.getIsTrueName());
performancePartnerVo.setLimitCount(statusData.getLimitCount());
performancePartnerVo.setStatusSell(statusData.getStatusSell());
......@@ -208,11 +210,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
PerformancePartnerVo data = mongoTemplate.findOne(
Query.query(Criteria.where("performancesId").is(performancesId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()
);
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (data == null) {
return ResponseDto.failure(ErrorMapping.get(20104));
}
if(null!=performanceStatus) {
if (null != performanceStatus) {
data.setStatus(performanceStatus.getStatus());
}
return ResponseDto.success(data);
......@@ -224,12 +226,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
// 无 performancesId 则 创建
if (step2Param.getPerformancesId().isEmpty()) {
} else { // 获取 create 数据 status = 0 或 无数据 创建
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", step2Param.getPerformancesId()));
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, step2Param.getPerformancesId()));
if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
result = createStep2(step2Param);
} else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9 ) {// 修改
} else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9) {// 修改
result = updateStep2(step2Param);
}else if(performanceStatus.getStatus() == 10){
} else if (performanceStatus.getStatus() == 10) {
result = ResponseDto.failure("演出已结束不可修改");
}
}
......@@ -253,7 +255,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
}
//演出修改数据
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("isTrueName", step2Param.getIsTrueName());
map.put("limitCount", step2Param.getLimitCount());
map.put("createdAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -265,7 +267,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
map.put("status", 1);
map.put("isCreateSave", 0);
map.put("auditStatus", 0);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
object
......@@ -283,22 +285,22 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} else {
KylinPerformanceMisVo kylinPerformanceMisVo = performanceVoTask.getPerformanceMisVo(performanceId);
HashMap<String, Object> mapSql = new HashMap<>();
HashMap<String, Object> mapSql = ObjectUtil.cloneHashMapStringAndObject();
mapSql.put("isCreateSave", 0);
mapSql.put("rejectTxt", "");
mapSql.put("status", 1);
mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceVoTask.createPerformanceMySql(performanceId, mapSql, kylinPerformanceMisVo, createdAt);
KylinPerformances performances = new KylinPerformances();
KylinPerformances performances = KylinPerformances.getNew();
performances.setAuditTime(LocalDateTime.now());
performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
performancesMapper.update(performances, Wrappers.lambdaQuery(KylinPerformances.class).eq(KylinPerformances::getPerformancesId, performanceId));
}
return ResponseDto.success("操作成功");
} else { //保存
map.put("status", 0);
map.put("isCreateSave", 1);
map.put("auditStatus", -1);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
object
......@@ -328,7 +330,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
}
//演出修改数据
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("isTrueName", step2Param.getIsTrueName());
map.put("limitCount", step2Param.getLimitCount());
map.put("createdAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -344,7 +346,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
map.put("auditStatus", 1);
map.put("status", 9);
}
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
object
......@@ -362,19 +364,19 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} else {
KylinPerformanceMisVo kylinPerformanceMisVo = performanceVoTask.getPerformanceMisVo(performanceId);
HashMap<String, Object> mapSql = new HashMap<>();
HashMap<String, Object> mapSql = ObjectUtil.cloneHashMapStringAndObject();
mapSql.put("rejectTxt", "");
mapSql.put("status", map.get("status"));
mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
KylinPerformances performances = new KylinPerformances();
KylinPerformances performances = KylinPerformances.getNew();
performances.setAuditTime(LocalDateTime.now());
performances.setNoticeImage(kylinPerformanceMisVo.getNoticeImage());
performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performancesMapper.update(performances, Wrappers.lambdaQuery(KylinPerformances.class).eq(KylinPerformances::getPerformancesId, performanceId));
KylinPerformanceStatus performanceStatus = KylinPerformanceStatus.getNew();
performanceStatus.setAuditStatus((int) map.get("auditStatus"));
performanceStatus.setIsTrueName(step2Param.getIsTrueName());
performanceStatus.setLimitCount(step2Param.getLimitCount());
performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
performanceStatusMapper.update(performanceStatus, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performanceId));
//提示：票种价格、售票时间、票种购票限制 直接生效 (演出购票限制，购票须知 演出是否实名 票种缺货登记 票种是否电子票 票种是否快递票 票种最低购买张数 票种是否显示二维码)
List<TicketTimesTicketCreatePartnerVo> timeList = kylinPerformanceMisVo.getTicketTimes();
......@@ -383,7 +385,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
for (KylinTicketPartnerVo ticketItem : ticketList) {
//修改 redis库存
if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES_INVENTORY + ticketItem.getTicketsId() + ":" + KylinRedisConst.SURPLUS_GENERAL)) {
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId()));
int changeGeneral = ticketItem.getTotalGeneral() - ticketStatus.getTotalGeneral();
int changeExchange = ticketItem.getTotalExchange() - ticketStatus.getTotalExchange();
log.debug("ticketItem.getTotalGeneral() = " + ticketItem.getTotalGeneral());
......@@ -392,7 +394,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
dataUtils.changeSurplusExchange(ticketItem.getTicketsId(), changeExchange);
}
//修改 mysql 库存
KylinTicketStatus inventory = new KylinTicketStatus();
KylinTicketStatus inventory = KylinTicketStatus.getNew();
inventory.setTotalExchange(ticketItem.getTotalExchange());
inventory.setTotalGeneral(ticketItem.getTotalGeneral());
inventory.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
......@@ -405,7 +407,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
inventory.setQrCodeShowTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getQrCodeShowTime()));
//修改 mysql 售卖时间
KylinTickets ticketSellTime = new KylinTickets();
KylinTickets ticketSellTime = KylinTickets.getNew();
ticketSellTime.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEnd()));
ticketSellTime.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeStart()));
ticketSellTime.setAdvanceMinuteMember(null);
......@@ -414,9 +416,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
//修改 价格
ticketSellTime.setPrice(ticketItem.getPrice());
ticketSellTime.setPriceDiscountMember(null);
ticketsMapper.update(ticketSellTime, new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketItem.getTicketsId()));
ticketsMapper.update(ticketSellTime, Wrappers.lambdaQuery(KylinTickets.class).eq(KylinTickets::getTicketsId, ticketItem.getTicketsId()));
//修改 mysql 购票限购
ticketStatusMapper.update(inventory, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketItem.getTicketsId()));
ticketStatusMapper.update(inventory, Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketItem.getTicketsId()));
}
}
performanceVoTask.performanceVoStatus(performanceId);
......@@ -425,7 +427,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} else { //保存
map.put("status", 0);
map.put("auditStatus", -1);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
object
......@@ -450,19 +452,19 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
List<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<TicketTimesTicketCreatePartnerVo>();
for (KylinTicketTimesPartnerVo ticketTimes : kylinTicketTimesPartnerVos) {
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = TicketTimesTicketCreatePartnerVo.getNew();
BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
List<KylinTicketPartnerVo> kylinTicketPartnerVos = ticketsPartnerService.getTicketMongoList(ticketTimes.getTicketTimesId());
ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos);
ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
}
PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
PerformanceStep2Param performanceStep2Param = PerformanceStep2Param.getNew();
BeanUtils.copyProperties(data, performanceStep2Param);
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
if(null!=performanceStatus) {
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (null != performanceStatus) {
performanceStep2Param.setStatus(performanceStatus.getStatus());
}else{
} else {
performanceStep2Param.setStatus(-1);
}
......@@ -473,41 +475,41 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override
public ResponseDto<String> onLinePerformance(String performancesId) {
try {
KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (!(performanceStatusData.getStatus() == 3 || performanceStatusData.getStatus() == 7)) {
return ResponseDto.failure(ErrorMapping.get(20110));
}
// mysql
LocalDateTime updatedAt = LocalDateTime.now();
KylinPerformanceStatus performanceStatusUpdate = new KylinPerformanceStatus();
KylinPerformanceStatus performanceStatusUpdate = KylinPerformanceStatus.getNew();
performanceStatusUpdate.setStatus(6);
performanceStatusUpdate.setUpdatedAt(updatedAt);
performanceStatusMapper.update(performanceStatusUpdate
, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
//场次
List<KylinTicketTimeRelation> ticketTimeRelation = ticketTimeRelationMapper.selectList(
new UpdateWrapper<KylinTicketTimeRelation>().eq("performance_id", performancesId)
Wrappers.lambdaQuery(KylinTicketTimeRelation.class).eq(KylinTicketTimeRelation::getPerformanceId, performancesId)
);
for (KylinTicketTimeRelation ticketTimeRelationItem : ticketTimeRelation) {
KylinTicketTimes ticketTimes = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimeRelationItem.getTimesId()).eq("status", 1));
KylinTicketTimes ticketTimes = ticketTimesMapper.selectOne(Wrappers.lambdaQuery(KylinTicketTimes.class).eq(KylinTicketTimes::getTicketTimesId, ticketTimeRelationItem.getTimesId()).eq(KylinTicketTimes::getStatus, 1));
//票
List<KylinTicketRelations> ticketRelations = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", ticketTimes.getTicketTimesId()));
List<KylinTicketRelations> ticketRelations = ticketRelationsMapper.selectList(Wrappers.lambdaQuery(KylinTicketRelations.class).eq(KylinTicketRelations::getTimesId, ticketTimes.getTicketTimesId()));
for (KylinTicketRelations ticketRelationsItem : ticketRelations) {
KylinTicketStatus ticketStatusUpdate = new KylinTicketStatus();
KylinTicketStatus ticketStatusUpdate = KylinTicketStatus.getNew();
ticketStatusUpdate.setStatus(9);
ticketStatusUpdate.setUpdatedAt(updatedAt);
ticketStatusMapper.update(ticketStatusUpdate
, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelationsItem.getTicketId()).in("status", 3,6,8,9,10));
, Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketRelationsItem.getTicketId()).in(KylinTicketStatus::getStatus, 3, 6, 8, 9, 10));
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("status", 9);
map.put("updatedAt", updatedAt);
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketRelationsItem.getTicketId()).and("status").in(3,6,8,9,10)).getQueryObject(),
new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
Query.query(Criteria.where("ticketsId").is(ticketRelationsItem.getTicketId()).and("status").in(3, 6, 8, 9, 10)).getQueryObject(),
ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map))
);
}
}
......@@ -515,7 +517,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
performanceVoTask.performanceVoStatus(performancesId);
return ResponseDto.success("上线成功");
} catch (Exception e) {
log.debug("上线失败",e);
log.debug("上线失败", e);
return ResponseDto.failure(ErrorMapping.get(20108));
}
}
......@@ -523,15 +525,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override
public ResponseDto<String> outLinePerformance(String performancesId) {
try {
KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (performanceStatusData.getStatus() >= 3 && performanceStatusData.getStatus() != 4 && performanceStatusData.getStatus() != 7 && performanceStatusData.getStatus() != 10) {//未提审||被拒绝
LocalDateTime updatedAt = LocalDateTime.now();
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
KylinPerformanceStatus performanceStatus = KylinPerformanceStatus.getNew();
performanceStatus.setStatus(7);
performanceStatus.setUpdatedAt(updatedAt);
performanceStatusMapper.update(performanceStatus
, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
performanceVoTask.performanceVoStatus(performancesId);
return ResponseDto.success("下线成功");
......@@ -539,7 +541,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
return ResponseDto.failure(ErrorMapping.get(20111));
}
} catch (Exception e) {
log.debug("下线失败",e);
log.debug("下线失败", e);
return ResponseDto.failure(ErrorMapping.get(20109));
}
}
......@@ -559,7 +561,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
for (KylinTicketTimesPartnerVo timeItem : kylinTicketTimesPartnerVos) {
//复制场次
String timesId = timeItem.getTicketTimesId();
timeItem.setTicketTimesId(IDGenerator.nextSnowId().toString());
timeItem.setTicketTimesId(IDGenerator.nextSnowId());
timeItem.setPerformancesId(performancePartnerVo.getPerformancesId());
mongoTemplate.insert(timeItem, KylinTicketTimesPartnerVo.class.getSimpleName());
......@@ -601,7 +603,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
//处理Vo
List<KylinPerformancePartnerListVo> voList = new ArrayList<>();
for (PerformancePartnerVo item : performancePartnerVo) {
KylinPerformancePartnerListVo voData = new KylinPerformancePartnerListVo();
KylinPerformancePartnerListVo voData = KylinPerformancePartnerListVo.getNew();
voData.setStatus0Data(item);
voList.add(voData);
}
......@@ -636,10 +638,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
public ResponseDto<String> withdraw(String performancesId) {
try {
//mysql auditStatus
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (performanceStatus != null && performanceStatus.getAuditStatus() == 0) {
KylinPerformanceStatus data1 = new KylinPerformanceStatus();
HashMap<String, Object> map = new HashMap<>();
KylinPerformanceStatus data1 = KylinPerformanceStatus.getNew();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
if (performanceStatus.getStatus() >= 3) {//通过审核
data1.setAuditStatus(1);
data1.setStatus(null);
......@@ -654,8 +656,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
data1.setStatus(null);
map.put("auditStatus", 2);
}
performanceStatusMapper.update(data1, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
performanceStatusMapper.update(data1, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
object
......@@ -672,13 +674,13 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override
public List<PerformanceOrderStatisticalVo> getPerformanceOrderStatisticalList(String performancesId) {
PerformanceOrderStatisticalDao countBean = new PerformanceOrderStatisticalDao();
PerformanceOrderStatisticalDao countBean = PerformanceOrderStatisticalDao.getNew();
countBean.setTitle("总计：");
List<PerformanceOrderStatisticalVo> voList = new ArrayList<>();
List<PerformanceOrderStatisticalDao> dtoList = performancesMapper.getPerformanceOrderStatisticalList(performancesId);
dtoList.forEach(dto -> {
PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
PerformanceOrderStatisticalVo vo = PerformanceOrderStatisticalVo.getNew();
BeanUtil.copy(dto, vo);
voList.add(vo);
......@@ -693,7 +695,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
countBean.setTotalPayingNumber(countBean.getTotalPayingNumber().add(dto.getTotalPayingNumber()));
countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
});
PerformanceOrderStatisticalVo vo = new PerformanceOrderStatisticalVo();
PerformanceOrderStatisticalVo vo = PerformanceOrderStatisticalVo.getNew();
BeanUtil.copy(countBean, vo);
voList.add(vo);
return voList;
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java
View file @ 04ed1b8b
......@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.service.impl.partner;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
......@@ -16,6 +17,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformanceStatusMapper;
import com.liquidnet.service.kylin.mapper.KylinTicketTimeRelationMapper;
import com.liquidnet.service.kylin.mapper.KylinTicketTimesMapper;
import com.liquidnet.service.kylin.service.partner.IKylinTicketTimesPartnerService;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument;
......@@ -63,7 +65,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
ResponseDto<KylinTicketTimesPartnerVo> ticketTimesPartnerVo = null;
//获取演出状态
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId()));
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId()));
if (null == performanceStatus) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam);
} else if(performanceStatus.getAuditStatus()==0){
......@@ -80,7 +82,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
public ResponseDto<KylinTicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam) {
try {
// 获取 主键id
String ticketTimesId = IDGenerator.nextSnowId().toString();
String ticketTimesId = IDGenerator.nextSnowId();
// 获取 当前时间 -> 创建时间
LocalDateTime createdAt = LocalDateTime.now();
// 标题
......@@ -97,7 +99,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
title = useStart + "-" + useEnd;
}
// mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
if(createTicketTimesParam.getType() == 2) {
......@@ -141,7 +143,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
}
// mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
kylinTicketTimesPartnerVo.setTicketTimesId(ticketTimesId);
kylinTicketTimesPartnerVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -169,24 +171,23 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
return ResponseDto.failure(ErrorMapping.get(20106));
}
KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimesId));
Wrappers.lambdaQuery(KylinTicketTimeRelation.class).eq(KylinTicketTimeRelation::getTimesId, ticketTimesId));
if (ticketTimeRelation != null) {
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", ticketTimeRelation.getPerformanceId()));
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, ticketTimeRelation.getPerformanceId()));
if(performanceStatus.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20101));
}
if (performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map.put("status", 0);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
Document doc = mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(),
object,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
object
);
return ResponseDto.success("删除成功");
} else {
......@@ -214,7 +215,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
createTicketTimesParam.setTitle(title);
// mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = KylinTicketTimesPartnerVo.getNew();
BeanUtils.copyProperties(createTicketTimesParam, kylinTicketTimesPartnerVo);
kylinTicketTimesPartnerVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
kylinTicketTimesPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -222,7 +223,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
kylinTicketTimesPartnerVo.setStatus(null);
BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinTicketTimesPartnerVo)));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinTicketTimesPartnerVo)));
Document doc = mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("ticketTimesId").is(createTicketTimesParam.getTicketTimesId())).getQueryObject(),
object,
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 04ed1b8b
package com.liquidnet.service.platform.service.impl.partner;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
......@@ -14,6 +15,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.liquidnet.service.platform.utils.PerformanceVoTask;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions;
......@@ -74,7 +76,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
if (null != timesPartnerVo) {
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesPartnerVo.getPerformancesId()));
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, timesPartnerVo.getPerformancesId()));
if (null == performanceStatus) {
ticketPartnerVo = createTicket(ticketCreateParam);
} else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
......@@ -98,7 +100,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
ticketCreateParam.setTicketsId(ticketsId);
// mongo 操作
KylinTicketPartnerVo kylinTicketPartnerVo = new KylinTicketPartnerVo();
KylinTicketPartnerVo kylinTicketPartnerVo = KylinTicketPartnerVo.getNew();
BeanUtils.copyProperties(ticketCreateParam, kylinTicketPartnerVo);
kylinTicketPartnerVo.setTicketsId(ticketsId);
kylinTicketPartnerVo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(createdAt));
......@@ -112,12 +114,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setStatus(0);
kylinTicketPartnerVo.setDefault();
if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress() == null ? "" : ticketCreateParam.getDescribeExpress());
} else {
kylinTicketPartnerVo.setDescribeExpress("");
}
if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic() == null ? "" : ticketCreateParam.getDescribeElectronic());
} else {
kylinTicketPartnerVo.setDescribeElectronic("");
}
......@@ -150,7 +152,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
ticketCreateParam.setTicketsId(ticketsId);
// mongo 操作
KylinTicketPartnerVo kylinTicketPartnerVo = new KylinTicketPartnerVo();
KylinTicketPartnerVo kylinTicketPartnerVo = KylinTicketPartnerVo.getNew();
BeanUtils.copyProperties(ticketCreateParam, kylinTicketPartnerVo);
kylinTicketPartnerVo.setTicketsId(ticketsId);
kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -162,12 +164,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress() == null ? "" : ticketCreateParam.getDescribeExpress());
} else {
kylinTicketPartnerVo.setDescribeExpress("");
}
if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic() == null ? "" : ticketCreateParam.getDescribeElectronic());
} else {
kylinTicketPartnerVo.setDescribeElectronic("");
}
......@@ -208,7 +210,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
String ticketId = ticketCreateParam.getTicketsId();
LocalDateTime updatedAt = LocalDateTime.now();
// mongo 操作
KylinTicketPartnerVo kylinTicketPartnerVo = new KylinTicketPartnerVo();
KylinTicketPartnerVo kylinTicketPartnerVo = KylinTicketPartnerVo.getNew();
BeanUtils.copyProperties(ticketCreateParam, kylinTicketPartnerVo);
kylinTicketPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
kylinTicketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
......@@ -216,10 +218,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setTimesId(null);
kylinTicketPartnerVo.setStatus(null);
if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress()==null?"":ticketCreateParam.getDescribeExpress());
kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribeExpress() == null ? "" : ticketCreateParam.getDescribeExpress());
}
if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic() == null ? "" : ticketCreateParam.getDescribeElectronic());
}
kylinTicketPartnerVo.setDefault();
......@@ -230,7 +232,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
}
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinTicketPartnerVo));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(kylinTicketPartnerVo));
Document doc = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
object,
......@@ -251,15 +253,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
LocalDateTime updatedAt = LocalDateTime.now();
KylinTicketRelations ticketRelations = ticketRelationsMapper.selectOne(
new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", ticketsId));
Wrappers.lambdaQuery(KylinTicketRelations.class).eq(KylinTicketRelations::getTicketId, ticketsId));
if (ticketRelations == null) {
mongoTemplate.remove(Query.query(Criteria.where("ticketsId").is(ticketsId)), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
return ResponseDto.success("删除成功");
}
KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketRelations.getTimesId()));
Wrappers.lambdaQuery(KylinTicketTimeRelation.class).eq(KylinTicketTimeRelation::getTimesId, ticketRelations.getTimesId()));
PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformanceId())),
PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
......@@ -267,19 +268,18 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
}
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", ticketTimeRelation.getPerformanceId()));
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, ticketTimeRelation.getPerformanceId()));
if (performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {//未提审||被拒绝
// mongo 操作
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
map.put("status", -1);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
Document doc = mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
object,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
object
);
return ResponseDto.success("删除成功");
} else {
......@@ -320,14 +320,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
public boolean submitTicketByTimes(String timesId, Integer status) {
LocalDateTime updatedAt = LocalDateTime.now();
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
if (null == status) {
map.put("status", 1);
} else {
map.put("status", status);
}
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("timesId").is(timesId).and("status").nin(-2, 7)).getQueryObject(),
object
......@@ -355,18 +355,18 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
public ResponseDto<String> onLine(String ticketsId, String performancesId) {
try {
LocalDateTime updatedAt = LocalDateTime.now();
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketsId));
if (ticketStatus.getStatus() >= 3 && ticketStatus.getStatus() != 4 && ticketStatus.getStatus() != 6) {//未提审||被拒绝
//mysql
KylinTicketStatus changeStatus = new KylinTicketStatus();
KylinTicketStatus changeStatus = KylinTicketStatus.getNew();
changeStatus.setUpdatedAt(updatedAt);
changeStatus.setStatus(9);
ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
ticketStatusMapper.update(changeStatus, Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketsId));
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("status", 9);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
object
......@@ -387,17 +387,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
public ResponseDto<String> outLine(String ticketsId, String performancesId) {
try {
LocalDateTime updatedAt = LocalDateTime.now();
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
KylinTicketStatus ticketStatus = ticketStatusMapper.selectOne(Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketsId));
if (ticketStatus.getStatus() >= 3 && ticketStatus.getStatus() != 4 && ticketStatus.getStatus() != 7) {//未提审||被拒绝
//mysql
KylinTicketStatus changeStatus = new KylinTicketStatus();
KylinTicketStatus changeStatus = KylinTicketStatus.getNew();
changeStatus.setUpdatedAt(updatedAt);
changeStatus.setStatus(7);
ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketsId));
ticketStatusMapper.update(changeStatus, Wrappers.lambdaQuery(KylinTicketStatus.class).eq(KylinTicketStatus::getTicketId, ticketsId));
// mongo 操作
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = ObjectUtil.cloneHashMapStringAndObject();
map.put("status", 7);
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
BasicDBObject object = ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
object
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java 0 → 100644
View file @ 04ed1b8b
package com.liquidnet.service.platform.utils;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.mongodb.BasicDBObject;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: ObjectUtil
* @Package com.liquidnet.service.dragon.utils
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/7/21 16:00
*/
@Component
public class ObjectUtil {
private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
private static final BasicDBObject basicDBObject = new BasicDBObject();
public static HashMap<String, Object> cloneHashMapStringAndObject() {
return (HashMap<String, Object>) hashMapStringAndObject.clone();
}
public static BasicDBObject cloneBasicDBObject() {
return (BasicDBObject) basicDBObject.clone();
}
}
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/QueueUtils.java
View file @ 04ed1b8b
package com.liquidnet.service.platform.utils;
import com.liquidnet.commons.lang.util.CollectionUtil;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
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.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
......@@ -36,7 +36,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串
*/
public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>();
HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
}
......
liquidnet-bus-service/liquidnet-service-sweet/pom.xml
View file @ 04ed1b8b
......@@ -54,4 +54,13 @@
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualAppletDto.java
View file @ 04ed1b8b
package com.liquidnet.service.sweet.dto;
import com.liquidnet.service.sweet.entity.SweetManualSort;
import lombok.Data;
import java.io.Serializable;
@Data
public class SweetManualAppletDto implements Serializable {
public class SweetManualAppletDto implements Serializable ,Cloneable{
private String manualId;
private String performancesId;
private String title;
......@@ -17,4 +18,14 @@ public class SweetManualAppletDto implements Serializable {
private String longitude;
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistList2Dto.java
View file @ 04ed1b8b
......@@ -6,8 +6,17 @@ import java.io.Serializable;
import java.util.List;
@Data
public class SweetManualArtistList2Dto implements Serializable {
public class SweetManualArtistList2Dto implements Serializable ,Cloneable {
private List<SweetManualArtistListDto> data;
private List<String> date;
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListDto.java
View file @ 04ed1b8b
......@@ -6,7 +6,7 @@ import java.io.Serializable;
import java.util.ArrayList;
@Data
public class SweetManualArtistListDto implements Serializable {
public class SweetManualArtistListDto implements Serializable,Cloneable {
private String manualRelationId;
private String artistId;
......@@ -19,4 +19,13 @@ public class SweetManualArtistListDto implements Serializable {
private String signatureEnd;
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistStageListDto.java
View file @ 04ed1b8b
......@@ -6,6 +6,15 @@ import java.io.Serializable;
import java.util.ArrayList;
@Data
public class SweetManualArtistStageListDto implements Serializable {
public class SweetManualArtistStageListDto implements Serializable ,Cloneable{
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualDto.java
View file @ 04ed1b8b
......@@ -5,7 +5,7 @@ import lombok.Data;
import java.io.Serializable;
@Data
public class SweetManualDto implements Serializable {
public class SweetManualDto implements Serializable ,Cloneable{
private String performancesId;
private String title;
......@@ -16,4 +16,13 @@ public class SweetManualDto implements Serializable {
private Integer status;
private Integer manualStatus;
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetArtists.java
View file @ 04ed1b8b
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetArtists implements Serializable {
public class SweetArtists implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -64,5 +64,12 @@ public class SweetArtists implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManual.java
View file @ 04ed1b8b
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetManual implements Serializable {
public class SweetManual implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -54,5 +54,12 @@ public class SweetManual implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualArtists.java
View file @ 04ed1b8b
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetManualArtists implements Serializable {
public class SweetManualArtists implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -79,5 +79,12 @@ public class SweetManualArtists implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualNotify.java
View file @ 04ed1b8b
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetManualNotify implements Serializable {
public class SweetManualNotify implements Serializable ,Cloneable{
private static final long serialVersionUID = 1L;
......@@ -59,5 +59,12 @@ public class SweetManualNotify implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualSort.java
View file @ 04ed1b8b
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetManualSort implements Serializable {
public class SweetManualSort implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -44,5 +44,12 @@ public class SweetManualSort implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetRichtext.java
View file @ 04ed1b8b
......@@ -2,8 +2,10 @@ package com.liquidnet.service.sweet.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetRichtext implements Serializable {
public class SweetRichtext implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
......@@ -69,5 +71,12 @@ public class SweetRichtext implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetStage.java
View file @ 04ed1b8b
......@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SweetStage implements Serializable {
public class SweetStage implements Serializable,Cloneable {
private static final long serialVersionUID = 1L;
......@@ -49,5 +49,12 @@ public class SweetStage implements Serializable {
*/
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();
}
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java
View file @ 04ed1b8b
......@@ -57,7 +57,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
@Override
public ResponseDto<Boolean> add(String picUrl, String name, String pinyin, String describe) {
try {
SweetArtists sweetArtists = new SweetArtists();
SweetArtists sweetArtists = SweetArtists.getNew();
sweetArtists.setArtistsId(IDGenerator.nextSnowId());
sweetArtists.setPicUrl(picUrl);
sweetArtists.setName(name);
......@@ -83,7 +83,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
@Override
public ResponseDto<Boolean> change(String artistsId, String picUrl, String name, String pinyin, String describe) {
try {
SweetArtists sweetArtists = new SweetArtists();
SweetArtists sweetArtists = SweetArtists.getNew();
sweetArtists.setPicUrl(picUrl);
sweetArtists.setName(name);
sweetArtists.setPinyin(pinyin);
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualArtistsServiceImpl.java
View file @ 04ed1b8b
......@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
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.IDGenerator;
import com.liquidnet.service.base.ResponseDto;
......@@ -42,7 +43,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
PageInfo<SweetManualArtistListDto> pageInfoTmp;
try {
PageHelper.startPage(page, size);
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("manualId", manualId);
List<SweetManualArtistListDto> voList = sweetManualArtistsMapper.getManualList(map);
pageInfoTmp = new PageInfo(voList);
......@@ -56,7 +57,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override
public ResponseDto<Boolean> add(String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
try {
SweetManualArtists sweetManualNotify = new SweetManualArtists();
SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
sweetManualNotify.setManualId(manualId);
sweetManualNotify.setStageId(stageId);
......@@ -78,7 +79,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override
public ResponseDto<SweetManualArtistListDto> details(String manualRelationId) {
try {
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("manualRelationId", manualRelationId);
SweetManualArtistListDto dto = sweetManualArtistsMapper.getManualDetails(map);
return ResponseDto.success(dto);
......@@ -91,7 +92,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override
public ResponseDto<Boolean> change(String manualRelationId, String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
try {
SweetManualArtists sweetManualNotify = new SweetManualArtists();
SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
sweetManualNotify.setStageId(stageId);
sweetManualNotify.setArtistsId(artistId);
sweetManualNotify.setPerformanceEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceEnd));
......@@ -111,7 +112,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
@Override
public ResponseDto<Boolean> delete(String manualRelationId, String manualId) {
try {
SweetManualArtists sweetManualNotify = new SweetManualArtists();
SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
sweetManualNotify.setStatus(0);
sweetManualNotify.setUpdatedAt(LocalDateTime.now());
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualNotifyServiceImpl.java
View file @ 04ed1b8b
......@@ -49,7 +49,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
@Override
public ResponseDto<Boolean> add(String manualId, String title, String content) {
try {
SweetManualNotify sweetManualNotify = new SweetManualNotify();
SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setManualNotifyId(IDGenerator.nextSnowId());
sweetManualNotify.setManualId(manualId);
sweetManualNotify.setTitle(title);
......@@ -79,7 +79,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
@Override
public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) {
try {
SweetManualNotify sweetManualNotify = new SweetManualNotify();
SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setTitle(title);
sweetManualNotify.setContent(content);
sweetManualNotify.setUpdatedAt(LocalDateTime.now());
......@@ -104,7 +104,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
@Override
public ResponseDto<Boolean> delete(String manualNotifyId) {
try {
SweetManualNotify sweetManualNotify = new SweetManualNotify();
SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setStatus(0);
sweetManualNotify.setUpdatedAt(LocalDateTime.now());
sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId));
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualServiceImpl.java
View file @ 04ed1b8b
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
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.IDGenerator;
import com.liquidnet.service.base.ErrorMapping;
......@@ -44,7 +45,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
PageInfo<SweetManualDto> pageInfoTmp;
try {
PageHelper.startPage(page, size);
HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("title", name);
List<SweetManualDto> voList = sweetManualMapper.getManualList(BeanUtil.convertBeanToMap(map));
for (int i = 0; i < voList.size(); i++) {
......@@ -71,7 +72,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
public ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status) {
try {
int count = sweetManualMapper.selectCount(Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId));
SweetManual sweetManual = new SweetManual();
SweetManual sweetManual = SweetManual.getNew();
if (count > 0) {//修改
sweetManual.setStatus(status);
sweetManual.setUpdatedAt(LocalDateTime.now());
......@@ -94,7 +95,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
@Override
public ResponseDto<Boolean> changeRelease(String manualId, Integer isRelease) {
try {
SweetManual sweetManual = new SweetManual();
SweetManual sweetManual = SweetManual.getNew();
sweetManual.setIsRelease(isRelease);
sweetManual.setUpdatedAt(LocalDateTime.now());
sweetManualMapper.update(sweetManual, Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId));
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualSortServiceImpl.java
View file @ 04ed1b8b
......@@ -43,13 +43,13 @@ public class SweetManualSortServiceImpl extends ServiceImpl<SweetManualSortMappe
try {
int count = sweetManualSortMapper.selectCount(Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId));
if (count > 0) {
SweetManualSort sweetManualSort = new SweetManualSort();
SweetManualSort sweetManualSort = SweetManualSort.getNew();
sweetManualSort.setManualId(manualId);
sweetManualSort.setShowPosition(content);
sweetManualSort.setUpdatedAt(LocalDateTime.now());
sweetManualSortMapper.update(sweetManualSort, Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId));
} else {
SweetManualSort sweetManualSort = new SweetManualSort();
SweetManualSort sweetManualSort = SweetManualSort.getNew();
sweetManualSort.setManualId(manualId);
sweetManualSort.setShowPosition(content);
sweetManualSort.setCreatedAt(LocalDateTime.now());
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetRichtextServiceImpl.java
View file @ 04ed1b8b
......@@ -42,7 +42,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
@Override
public ResponseDto<Boolean> add(String manualId, String details, String local, String pirUrl, Integer type) {
try {
SweetRichtext sweetRichtext = new SweetRichtext();
SweetRichtext sweetRichtext = SweetRichtext.getNew();
sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
sweetRichtext.setManualId(manualId);
if (type == 5) {
......@@ -65,7 +65,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
@Override
public ResponseDto<Boolean> change(String manualId, String details, String local, String pirUrl, Integer type) {
try {
SweetRichtext sweetRichtext = new SweetRichtext();
SweetRichtext sweetRichtext = SweetRichtext.getNew();
sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
sweetRichtext.setManualId(manualId);
sweetRichtext.setDetails(details);
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStageServiceImpl.java
View file @ 04ed1b8b
......@@ -54,7 +54,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
@Override
public ResponseDto<Boolean> add(String name) {
try {
SweetStage sweetStage = new SweetStage();
SweetStage sweetStage = SweetStage.getNew();
sweetStage.setStageId(IDGenerator.nextSnowId());
sweetStage.setTitle(name);
sweetStage.setCreatedAt(LocalDateTime.now());
......@@ -77,7 +77,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
@Override
public ResponseDto<Boolean> change(String name, String stageId) {
try {
SweetStage sweetStage = new SweetStage();
SweetStage sweetStage = SweetStage.getNew();
sweetStage.setTitle(name);
sweetStage.setUpdatedAt(LocalDateTime.now());
sweetStageMapper.update(sweetStage, Wrappers.lambdaUpdate(SweetStage.class).eq(SweetStage::getStageId, stageId));
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @ 04ed1b8b
......@@ -2,6 +2,7 @@ package com.liquidnet.service.sweet.utils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.service.sweet.constant.SweetConstant;
import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
......@@ -64,7 +65,7 @@ public class RedisDataUtils {
//获取电子手册演出详情
public SweetManualAppletDto getAppletPerformance(String manualId) {
List<SweetManualAppletDto> data = getPushList();
SweetManualAppletDto returnData = new SweetManualAppletDto();
SweetManualAppletDto returnData = SweetManualAppletDto.getNew();
for (SweetManualAppletDto item : data) {
if (item.getManualId().equalsIgnoreCase(manualId)) {
returnData = item;
......@@ -76,7 +77,7 @@ public class RedisDataUtils {
public SweetManualArtistList2Dto setTimeList(String manualId,String content) {
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);
List<SweetManualArtistListDto> data = sweetManualArtistsMapper.getManualList(map);
......@@ -93,7 +94,7 @@ public class RedisDataUtils {
//获取舞台
List<SweetManualArtistStageListDto> stageData = sweetManualArtistsMapper.getStageNameList(map);
SweetManualArtistList2Dto returnData = new SweetManualArtistList2Dto();
SweetManualArtistList2Dto returnData = SweetManualArtistList2Dto.getNew();
returnData.setDate(list);
returnData.setData(data);
returnData.setStage(stageData);
......
liquidnet-bus-service/pom.xml
View file @ 04ed1b8b
......@@ -269,5 +269,16 @@
<version>2.3.30</version>
</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>
</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