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

Skip to content

L
liquidnet-bus-v1
Commit 8f5a180d authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

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

parents cf941dd5 3eddecd9
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 187 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberCodeParam.java
View file @ 8f5a180d
......@@ -12,7 +12,7 @@ public class AdamMemberCodeParam implements Serializable {
private static final long serialVersionUID = -7273522103593077617L;
@ApiModelProperty(position = 1, required = true, value = "会员类型ID", example = "1")
private String memberId;
@ApiModelProperty(position = 2, required = true, value = "会员价格ID", example = "101")
@ApiModelProperty(position = 2, required = true, value = "会员价格ID", example = "1")
private String memberPriceId;
@ApiModelProperty(position = 3, required = true, value = "类型:0-用户购买兑换码,1-后台生成兑换码", example = "1")
private Integer type;
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamMemberOrderParam.java
View file @ 8f5a180d
......@@ -16,7 +16,7 @@ public class AdamMemberOrderParam implements Serializable {
@ApiModelProperty(position = 10, required = true, value = "会员ID[50]", example = "1")
@NotBlank
private String memberId;
@ApiModelProperty(position = 11, required = true, value = "会员价格ID", example = "101")
@ApiModelProperty(position = 11, required = true, value = "会员价格ID", example = "1")
@NotBlank
private String memberPriceId;
@ApiModelProperty(position = 12, required = true, value = "购买方式:0-购买会员,1-购买会员码", allowableValues = "0,1")
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/CreateTicketTimesParam.java
View file @ 8f5a180d
......@@ -27,7 +27,6 @@ public class CreateTicketTimesParam implements Serializable {
private LocalDateTime useStart;
@ApiModelProperty(value = "场次适用结束时间", example = "2020-12-01T12:00:00")
@NotNull(message = "不能为空")
private LocalDateTime useEnd;
@ApiModelProperty(value = "类型 1单日票 2通票", example = "1")
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketsPartnerService.java
View file @ 8f5a180d
......@@ -58,7 +58,7 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
* @param ticketsId 票id
* @return vo
*/
ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId);
ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId);
/**
* 整个场次票 提交 审核
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ 8f5a180d
......@@ -165,6 +165,9 @@ public class PerformanceVoUtils {
}
}
if(vo.getAppStatus()<=4){
appStatus=vo.getAppStatus();
}
if(vo.getAppStatus()==7){
appStatus=7;
}
......
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java
View file @ 8f5a180d
......@@ -57,21 +57,21 @@ public class CurrentUtil {
}
if (ip == null || ip.length() == 0 || CLI_UNKNOWN.equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
if (LOCALHOST_IP1.equalsIgnoreCase(ip) || LOCALHOST_IP.equalsIgnoreCase(ip)) {
// 根据网卡取本机配置的IP
InetAddress iNet = null;
try {
iNet = InetAddress.getLocalHost();
} catch (UnknownHostException e) {
e.printStackTrace();
}
ip = iNet.getHostAddress();
}
// if (LOCALHOST_IP1.equalsIgnoreCase(ip) || LOCALHOST_IP.equalsIgnoreCase(ip)) {
// // 根据网卡取本机配置的IP
// InetAddress iNet = null;
// try {
// iNet = InetAddress.getLocalHost();
// } catch (UnknownHostException e) {
// e.printStackTrace();
// }
// ip = iNet.getHostAddress();
// }
}
// 使用代理，则获取第一个IP地址
if (!StringUtils.isEmpty(ip) && ip.indexOf(IP_UTILS_FLAG) > 0) {
ip = ip.substring(0, ip.indexOf(IP_UTILS_FLAG));
}
return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : ip;
return LOCALHOST_IP.equals(ip) ? LOCALHOST_IP1 : ip;
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 8f5a180d
......@@ -286,7 +286,7 @@
<where>
ps.status in ${status}
<if test="title!=''">
AND title LIKE concat('%', ${title}, '%')
AND title LIKE concat('%', #{title}, '%')
</if>
</where>
LIMIT 20
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @ 8f5a180d
......@@ -173,9 +173,10 @@ public class AdamMemberOrderController {
public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(@Valid @RequestBody AdamMemberOrderCodeParam param) {
log.debug("member/order/exchange:param:{}", JsonUtils.toJson(param));
String currentUid = CurrentUtil.getCurrentUid();
if (null != adamRdmService.getUserMemberVoByUid(currentUid)) {// 仅限从未购买过会员的用户使用
return ResponseDto.failure(ErrorMapping.get("10200"));
}
// TODO: 2021/6/19 关闭该验证（如果已是会员继续兑换则保留原会员号，兑换码对应会员号记录至会员订单）
// if (null != adamRdmService.getUserMemberVoByUid(currentUid)) {// 仅限从未购买过会员的用户使用
// return ResponseDto.failure(ErrorMapping.get("10200"));
// }
// TODO: 2021/6/9 判断黑名单，待定（暂不做）
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 8f5a180d
......@@ -34,6 +34,7 @@ import org.springframework.util.StringUtils;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*;
@Slf4j
......@@ -140,7 +141,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
try {
String url = env.getProperty("liquidnet.url-pay.pay") + payUri;
log.debug("HttpUtil.resquest.url:{},param:{}", url, JsonUtils.toJson(payParam));
long s = System.currentTimeMillis();
String json = HttpUtil.post(url, payParam);
log.debug("#PHP.API耗时:{}ms", System.currentTimeMillis() - s);
log.debug("HttpUtil.response.body:{}", json);
Map payResult = JsonUtils.fromJson(json, Map.class);
......@@ -189,7 +192,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
*/
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> operationObjs = new LinkedList<>(), updateMemberOrderObjs = new LinkedList<>();
// AdamMemberOrderVo updateMemberOrderVo = AdamMemberOrderVo.getNew();
LocalDateTime now = LocalDateTime.now();
if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
AdamUserMemberVo existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid());
......@@ -201,13 +203,15 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initUserMemberVo.setMemberId(handleMemberOrderVo.getMemberId());
initUserMemberVo.setMemberNo(memberNo);
initUserMemberVo.setState(1);// 1-正常,2-失效
Date expiryAt = DateUtil.getBeforeDayEnd(Calendar.getInstance(), memberPriceVo.getDays());
initUserMemberVo.setExpiryAt(DateUtil.asLocalDateTime(expiryAt));
initUserMemberVo.setExpiryAt(now.plusDays(memberPriceVo.getDays()).with(LocalTime.MAX));
initUserMemberVo.setCreatedAt(now);
// 订单写入MongoDB和Redis中
long s = System.currentTimeMillis();
mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), initUserMemberVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberNo(memberNo);
......@@ -216,23 +220,20 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
} else { // 续费
} else {// 续费
LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt();
LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt).plusDays(memberPriceVo.getDays()).with(LocalTime.MAX);
Calendar calendar = Calendar.getInstance();
Date nowDt = DateUtil.asDate(now), currentExpiryAtDate = DateUtil.asDate(currentExpiryAt);
calendar.setTime(currentExpiryAtDate.before(nowDt) ? nowDt : currentExpiryAtDate);
LocalDateTime expiryAt = DateUtil.asLocalDateTime(DateUtil.getBeforeDayEnd(calendar, memberPriceVo.getDays()));
// existUserMemberVo.setExpiryAt(expiryAt);
// existUserMemberVo.setState(1);// 1-正常,2-失效
long s = System.currentTimeMillis();
mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("uid").is(existUserMemberVo.getUid())).getQueryObject(),
// new Document("$set", Document.parse(JsonUtils.toJson(existUserMemberVo))));
new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
);
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
existUserMemberVo.setExpiryAt(expiryAt);
s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberNo(existUserMemberVo.getMemberNo());
......@@ -257,8 +258,12 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initMemberCodeVo.setBuyAt(now);
initMemberCodeVo.setCreatedAt(now);
long s = System.currentTimeMillis();
mongoTemplate.insert(initMemberCodeVo, AdamMemberCodeVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis();
adamRdmService.setMemberCodeVoByCode(initMemberCodeVo.getCode(), initMemberCodeVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
handleMemberOrderVo.setMemberCode(initMemberCodeVo.getCode());
handleMemberOrderVo.setMemberNo(memberNo);
......@@ -274,7 +279,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
handleMemberOrderVo.setUpdatedAt(now);
handleMemberOrderVo.setState(1);// 1-已支付
long s = System.currentTimeMillis();
mongoTemplate.insert(handleMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_member_order.add"));
updateMemberOrderObjs.add(new Object[]{
......@@ -285,10 +292,14 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
});
s = System.currentTimeMillis();
adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis();
rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UMEMBER,
SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
return ResponseDto.success();
}
......@@ -307,7 +318,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
}
AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(memberCodeVo.getMemberId());
LocalDateTime currentDateTime = LocalDateTime.now();
LocalDateTime now = LocalDateTime.now();
// 创建会员订单
AdamMemberOrderVo initMemberOrderVo = AdamMemberOrderVo.getNew();
initMemberOrderVo.setOrderNo(IDGenerator.nextSnowId().toString().concat("V"));
......@@ -325,52 +336,75 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initMemberOrderVo.setDeviceFrom(param.getDeviceFrom());
initMemberOrderVo.setPayType(param.getMode() == 2 ? "vipcode" : "giftcode");
initMemberOrderVo.setPayNo(memberCodeVo.getCode());
initMemberOrderVo.setPaymentAt(currentDateTime);
initMemberOrderVo.setCreatedAt(currentDateTime);
initMemberOrderVo.setPaymentAt(now);
initMemberOrderVo.setCreatedAt(now);
initMemberOrderVo.setClientIp(CurrentUtil.getCliIpAddr());
initMemberOrderVo.setSource(CurrentUtil.getCliSource());
initMemberOrderVo.setVersion(CurrentUtil.getCliVersion());
initMemberOrderVo.setMemberCode(param.getMemberCode());
AdamUserMemberVo initUserMemberVo = AdamUserMemberVo.getNew();
initUserMemberVo.setUid(initMemberOrderVo.getUid());
initUserMemberVo.setMemberId(memberCodeVo.getMemberId());
initUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
initUserMemberVo.setState(1);
initUserMemberVo.setExpiryAt(
DateUtil.asLocalDateTime(
DateUtil.getBeforeDayEnd(Calendar.getInstance(), initMemberOrderVo.getDays())
));
initUserMemberVo.setCreatedAt(currentDateTime);
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> updateMemberCodeObjs = new LinkedList<>(),
initMemberOrderObjs = new LinkedList<>(), initUserMemberObjs = new LinkedList<>();
// AdamMemberCodeVo updateMemberCodeVo = AdamMemberCodeVo.getNew();
// updateMemberCodeVo.setState(1);
// updateMemberCodeVo.setUpdatedAt(currentDateTime);
// updateMemberCodeVo.setUseOrderNo(initMemberOrderVo.getOrderNo());
// updateMemberCodeVo.setUseUid(initUserMemberVo.getUid());
// updateMemberCodeVo.setUseAt(currentDateTime);
initMemberOrderObjs = new LinkedList<>(), upsertUserMemberObjs = new LinkedList<>();
AdamUserMemberVo upsertUserMemberVo = adamRdmService.getUserMemberVoByUid(initMemberOrderVo.getUid());
if (null != upsertUserMemberVo) {
upsertUserMemberVo.setState(1);
LocalDateTime expiryAt = upsertUserMemberVo.getExpiryAt();
upsertUserMemberVo.setExpiryAt(
(expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX)
);
long s = System.currentTimeMillis();
mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("uid").is(upsertUserMemberVo.getUid())).getQueryObject(),
new Document("$set", new Document("expiryAt", upsertUserMemberVo.getExpiryAt()).append("state", 1))
);
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_user_member.update"));
upsertUserMemberObjs.add(new Object[]{
upsertUserMemberVo.getState(), upsertUserMemberVo.getExpiryAt(), now, upsertUserMemberVo.getUid()
});
} else {
upsertUserMemberVo = AdamUserMemberVo.getNew();
upsertUserMemberVo.setUid(initMemberOrderVo.getUid());
upsertUserMemberVo.setMemberId(memberCodeVo.getMemberId());
upsertUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
upsertUserMemberVo.setState(1);
upsertUserMemberVo.setExpiryAt(now.plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX));
upsertUserMemberVo.setCreatedAt(now);
long s = System.currentTimeMillis();
mongoTemplate.insert(upsertUserMemberVo, AdamUserMemberVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_user_member.add"));
upsertUserMemberObjs.add(new Object[]{
upsertUserMemberVo.getUid(), upsertUserMemberVo.getMemberId(), upsertUserMemberVo.getMemberNo(),
upsertUserMemberVo.getState(), upsertUserMemberVo.getExpiryAt(), upsertUserMemberVo.getCreatedAt()
});
}
long s = System.currentTimeMillis();
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), upsertUserMemberVo);
adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
Document updateMemberCodeVo = new Document("state", 1)
.append("updatedAt", currentDateTime)
.append("updatedAt", now)
.append("useOrderNo", initMemberOrderVo.getOrderNo())
.append("useUid", initUserMemberVo.getUid())
.append("useAt", currentDateTime);
.append("useUid", upsertUserMemberVo.getUid())
.append("useAt", now);
s = System.currentTimeMillis();
mongoTemplate.getCollection(AdamMemberCodeVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("code").is(memberCodeVo.getCode())).getQueryObject(),
// new Document("$set", Document.parse(JsonUtils.toJson(updateMemberCodeVo)))
new Document("$set", updateMemberCodeVo)
);
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_member_code.exchange"));
updateMemberCodeObjs.add(new Object[]{
// updateMemberCodeVo.getState(), updateMemberCodeVo.getUpdatedAt(), updateMemberCodeVo.getUseOrderNo(),
// updateMemberCodeVo.getUseUid(), updateMemberCodeVo.getUseAt(), memberCodeVo.getCode()
1, currentDateTime, initMemberOrderVo.getOrderNo(), initUserMemberVo.getUid(), currentDateTime, memberCodeVo.getCode()
1, now, initMemberOrderVo.getOrderNo(), upsertUserMemberVo.getUid(), now, memberCodeVo.getCode()
});
s = System.currentTimeMillis();
mongoTemplate.insert(initMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_member_order.add"));
initMemberOrderObjs.add(new Object[]{
initMemberOrderVo.getOrderNo(), initMemberOrderVo.getUid(), initMemberOrderVo.getMode(), initMemberOrderVo.getPrice(),
......@@ -379,18 +413,11 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initMemberOrderVo.getDeviceFrom(), initMemberOrderVo.getPayType(), initMemberOrderVo.getPayNo(), initMemberOrderVo.getPaymentAt(),
initMemberOrderVo.getCreatedAt(), initMemberOrderVo.getClientIp(), initMemberOrderVo.getSource(), initMemberOrderVo.getVersion()
});
mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
toMqSqls.add(SqlMapping.get("adam_user_member.add"));
initUserMemberObjs.add(new Object[]{
initUserMemberVo.getUid(), initUserMemberVo.getMemberId(), initUserMemberVo.getMemberNo(),
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), initUserMemberVo);
adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
s = System.currentTimeMillis();
rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UMEMBER,
SqlMapping.gets(toMqSqls, updateMemberCodeObjs, initMemberOrderObjs, initUserMemberObjs));
SqlMapping.gets(toMqSqls, updateMemberCodeObjs, initMemberOrderObjs, upsertUserMemberObjs));
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
AdamMemberOrderResult result = AdamMemberOrderResult.getNew();
result.setOrderNo(initMemberOrderVo.getOrderNo());
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java
View file @ 8f5a180d
......@@ -18,6 +18,7 @@ import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@Slf4j
......@@ -36,11 +37,12 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public String getUidByMobile(String mobile) {
String key = AdamRedisConst.IDENTITY_MOBILE.concat(mobile);
long s = System.currentTimeMillis();
String val = (String) redisUtil.get(key);
if (StringUtils.isEmpty(val)) {
Query query = Query.query(Criteria.where("mobile").is(mobile).and("state").is(1));
query.fields().include("uid");
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
AdamUserInfoVo vo = mongoTemplate.findOne(query, AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) {
......@@ -48,6 +50,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
redisUtil.set(key, vo.getUid());
}
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return val;
}
......@@ -64,11 +67,12 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public String getUidByPlatformOpenId(String platform, String openId) {
String key = AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId;
long s = System.currentTimeMillis();
String val = (String) redisUtil.get(key);
if (StringUtils.isEmpty(val)) {
Query query = Query.query(Criteria.where("openId").is(openId).and("platform").is(platform).and("state").is(1));
query.fields().include("uid");
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
AdamThirdPartInfoVo vo = mongoTemplate.findOne(query, AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) {
......@@ -76,6 +80,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
redisUtil.set(key, vo.getUid());
}
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return val;
}
......@@ -92,15 +97,17 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public AdamUserInfoVo getUserInfoVoByUid(String uid) {
String rk = AdamRedisConst.INFO_USER.concat(uid);
long s = System.currentTimeMillis();
AdamUserInfoVo vo = (AdamUserInfoVo) redisUtil.get(rk);
if (null == vo) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) redisUtil.set(rk, vo);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vo;
}
......@@ -117,9 +124,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public AdamRealInfoVo getRealInfoVoByUid(String uid) {
String rk = AdamRedisConst.INFO_REAL_NAME.concat(uid);
long s = System.currentTimeMillis();
AdamRealInfoVo vo = (AdamRealInfoVo) redisUtil.get(rk);
if (null == vo) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
AdamRealInfoVo.class, AdamRealInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
......@@ -130,6 +138,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
vo.setName(SensitizeUtil.chineseName(vo.getName()));
vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vo;
}
......@@ -146,24 +155,31 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid) {
String rk = AdamRedisConst.INFO_THIRD_PARTY.concat(uid);
long s = System.currentTimeMillis();
List<AdamThirdPartInfoVo> thirdPartInfoVos = (List<AdamThirdPartInfoVo>) redisUtil.get(rk);
if (CollectionUtils.isEmpty(thirdPartInfoVos)) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
thirdPartInfoVos = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (!CollectionUtils.isEmpty(thirdPartInfoVos)) redisUtil.set(rk, thirdPartInfoVos);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return thirdPartInfoVos;
}
@Override
public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform) {
List<AdamThirdPartInfoVo> list = this.getThirdPartVoListByUid(uid);
if (!CollectionUtils.isEmpty(list))
for (AdamThirdPartInfoVo r : list)
if (platform.equals(r.getPlatform())) return r;
List<AdamThirdPartInfoVo> vos = this.getThirdPartVoListByUid(uid);
if (!CollectionUtils.isEmpty(vos)) {
// for (AdamThirdPartInfoVo r : vos)
// if (platform.equals(r.getPlatform())) return r;
Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
if (any.isPresent()) {
return any.get();
}
}
return null;
}
......@@ -180,9 +196,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public List<AdamEntersVo> getEntersVoByUid(String uid) {
String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
long s = System.currentTimeMillis();
List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
if (CollectionUtils.isEmpty(vos)) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vos = mongoTemplate.find(
Query.query(Criteria.where("uid").is(uid).and("state").is(1)).with(Sort.by(Sort.Direction.DESC, "createdAt")),
AdamEntersVo.class, AdamEntersVo.class.getSimpleName()
......@@ -191,6 +208,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vos;
}
......@@ -218,9 +236,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
long s = System.currentTimeMillis();
List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
if (CollectionUtils.isEmpty(vos)) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vos = mongoTemplate.find(
Query.query(Criteria.where("uid").is(uid).and("state").is(1)).with(Sort.by(Sort.Direction.DESC, "createdAt")),
AdamAddressesVo.class, AdamAddressesVo.class.getSimpleName()
......@@ -229,6 +248,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vos;
}
......@@ -250,9 +270,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public AdamUserMemberVo getUserMemberVoByUid(String uid) {
String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
long s = System.currentTimeMillis();
AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
if (null == vo) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid)), AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
......@@ -261,6 +282,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if (null != vo) {
vo.setState(vo.getState() == 1 ? (vo.getExpiryAt().isAfter(LocalDateTime.now()) ? 1 : 2) : vo.getState());
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vo;
}
......@@ -290,9 +312,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public AdamMemberVo getMemberVoByMemberId(String memberId) {
String key = AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId);
long s = System.currentTimeMillis();
AdamMemberVo vo = (AdamMemberVo) redisUtil.get(key);
if (null == vo) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vo = mongoTemplate.findOne(
Query.query(Criteria.where("memberId").is(memberId).and("state").is(1)),
AdamMemberVo.class, AdamMemberVo.class.getSimpleName()
......@@ -300,6 +323,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo) redisUtil.set(key, vo);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vo;
}
......@@ -311,9 +335,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId) {
String key = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId);
long s = System.currentTimeMillis();
List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisUtil.get(key);
if (CollectionUtils.isEmpty(vos)) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vos = mongoTemplate.find(
Query.query(Criteria.where("memberId").is(memberId).and("state").is(1)),
AdamMemberPriceVo.class, AdamMemberPriceVo.class.getSimpleName()
......@@ -322,17 +347,23 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if (!CollectionUtils.isEmpty(vos)) redisUtil.set(key, vos);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vos;
}
@Override
public AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId) {
long s = System.currentTimeMillis();
List<AdamMemberPriceVo> vos = this.getMemberPriceVoByMemberId(memberId);
if (!CollectionUtils.isEmpty(vos)) {
for (AdamMemberPriceVo r : vos) {
if (memberPriceId.equals(r.getMemberPriceId())) {
return r;
}
// for (AdamMemberPriceVo r : vos) {
// if (memberPriceId.equals(r.getMemberPriceId())) {
// return r;
// }
// }
Optional<AdamMemberPriceVo> any = vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny();
if (any.isPresent()) {
return any.get();
}
}
return null;
......@@ -381,9 +412,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) {
String key = AdamRedisConst.SHOT_MEMBER_ORDER + orderNo;
long s = System.currentTimeMillis();
AdamMemberOrderVo vo = (AdamMemberOrderVo) redisUtil.get(key);
if (null == vo) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vo = mongoTemplate.findOne(
Query.query(Criteria.where("orderNo").is(orderNo)),
AdamMemberOrderVo.class, AdamMemberOrderVo.class.getSimpleName()
......@@ -392,6 +424,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
if (null != vo) redisUtil.set(key, vo);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vo;
}
......@@ -424,9 +457,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
@Override
public AdamMemberCodeVo getMemberCodeVoByCode(String memberCode) {
String key = AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode);
long s = System.currentTimeMillis();
AdamMemberCodeVo vo = (AdamMemberCodeVo) redisUtil.get(key);
if (null == vo) {
long s = System.currentTimeMillis();
s = System.currentTimeMillis();
vo = mongoTemplate.findOne(
Query.query(Criteria.where("code").is(memberCode)),
AdamMemberCodeVo.class, AdamMemberCodeVo.class.getSimpleName()
......@@ -434,6 +468,7 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (null != vo && vo.getState() == 0) redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo);
}
log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
return vo;
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserMemberServiceImpl.java
View file @ 8f5a180d
......@@ -31,6 +31,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
@Override
public String getNextMemberNo(String memberId) {
long s = System.currentTimeMillis();
int memberMaxNo = adamRdmService.getMaxMemberNo();
if (-1 == memberMaxNo) {
if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3000)) {
......@@ -58,6 +59,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
// 不能是完全相同的数字
nextMemberNoStr = String.valueOf(adamRdmService.incrMemberNo());
}
log.debug("#MNO耗时:{}ms", System.currentTimeMillis() - s);
return nextMemberNoStr;
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql
View file @ 8f5a180d
......@@ -21,8 +21,8 @@ CREATE TABLE `kylin_banners`
`promotion_type` tinyint NOT NULL DEFAULT 1 COMMENT '推广类型 1全国 2省份',
`banners_sort` int NOT NULL DEFAULT 0 COMMENT '排序 越大越靠前',
`is_deleted` tinyint NOT NULL DEFAULT 1 COMMENT '是否删除 0已删除 1正常',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_banners_banners_id_index` (`banners_id`),
KEY `kylin_banners_banners_name_index` (`banners_name`),
KEY `kylin_banners_banners_sort_index` (`banners_sort`),
......@@ -39,8 +39,8 @@ CREATE TABLE `kylin_banners_relations`
`field_id` int NOT NULL DEFAULT 0 COMMENT '展示位置id/推广省份code',
`field_name` varchar(255) NOT NULL DEFAULT '' COMMENT '省份名称',
`field_id_type` tinyint NOT NULL DEFAULT 1 COMMENT '关联字段类型 1展示位置(由接口提供) 2推广省份(由接口提供)',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_banners_relations_banners_relations_id_index` (`banners_relations_id`),
KEY `kylin_banners_relations_banners_id_index` (`banners_id`),
PRIMARY KEY (`mid`)
......@@ -70,8 +70,8 @@ CREATE TABLE `kylin_fields`
`district_name` varchar(255) NOT NULL DEFAULT '' COMMENT '县名称',
`refuse_message` varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_fields_uid_index` (`fields_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -87,8 +87,8 @@ CREATE TABLE `kylin_field_status`
`is_display` tinyint NOT NULL DEFAULT 1 COMMENT '是否显示 0不显示 1显示',
`is_business` tinyint NOT NULL DEFAULT 0 COMMENT '是否营业 0不营业 1营业中',
`change_status` tinyint NOT NULL DEFAULT 0 COMMENT '审核状态 0待审核 1已审核 2被拒绝',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_field_status_uid_index` (`field_status_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -100,8 +100,8 @@ CREATE TABLE `kylin_field_relations`
`mid` int(11) NOT NULL AUTO_INCREMENT,
`field_relations_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'field_relations_id',
`field_id` varchar(255) NOT NULL DEFAULT '' COMMENT '场地关联id',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_field_relations_uid_index` (`field_relations_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -130,7 +130,7 @@ CREATE TABLE `kylin_performances`
`sponsor` varchar(255) NOT NULL DEFAULT '' COMMENT '主办方',
`contacts` varchar(255) NOT NULL DEFAULT '' COMMENT '联系人',
`mobile` varchar(255) NOT NULL DEFAULT '' COMMENT '联系电话',
`describes` text NULL DEFAULT NULL COMMENT '演出简介',
`describes` text NULL DEFAULT NULL COMMENT '演出简介',
`details` longtext DEFAULT NULL COMMENT '演出详情',
`notice_image` text DEFAULT NULL COMMENT '购票须知',
`time_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '演出开始时间',
......@@ -139,8 +139,8 @@ CREATE TABLE `kylin_performances`
`reject_txt` varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
`sort` int(11) NOT NULL DEFAULT 0 COMMENT '权重 高则在上',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performances_uid_index` (`performances_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -163,8 +163,8 @@ CREATE TABLE `kylin_performance_status`
`limit_count` int(11) NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`limit_count_member` int(11) NOT NULL DEFAULT 0 COMMENT '会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
`is_recommend` tinyint(255) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performance_status_uid_index` (`performance_status_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -182,8 +182,8 @@ CREATE TABLE `kylin_performance_relations`
`road_show_id` varchar(255) NOT NULL DEFAULT '' COMMENT '巡演id',
`project_id` varchar(255) NOT NULL DEFAULT '' COMMENT '专题id',
`video_id` varchar(255) NOT NULL DEFAULT '' COMMENT '视频id',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `performance_relations_uid_index` (`performance_relations_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -202,8 +202,8 @@ CREATE TABLE `kylin_performance_distributions`
`second_agent_scale_money` varchar(5) NOT NULL DEFAULT '0' COMMENT '1级现金奖励占比',
`second_agent_scale_barter` varchar(5) NOT NULL DEFAULT '0' COMMENT '2级积分奖励占比',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_performance_distributions_uid_index` (`performance_distributions_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -220,10 +220,10 @@ CREATE TABLE `kylin_ticket_times`
`type` tinyint NOT NULL DEFAULT 1 COMMENT '状态 1单日票 2通票',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 0不可用 1可用',
`use_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
`use_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
`use_end` datetime DEFAULT NULL COMMENT '售票结束时间',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_times_uid_index` (`ticket_times_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -237,8 +237,8 @@ CREATE TABLE `kylin_ticket_time_relation`
`ticket_time_relation_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_time_relation_id',
`times_id` varchar(255) NOT NULL DEFAULT '' COMMENT '场次id',
`performance_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联演出id',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_time_relation_uid_index` (`ticket_time_relation_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -264,12 +264,12 @@ CREATE TABLE `kylin_tickets`
`time_end` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '售卖结束时间',
`time_end_express` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '快递票结束时间',
`use_start` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用开始时间',
`use_end` datetime NOT NULL DEFAULT '2030-01-01 12:00:00' COMMENT '适用结束时间',
`use_end` datetime DEFAULT NULL COMMENT '适用结束时间',
`pay_countdown_minute` int(11) NOT NULL DEFAULT 5 COMMENT '支付倒计时时间',
`sale_remind_minute` int(11) NOT NULL DEFAULT 60 COMMENT '开票提醒倒计时（分钟数）',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_tickets_uid_index` (`tickets_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -303,8 +303,8 @@ CREATE TABLE `kylin_ticket_status`
`is_member` tinyint NOT NULL DEFAULT 0 COMMENT '是否关联会员 0不是 1是',
`is_agent` tinyint NOT NULL DEFAULT 0 COMMENT '是否关联代理 0不是 1是',
`sync_damai` tinyint NOT NULL DEFAULT 0 COMMENT '是否同步大麦 0不关联 1关联',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_ticket_status_uid_index` (`ticket_status_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -317,8 +317,8 @@ CREATE TABLE `kylin_ticket_relations`
`ticket_relations_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_relations_id',
`ticket_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票关联id',
`times_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联场次id',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `ticket_relations_uid_index` (`ticket_relations_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -334,8 +334,8 @@ CREATE TABLE `kylin_road_shows`
`img_poster` varchar(255) NOT NULL DEFAULT '' COMMENT '巡演封面图',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 0停用 1启用',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_road_shows_uid_index` (`road_shows_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -355,8 +355,8 @@ CREATE TABLE `kylin_lack_registers`
`user_mobile` varchar(255) NOT NULL DEFAULT '' COMMENT '用户手机号',
`send_status` tinyint NOT NULL DEFAULT 0 COMMENT '是否发送短信',
`ip_address` varchar(255) NOT NULL DEFAULT '' COMMENT 'IP 地址',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_lack_registers_uid_index` (`lack_registers_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -375,8 +375,8 @@ CREATE TABLE `kylin_projects`
`open_goods` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启 推荐商品',
`open_tied` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否开启 推荐搭售',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL,
`updated_at` datetime(3) NULL DEFAULT NULL,
`created_at` datetime(3) NULL DEFAULT NULL,
`updated_at` datetime(3) NULL DEFAULT NULL,
KEY `kylin_projects_uid_index` (`projects_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -396,8 +396,8 @@ CREATE TABLE `kylin_project_relations`
`tied_price` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '搭售价格',
`is_limit` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否限购',
`limit_num` int(11) NOT NULL DEFAULT '0' COMMENT '限购数量 0不限购',
`created_at` datetime(3) NULL DEFAULT NULL,
`updated_at` datetime(3) NULL DEFAULT NULL,
`created_at` datetime(3) NULL DEFAULT NULL,
`updated_at` datetime(3) NULL DEFAULT NULL,
PRIMARY KEY (`mid`),
KEY `kylin_project_relations_uid_index` (`project_relations_id`),
KEY `kylin_project_relations_project_id_index` (`project_id`),
......@@ -443,8 +443,8 @@ CREATE TABLE `kylin_order_tickets`
`get_ticket_describe` varchar(255) NOT NULL DEFAULT '' COMMENT '直播用取票观演码，隔开',
`pay_countdown_minute` int(32) NOT NULL DEFAULT 15 COMMENT '订单过期时间(分钟)',
`comment` varchar(255) NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_tickets_uid_index` (`order_tickets_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -463,8 +463,8 @@ CREATE TABLE `kylin_order_ticket_relations`
`ticket_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票id',
`agent_id` varchar(255) NOT NULL DEFAULT '' COMMENT '分销代理id',
`is_member` int NOT NULL DEFAULT 0 COMMENT '购买者是否是会员',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_ticket_relations_uid_index` (`order_ticket_relations_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -481,8 +481,8 @@ CREATE TABLE `kylin_order_ticket_status`
`transfer_status` tinyint NOT NULL DEFAULT 0 COMMENT '转移状态，0未转移，1收到他人转赠，2已转赠给他人',
`status` tinyint NOT NULL DEFAULT 0 COMMENT '订单状态:0待付款，1已付款，2已关闭，3正在退款，4已退款, 5待关闭 6部分退款',
`pay_status` tinyint NOT NULL DEFAULT 0 COMMENT '支付状态:0未支付 1已支付 2支付失败',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_order_ticket_status_uid_index` (`order_ticket_status_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -528,8 +528,8 @@ CREATE TABLE `kylin_buy_notice`
`message` varchar(255) NOT NULL DEFAULT '' COMMENT '内容',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 1可用 0弃用',
`sort` int(10) NOT NULL DEFAULT 0 COMMENT '排序 大在上',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_buy_notice_uid_index` (`buy_notice_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -546,8 +546,8 @@ CREATE TABLE `kylin_check_user`
`pwd` varchar(255) NOT NULL DEFAULT '' COMMENT '密码',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '是否可用 0否 1是',
`merchant_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'merchantId 第三方id',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_check_user_uid_index` (`check_user_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -563,8 +563,8 @@ CREATE TABLE `kylin_check_user_performances`
`check_user_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'check_user_id',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 1可用 0不可',
`can_down_time` datetime NULL DEFAULT NULL COMMENT '可下载时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
`created_at` datetime(3) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(3) NULL DEFAULT NULL COMMENT '修改时间',
KEY `kylin_check_user_uid_index` (`check_user_id`),
PRIMARY KEY (`mid`)
) ENGINE = InnoDB
......@@ -650,35 +650,35 @@ CREATE TABLE `kylin_order_refund_batches`
drop TABLE if exists `kylin_order_refunds`;
CREATE TABLE `kylin_order_refunds`
(
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_refunds_id',
`order_tickets_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票务订单id',
`order_refund_code` varchar(50) NOT NULL COMMENT '退款编号 order_code + 001编号',
`order_refund_batches_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量退款id',
`refund_code` varchar(50) NOT NULL DEFAULT '' COMMENT '退款中心退款编号',
`refund_at` timestamp NULL DEFAULT NULL COMMENT '成功退款时间',
`refund_id` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方退款编号',
`refund_error` varchar(100) NOT NULL DEFAULT '' COMMENT '退款失败原因',
`price` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款票总金额',
`price_express` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款快递费',
`status` tinyint NOT NULL DEFAULT '0' COMMENT '退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败',
`type` tinyint NOT NULL DEFAULT '0' COMMENT '退款差异: 0客服或票务申请 1超时自动退款不占库存',
`applicant_id` varchar(255) NOT NULL DEFAULT '' COMMENT '申请人id',
`applicant_name` varchar(100) NOT NULL DEFAULT '' COMMENT '申请人名称',
`applicant_at` timestamp NULL DEFAULT NULL COMMENT '申请时间',
`reason` varchar(200) NOT NULL DEFAULT '' COMMENT '退款原因',
`auditor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '审核人id',
`auditor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '审核人名称',
`auditor_at` timestamp NULL DEFAULT NULL COMMENT '审核时间',
`reject` varchar(200) NOT NULL DEFAULT '' COMMENT '驳回原因',
`executor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '执行人id',
`executor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '执行人名称',
`executor_at` timestamp NULL DEFAULT NULL COMMENT '执行时间',
`refuse` varchar(200) NOT NULL DEFAULT '' COMMENT '回绝原因',
`refund_type` varchar(200) NOT NULL DEFAULT '' COMMENT '退款方式',
`refund_cate` tinyint NOT NULL DEFAULT '0' COMMENT '1票务2快递费3票和快递费',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
`mid` int unsigned NOT NULL AUTO_INCREMENT,
`order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'order_refunds_id',
`order_tickets_id` varchar(255) NOT NULL DEFAULT '' COMMENT '票务订单id',
`order_refund_code` varchar(50) NOT NULL COMMENT '退款编号 order_code + 001编号',
`order_refund_batches_id` varchar(255) NOT NULL DEFAULT '' COMMENT '批量退款id',
`refund_code` varchar(50) NOT NULL DEFAULT '' COMMENT '退款中心退款编号',
`refund_at` timestamp NULL DEFAULT NULL COMMENT '成功退款时间',
`refund_id` varchar(50) NOT NULL DEFAULT '' COMMENT '第三方退款编号',
`refund_error` varchar(100) NOT NULL DEFAULT '' COMMENT '退款失败原因',
`price` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款票总金额',
`price_express` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '退款快递费',
`status` tinyint NOT NULL DEFAULT '0' COMMENT '退款状态: 0请求退款 2取消退款 1审核通过 5驳回退款 7等待退款 3正在退款 4完成退款 6退款失败',
`type` tinyint NOT NULL DEFAULT '0' COMMENT '退款差异: 0客服或票务申请 1超时自动退款不占库存',
`applicant_id` varchar(255) NOT NULL DEFAULT '' COMMENT '申请人id',
`applicant_name` varchar(100) NOT NULL DEFAULT '' COMMENT '申请人名称',
`applicant_at` timestamp NULL DEFAULT NULL COMMENT '申请时间',
`reason` varchar(200) NOT NULL DEFAULT '' COMMENT '退款原因',
`auditor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '审核人id',
`auditor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '审核人名称',
`auditor_at` timestamp NULL DEFAULT NULL COMMENT '审核时间',
`reject` varchar(200) NOT NULL DEFAULT '' COMMENT '驳回原因',
`executor_id` varchar(255) NOT NULL DEFAULT '' COMMENT '执行人id',
`executor_name` varchar(100) NOT NULL DEFAULT '' COMMENT '执行人名称',
`executor_at` timestamp NULL DEFAULT NULL COMMENT '执行时间',
`refuse` varchar(200) NOT NULL DEFAULT '' COMMENT '回绝原因',
`refund_type` varchar(200) NOT NULL DEFAULT '' COMMENT '退款方式',
`refund_cate` tinyint NOT NULL DEFAULT '0' COMMENT '1票务2快递费3票和快递费',
`created_at` timestamp NULL DEFAULT NULL,
`updated_at` timestamp NULL DEFAULT NULL,
PRIMARY KEY (`mid`),
UNIQUE KEY `kylin_order_refunds_order_refund_code_unique` (`order_refund_code`),
KEY `kylin_order_refunds_order_tickets_id_index` (`order_tickets_id`),
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java
View file @ 8f5a180d
......@@ -57,8 +57,8 @@ public class KylinTicketsPartnerController {
@PostMapping(value = "/copy")
@ApiOperation(value = "复制票务",position = 4)
@ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("ticketsId") @NotNull String ticketsId) {
return ticketsPartnerService.copyTicket(ticketsId);
public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("performancesId") @NotNull String performancesId,@RequestParam("ticketsId") @NotNull String ticketsId) {
return ticketsPartnerService.copyTicket(performancesId,ticketsId);
}
@GetMapping(value = "/details")
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java
View file @ 8f5a180d
......@@ -115,7 +115,7 @@ public class PerformancePartnerController {
return performancesPartnerService.withdraw(performancesId);
}
@PostMapping(value = "orderStatistical")
@GetMapping(value = "orderStatistical")
@ApiOperation(value = "演出订单统计",position = 9)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<List<PerformanceOrderStatisticalDao>> performanceOrderStatisticalList(@RequestParam("performancesId") @NotNull String performancesId) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 8f5a180d
......@@ -108,6 +108,14 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
@Autowired
private KylinOrderTicketEntitiesMapper entitiesMapper;
ArrayList<Integer> canBuyStatus = new ArrayList(){{
add(6);
add(8);
add(9);
add(10);
}};
@Override
public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
Long currentTime;
......@@ -192,7 +200,13 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
int performanceMemberLimit = performanceData.getLimitCountMember();//会员演出限购
int isTrueName = ticketData.getIsTrueName();//是否演出实名
//TODO 演出 票状态
if(!canBuyStatus.contains(performanceData.getAppStatus())){
return ResponseDto.failure("当前不可购买");//没有会员权限
}
if(!canBuyStatus.contains(performanceData.getAppStatus())){
return ResponseDto.failure("当前不可购买");//没有会员权限
}
//通用判断时间
if (isMember) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java
View file @ 8f5a180d
......@@ -88,21 +88,26 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
LocalDateTime createdAt = LocalDateTime.now();
// 标题
String title = "";
String useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
String useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
String useStart;
String useEnd;
if (createTicketTimesParam.getType() == 1) {
if(!useStart.split(" ")[0].equals(useEnd.split(" ")[0])){
return ResponseDto.failure(ErrorMapping.get(20118));
}
useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
useEnd = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
title = useStart;
} else {
useStart = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
useEnd = createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
title = useStart + "-" + useEnd;
}
// mongo 操作
KylinTicketTimesPartnerVo kylinTicketTimesPartnerVo = new KylinTicketTimesPartnerVo();
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")));
if(createTicketTimesParam.getType() == 2) {
kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
}else{
kylinTicketTimesPartnerVo.setUseEnd(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
}
kylinTicketTimesPartnerVo.setStatus(1);
kylinTicketTimesPartnerVo.setTitle(title);
kylinTicketTimesPartnerVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 8f5a180d
......@@ -193,9 +193,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
log.info("票 修改");
try {
KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformanceId())),
KylinTicketTimesPartnerVo ticketTimeRelation = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())),
KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
PerformancePartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(ticketTimeRelation.getPerformancesId())),
PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if (data == null || data.getAuditStatus() == null || data.getAuditStatus() == 0) {
return ResponseDto.failure(ErrorMapping.get("20112"));
......@@ -236,6 +237,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class);
return ResponseDto.success(kylinTicketPartnerVoData);
} catch (Exception e) {
e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20103));
}
}
......@@ -282,16 +284,22 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
return ResponseDto.failure(ErrorMapping.get(20106));
}
} catch (Exception e) {
e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20102));
}
}
@Override
public ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId) {
public ResponseDto<KylinTicketPartnerVo> copyTicket(String performanceId,String ticketsId) {
try {
// 获取 当前时间 -> 创建时间
LocalDateTime createdAt = LocalDateTime.now();
PerformancePartnerVo performancePartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if(performancePartnerVo.getAuditStatus()==1){
return ResponseDto.failure(ErrorMapping.get(20107));
}
KylinTicketPartnerVo kylinTicketPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketsId").is(ticketsId)), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
kylinTicketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
kylinTicketPartnerVo.setTicketsId(IDGenerator.nextSnowId().toString());
......@@ -301,6 +309,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
);
return ResponseDto.success(kylinTicketPartnerVo);
} catch (Exception e) {
e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20107));
}
}
......@@ -361,6 +370,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
return ResponseDto.failure(ErrorMapping.get(20110));
}
}catch (Exception e){
e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20108));
}
}
......@@ -391,6 +401,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
return ResponseDto.failure(ErrorMapping.get(20111));
}
}catch (Exception e){
e.printStackTrace();
return ResponseDto.failure(ErrorMapping.get(20109));
}
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ 8f5a180d
......@@ -171,6 +171,9 @@ public class PerformanceVoTask {
}
}
}
if(vo.getAppStatus()<=4){
appStatus=vo.getAppStatus();
}
if(vo.getAppStatus()==7){
appStatus=7;
}
......
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