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

Skip to content

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

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

parents 6d3e756d 9b2309c0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 255 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectInfoVo.java
View file @ db77b556
......@@ -6,7 +6,7 @@ import lombok.Data;
import java.io.Serializable;
@ApiModel(value = "AdamCollectInfoVo", description = "演出详情")
@ApiModel(value = "AdamCollectInfoVo", description = "详情")
@Data
public class AdamCollectInfoVo implements Serializable, Cloneable {
private static final long serialVersionUID = 5217696983635918221L;
......@@ -16,69 +16,83 @@ public class AdamCollectInfoVo implements Serializable, Cloneable {
private String title;
@ApiModelProperty(value = "演出图片")
private String imgPoster;
// @ApiModelProperty(value = "支付倒计时")
// private Integer payCountdownMinute;
// @ApiModelProperty(value = "演出批文地址")
// private String approvalUrl;
@ApiModelProperty(value = "101音乐节 102小型演出(livehouse演出) 103巡演")
// @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
private int type;
@ApiModelProperty(value = "演出开始时间")
private String timeStart;
@ApiModelProperty(value = "演出结束时间")
private String timeEnd;
@ApiModelProperty(value = "停售时间")
private String stopSellTime;
// @ApiModelProperty(value = "演出结束时间")
// private String timeEnd;
// @ApiModelProperty(value = "停售时间")
// private String stopSellTime;
@ApiModelProperty(value = "价格")
private String price;
@ApiModelProperty(value = "开售时间")
private String sellTime;
@ApiModelProperty(value = "城市id")
private Integer cityId;
// @ApiModelProperty(value = "开售时间")
// private String sellTime;
// @ApiModelProperty(value = "会员开售时间")
// private String sellMemberTime;
// @ApiModelProperty(value = "城市id")
// private Integer cityId;
@ApiModelProperty(value = "城市名称")
private String cityName;
@ApiModelProperty(value = "场地id")
private String fieldId;
// @ApiModelProperty(value = "场地id")
// private String fieldId;
@ApiModelProperty(value = "场地名称")
private String fieldName;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
@ApiModelProperty(value = "场地距离当前位置距离")
private String diffDistance;
@ApiModelProperty(value = "搭售id")
private String projectId;
@ApiModelProperty(value = "巡演id")
private String roadShowId;
// @ApiModelProperty(value = "经度")
// private String longitude;
// @ApiModelProperty(value = "纬度")
// private String latitude;
// @ApiModelProperty(value = "场地距离当前位置距离")
// private String diffDistance;
// @ApiModelProperty(value = "搭售id")
// private String projectId;
// @ApiModelProperty(value = "巡演id")
// private String roadShowId;
// OSS
@ApiModelProperty(value = "演出详情")
private String details;
// OSS
@ApiModelProperty(value = "购票须知")
private String noticeImage;
// // OSS
// @ApiModelProperty(value = "演出详情")
// private String details;
// // OSS
// @ApiModelProperty(value = "购票须知")
// private String noticeImage;
@ApiModelProperty(value = "推荐顺序 0为不推荐")
private Integer isRecommend;
@ApiModelProperty(value = "状态")
private Integer appStatus;
@ApiModelProperty(value = "是否可买")
private Integer statusSell;
// @ApiModelProperty(value = "推荐顺序 0为不推荐")
// private Integer isRecommend;
// @ApiModelProperty(value = "状态")
// private Integer appStatus;
// @ApiModelProperty(value = "是否可买")
// private Integer statusSell;
@ApiModelProperty(value = "是否关联会员")
private Integer isMember;
@ApiModelProperty(value = "是否开启缺票登记")
private Integer isLackRegister;
@ApiModelProperty(value = "是否实名")
private Integer isTrueName;
@ApiModelProperty(value = "限购张数")
private Integer limitCount;
@ApiModelProperty(value = "会员限购张数")
private Integer limitCountMember;
// @ApiModelProperty(value = "是否开启缺票登记")
// private Integer isLackRegister;
// @ApiModelProperty(value = "是否实名")
// private Integer isTrueName;
// @ApiModelProperty(value = "限购张数")
// private Integer limitCount;
// @ApiModelProperty(value = "会员限购张数")
// private Integer limitCountMember;
@ApiModelProperty(value = "是否专属")
private Integer isExclusive;
@ApiModelProperty(value = "是否优惠")
private Integer isDiscount;
@ApiModelProperty(value = "是否提前")
private Integer isAdvance;
@ApiModelProperty(value = "文案")
private String message;
// @ApiModelProperty(value = "是否同步大麦 0 1")
// private Integer sysDamai;
// @ApiModelProperty(value = "文案")
// private String message;
// @ApiModelProperty(value = "演出公告")
// private String notice;
// @ApiModelProperty(value = "是否显示")
// private Integer isShow;
// @ApiModelProperty(value = "场次")
// private List<KylinTicketTimesVo> ticketTimeList;
private static final AdamCollectInfoVo obj = new AdamCollectInfoVo();
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java
View file @ db77b556
......@@ -16,7 +16,7 @@ public interface IAdamCollectionService {
void add(AdamCollectBaseVo collectVo);
AdamCollectBaseVo query(String uid, String type, String contentId);
boolean exists(String uid, String type, String contentId);
void del(String uid, String type, String... contentIds);
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java
View file @ db77b556
package com.liquidnet.service.adam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.entity.AdamDisposed;
/**
* <p>
......@@ -19,7 +17,7 @@ public interface IAdamDisposedService {
void add(AdamDisposedBaseVo disposedBaseVo);
AdamDisposedBaseVo query(String uid, String type, String contentId);
boolean exists(String uid, String type, String contentId);
void del(String uid, String type, String... contentId);
......
liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-base/src/main/java/com/liquidnet/common/exception/entity/Error.java
View file @ db77b556
......@@ -11,6 +11,7 @@ import java.util.List;
public class Error {
String message;
String code;
Object data;
public Error() {
......@@ -20,20 +21,4 @@ public class Error {
this.code = code;
this.message = message;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ db77b556
......@@ -32,6 +32,20 @@ liquidnet:
user: root
pwd: S&y$6d*JwJ
service:
adam:
url-pay:
pay: http://testpay.zhengzai.tv
check: http://testpay.zhengzai.tv/order/verify
callback: http://devadam.zhengzai.tv/adam/member/order/callback
url-service:
url: http://testservice.zhengzai.tv
kylin:
url-pay:
pay: http://testpay.zhengzai.tv/
check: http://testpay.zhengzai.tv/order/verify
localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
url-service:
url: http://testservice.zhengzai.tv/
executor-main:
xxl:
admin:
......
liquidnet-bus-config/liquidnet-config/application-prod.yml deleted 100644 → 0
View file @ 6d3e756d
config-server-git: prod
#application-dev-begin
#这里后续添加公共参数值
liquidnet:
security:
username: user
password: user123
mysql:
urlHostAndPort: 192.168.31.205:3306
username: liquidnet
password: LiquidNet!@#4
rabbitmq:
host: 192.168.31.205
port: 5672
username: liquidnet
password: LiquidNet!@#4
knife4j:
disable: true
redis:
host: 192.168.31.205
port: 6379
password: LiquidNet!@#4
mongodb:
host: 192.168.31.205
port: 27017
gfsdatabasename: liquidnet_mgdb
#以下为各应用需要用到的ip及端口设置
#涉及到ip的地方尽量都放入公共变量，方便统一修改
#以下liquidnet.service.adam.conf.webUrl 对应liquidnet.conf.webUrl 依此类推
service:
adam:
conf:
webUrl: http://192.168.31.205
executor-main:
xxl:
admin:
addresses: 192.168.31.205:8090
#application-dev-end
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ db77b556
......@@ -36,6 +36,20 @@ liquidnet:
user: root
pwd: $hAh4SGcDQ
service:
adam:
url-pay:
pay: http://testpay.zhengzai.tv
check: http://testpay.zhengzai.tv/order/verify
callback: http://adam.zhengzai.tv/adam/member/order/callback
url-service:
url: http://testservice.zhengzai.tv
kylin:
url-pay:
pay: http://testpay.zhengzai.tv/
check: http://testpay.zhengzai.tv/order/verify
localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
url-service:
url: http://testservice.zhengzai.tv/
executor-main:
xxl:
admin:
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml
View file @ db77b556
......@@ -23,11 +23,11 @@ liquidnet:
sslEnabled: false
database: dev_ln_scene
url-pay:
pay: http://testpay.zhengzai.tv
check: http://testpay.zhengzai.tv/order/verify
callback: http://devadam.zhengzai.tv/adam/member/order/callback
pay: ${liquidnet.service.adam.url-pay.pay}
check: ${liquidnet.service.adam.url-pay.check}
callback: ${liquidnet.service.adam.url-pay.callback}
url-service:
url: http://testservice.zhengzai.tv
url: ${liquidnet.service.adam.url-service.url}
aliyun:
accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml
View file @ db77b556
......@@ -23,11 +23,11 @@ liquidnet:
sslEnabled: false
database: test_ln_scene
url-pay:
pay: http://testpay.zhengzai.tv
check: http://testpay.zhengzai.tv/order/verify
callback: http://adam.zhengzai.tv/adam/member/order/callback
pay: ${liquidnet.service.adam.url-pay.pay}
check: ${liquidnet.service.adam.url-pay.check}
callback: ${liquidnet.service.adam.url-pay.callback}
url-service:
url: http://testservice.zhengzai.tv
url: ${liquidnet.service.adam.url-service.url}
aliyun:
accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml
View file @ db77b556
......@@ -23,10 +23,10 @@ liquidnet:
sslEnabled: false
database: dev_ln_scene
url-pay:
pay: http://testpay.zhengzai.tv/
check: http://testpay.zhengzai.tv/order/verify
localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
pay: ${liquidnet.service.kylin.url-pay.pay}
check: ${liquidnet.service.kylin.url-pay.check}
localUrl: ${liquidnet.service.kylin.url-pay.callback}
url-service:
url: http://testservice.zhengzai.tv/
url: ${liquidnet.service.kylin.url-service.url}
al-oss:
imgUrl: "https://img.zhengzai.tv/"
liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml
View file @ db77b556
......@@ -23,10 +23,10 @@ liquidnet:
sslEnabled: false
database: test_ln_scene
url-pay:
pay: http://testpay.zhengzai.tv/
check: http://testpay.zhengzai.tv/order/verify
localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
pay: ${liquidnet.service.kylin.url-pay.pay}
check: ${liquidnet.service.kylin.url-pay.check}
localUrl: ${liquidnet.service.kylin.url-pay.callback}
url-service:
url: http://testservice.zhengzai.tv/
url: ${liquidnet.service.kylin.url-service.url}
al-oss:
imgUrl: "https://img.zhengzai.tv/"
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java
View file @ db77b556
......@@ -203,7 +203,7 @@ public class KylinOrderTickets implements Serializable {
orderTicketsId, userId, userName, userMobile, performanceTitle, orderCode, qrCode, orderType, orderVersion,
number, price, priceMember, priceTotal, priceVoucher, priceActual, priceExpress, priceRefund, refundNumber,
payType, paymentType, timePay, expressContacts, expressAddress, expressPhone, couponType, getTicketType,
getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt,payCode
getTicketDescribe, payCountdownMinute, comment, createdAt, updatedAt, payCode
};
}
......@@ -212,9 +212,9 @@ public class KylinOrderTickets implements Serializable {
*
* @return
*/
public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
public Object[] getPayAgainObject(LocalDateTime updateTime, LocalDateTime createTime) {
return new Object[]{
updatedAt, orderCode, orderTicketsId,updateTime,createTime
orderCode, updatedAt, orderTicketsId, updateTime, createTime
};
}
......@@ -223,9 +223,9 @@ public class KylinOrderTickets implements Serializable {
*
* @return
*/
public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
public Object[] getSynOrderObject(LocalDateTime updateTime, LocalDateTime createTime) {
return new Object[]{
paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId, updateTime, createTime
};
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamCollectionController.java
View file @ db77b556
......@@ -50,8 +50,9 @@ public class AdamCollectionController {
@RequestParam String contentId) {
String currentUid = CurrentUtil.getCurrentUid();
AdamCollectBaseVo existVo = adamCollectionService.query(currentUid, type, contentId);
if (null != existVo) return ResponseDto.success();
if (adamCollectionService.exists(currentUid, type, contentId)) {
return ResponseDto.success();
}
AdamCollectBaseVo collectVo = AdamCollectBaseVo.getNew();
collectVo.setType(type);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamDisposedController.java
View file @ db77b556
......@@ -51,8 +51,9 @@ public class AdamDisposedController {
@RequestParam String contentId) {
String currentUid = CurrentUtil.getCurrentUid();
AdamDisposedBaseVo existVo = adamDisposedService.query(currentUid, type, contentId);
if (null != existVo) return ResponseDto.success();
if (adamDisposedService.exists(currentUid, type, contentId)) {
return ResponseDto.success();
}
AdamDisposedBaseVo disposedBaseVo = AdamDisposedBaseVo.getNew();
disposedBaseVo.setType(type);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
View file @ db77b556
......@@ -490,7 +490,7 @@ public class AdamRdmService {
/* ========================================================== | Other micro-service data inquiry */
public KylinPerformanceVo kylinPerformanceVos(String performancesId) {
public KylinPerformanceVo kylinPerformanceVo(String performancesId) {
return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performancesId);
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @ db77b556
......@@ -25,6 +25,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.LinkedList;
......@@ -69,10 +70,11 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
}
@Override
public AdamCollectBaseVo query(String uid, String type, String contentId) {
return mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").is(contentId).and("state").is(1)),
AdamCollectBaseVo.class, AdamCollectBaseVo.class.getSimpleName());
public boolean exists(String uid, String type, String contentId) {
return mongoTemplate.exists(
Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
AdamCollectBaseVo.class.getSimpleName()
);
}
@Override
......@@ -105,7 +107,9 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamCollectVo> voPageInfo = null;
if (count > 0) {
......@@ -113,31 +117,58 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
query.with(pageable);
s = System.currentTimeMillis();
List<AdamCollectVo> collectVoList = mongoTemplate.find(query, AdamCollectVo.class, AdamCollectBaseVo.class.getSimpleName());
try {
String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]);
ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = feignKylinPerformanceClient.performanceList(contentIds);
if (performanceVoListDto.isSuccess()) {
List<KylinPerformanceVo> kylinPerformanceVoList = performanceVoListDto.getData();
collectVoList.forEach(v -> {
kylinPerformanceVoList.forEach(vl -> {
if (vl.getPerformancesId().equals(v.getContentId())) {
AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
BeanUtils.copyProperties(vl, collectInfoVo);
v.setContentInfo(collectInfoVo);
}
});
});
} else {
log.info("Failed:{}.API.performanceList(...) for AdamCollection:{}", feignKylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
}
} catch (Exception e) {
log.error("Exception:{}.API.performanceList(...) for AdamCollection", feignKylinPerformanceClient.getClass().getSimpleName(), e);
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (!CollectionUtils.isEmpty(collectVoList)) {
// try {
// String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]);
//
// ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = feignKylinPerformanceClient.performanceList(contentIds);
//
// if (performanceVoListDto.isSuccess()) {
// List<KylinPerformanceVo> kylinPerformanceVoList = performanceVoListDto.getData();
//
// collectVoList.forEach(v -> {
// kylinPerformanceVoList.forEach(vl -> {
// if (vl.getPerformancesId().equals(v.getContentId())) {
// AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
// BeanUtils.copyProperties(vl, collectInfoVo);
// v.setContentInfo(collectInfoVo);
// }
// });
// });
// } else {
// log.info("Failed:{}.API.performanceList(...) for AdamCollection:{}", feignKylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
// }
// } catch (Exception e) {
// log.error("Exception:{}.API.performanceList(...) for AdamCollection", feignKylinPerformanceClient.getClass().getSimpleName(), e);
// }
s = System.currentTimeMillis();
collectVoList.forEach(r -> {
AdamCollectInfoVo vo = AdamCollectInfoVo.getNew();
KylinPerformanceVo performanceVo = adamRdmService.kylinPerformanceVo(r.getContentId());
if (null != performanceVo) {
// BeanUtils.copyProperties(performanceVo, vo);
vo.setPerformancesId(performanceVo.getPerformancesId());
vo.setTitle(performanceVo.getTitle());
vo.setImgPoster(performanceVo.getImgPoster());
vo.setType(performanceVo.getType());
vo.setTimeStart(performanceVo.getTimeStart());
vo.setPrice(performanceVo.getPrice());
vo.setCityName(performanceVo.getCityName());
vo.setFieldName(performanceVo.getFieldName());
vo.setIsMember(performanceVo.getIsMember());
vo.setIsExclusive(performanceVo.getIsExclusive());
vo.setIsDiscount(performanceVo.getIsDiscount());
vo.setIsAdvance(performanceVo.getIsAdvance());
}
r.setContentInfo(vo);
});
log.debug("#COL.RDS.K耗时:{}ms", System.currentTimeMillis() - s);
}
voPageInfo = PageInfo.of(collectVoList);
voPageInfo.setTotal(count);
} else {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @ db77b556
......@@ -52,8 +52,8 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
/* ---------------- 外部服务API ---------------- */
@Autowired
FeignKylinPerformanceClient kylinPerformanceClient;
// @Autowired
// FeignKylinPerformanceClient kylinPerformanceClient;
@Override
public void add(AdamDisposedBaseVo vo) {
......@@ -72,10 +72,11 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
}
@Override
public AdamDisposedBaseVo query(String uid, String type, String contentId) {
return mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").is(contentId).and("state").is(1)),
AdamDisposedBaseVo.class, AdamDisposedBaseVo.class.getSimpleName());
public boolean exists(String uid, String type, String contentId) {
return mongoTemplate.exists(
Query.query(Criteria.where("uid").is(uid).and("contentId").is(contentId).and("type").is(type).and("state").is(1)),
AdamDisposedBaseVo.class.getSimpleName()
);
}
@Override
......@@ -108,51 +109,79 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
public PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamDisposedVo> voPageInfo = null;
if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
s = System.currentTimeMillis();
List<AdamDisposedVo> disposedVoList = mongoTemplate.find(query, AdamDisposedVo.class, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
if (!CollectionUtils.isEmpty(disposedVoList)) {
List<KylinPerformanceVo> kylinPerformanceVoList = null;
try {
String[] contentIds = disposedVoList.stream().map(AdamDisposedVo::getContentId).toArray(a -> new String[disposedVoList.size()]);
ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
if (performanceVoListDto.isSuccess()) {
kylinPerformanceVoList = performanceVoListDto.getData();
} else {
log.info("Failed:{}.API.performanceList(...) for AdamDisposedVo:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
// List<KylinPerformanceVo> kylinPerformanceVoList = null;
// try {
// String[] contentIds = disposedVoList.stream().map(AdamDisposedVo::getContentId).toArray(a -> new String[disposedVoList.size()]);
//
// ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
//
// if (performanceVoListDto.isSuccess()) {
// kylinPerformanceVoList = performanceVoListDto.getData();
// } else {
// log.info("Failed:{}.API.performanceList(...) for AdamDisposedVo:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
// }
// } catch (Exception e) {
// log.error("Exception:{}.API.performanceList(...) for AdamDisposedVo >> {}", kylinPerformanceClient.getClass().getSimpleName(), e.getLocalizedMessage());
// }
//
// if (!CollectionUtils.isEmpty(kylinPerformanceVoList)) {
// kylinPerformanceVoList.forEach(pv -> {
// disposedVoList.forEach(v -> {
// if (pv.getPerformancesId().equals(v.getContentId())) {
// AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
// BeanUtils.copyProperties(pv, collectInfoVo);
// v.setContentInfo(collectInfoVo);
// }
//
// PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
//
// if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
// });
// });
// } else {
// disposedVoList.forEach(v -> {
// PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
//
// if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
// });
// }
s = System.currentTimeMillis();
disposedVoList.forEach(r -> {
AdamCollectInfoVo vo = AdamCollectInfoVo.getNew();
KylinPerformanceVo performanceVo = adamRdmService.kylinPerformanceVo(r.getContentId());
if (null != performanceVo) {
// BeanUtils.copyProperties(performanceVo, vo);
vo.setPerformancesId(performanceVo.getPerformancesId());
vo.setTitle(performanceVo.getTitle());
vo.setImgPoster(performanceVo.getImgPoster());
vo.setType(performanceVo.getType());
vo.setTimeStart(performanceVo.getTimeStart());
vo.setPrice(performanceVo.getPrice());
vo.setCityName(performanceVo.getCityName());
vo.setFieldName(performanceVo.getFieldName());
vo.setIsMember(performanceVo.getIsMember());
vo.setIsExclusive(performanceVo.getIsExclusive());
vo.setIsDiscount(performanceVo.getIsDiscount());
vo.setIsAdvance(performanceVo.getIsAdvance());
}
} catch (Exception e) {
log.error("Exception:{}.API.performanceList(...) for AdamDisposedVo >> {}", kylinPerformanceClient.getClass().getSimpleName(), e.getLocalizedMessage());
}
if (!CollectionUtils.isEmpty(kylinPerformanceVoList)) {
kylinPerformanceVoList.forEach(pv -> {
disposedVoList.forEach(v -> {
if (pv.getPerformancesId().equals(v.getContentId())) {
AdamCollectInfoVo collectInfoVo = AdamCollectInfoVo.getNew();
BeanUtils.copyProperties(pv, collectInfoVo);
v.setContentInfo(collectInfoVo);
}
PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
});
});
} else {
disposedVoList.forEach(v -> {
PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, v.getContentId(), 1, 3);
if (disposedUserVoPageInfo.getTotal() > 0) v.setUserVos(disposedUserVoPageInfo.getList());
});
}
r.setContentInfo(vo);
PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, r.getContentId(), 1, 3);
if (disposedUserVoPageInfo.getTotal() > 0) r.setUserVos(disposedUserVoPageInfo.getList());
});
log.debug("#DIS.RDS.MDB.K耗时:{}ms", System.currentTimeMillis() - s);
}
voPageInfo = PageInfo.of(disposedVoList);
......@@ -168,13 +197,17 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
public PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) {
Query query = Query.query(Criteria.where("type").is(type).and("contentId").is(contentId).and("state").is(1));
long s = System.currentTimeMillis();
long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
PageInfo<AdamDisposedUserVo> voPageInfo = null;
if (count > 0) {
query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
s = System.currentTimeMillis();
List<AdamDisposedUserVo> disposedUserVoList = mongoTemplate.find(query, AdamDisposedUserVo.class, AdamDisposedBaseVo.class.getSimpleName());
log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
voPageInfo = PageInfo.of(disposedUserVoList);
voPageInfo.setTotal(count);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMAddressesProcessor.java
View file @ db77b556
......@@ -46,8 +46,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
sql += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMEntersProcessor.java
View file @ db77b556
......@@ -46,8 +46,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
sql += " and user_id in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberOrderProcessor.java
View file @ db77b556
......@@ -72,8 +72,8 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
sql += " and uid in ('2026628','544327','1997335','773650','809406')";
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java
View file @ db77b556
......@@ -45,8 +45,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
sql += " and uid in ('2026628','544327','1997335','773650','809406')";
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMThirdPartsProcessor.java
View file @ db77b556
......@@ -45,8 +45,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
sql += " and uid in ('2026628','544327','1997335','773650','809406')";
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserInformationProcessor.java
View file @ db77b556
......@@ -65,8 +65,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += "and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014')";
sql += " and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014')";
sqlCount += "and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873')";
sql += " and mobile in ('13753596360','17701223310','18518013286','18548596019','15901093014','17382319723','13631444097','13671737873')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserMemberProcessor.java
View file @ db77b556
......@@ -46,8 +46,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field);
if ("1".equals(flg)) {
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406')";
sql += " and uid in ('2026628','544327','1997335','773650','809406')";
sqlCount += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
sql += " and uid in ('2026628','544327','1997335','773650','809406','1167451','423063','677171')";
}
sql += " limit ?,?";
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ db77b556
......@@ -278,7 +278,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
if (isTrueName == 1) {
currentTime = System.currentTimeMillis();
for (String enterId : payOrderParam.getEnterIdList()) {
AdamEntersVo adamEnters = orderUtils.getEnters(uid,enterId);//feignAdamBaseClient.queryEnters(enterId, uid).getData();
AdamEntersVo adamEnters = orderUtils.getEnters(uid, enterId);//feignAdamBaseClient.queryEnters(enterId, uid).getData();
entersVoList.add(adamEnters);
if (isStudent == 1) {
int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
......@@ -379,7 +379,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
orderTickets.setTimePay(null);
if (payOrderParam.getIsExpress() == 1) {
currentTime = System.currentTimeMillis();
AdamAddressesVo addressesVo = orderUtils.getAddress(uid,payOrderParam.getAddressId());//feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
AdamAddressesVo addressesVo = orderUtils.getAddress(uid, payOrderParam.getAddressId());//feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
orderTickets.setExpressContacts(addressesVo.getName());
orderTickets.setExpressAddress(addressesVo.getAddress());
orderTickets.setExpressPhone(addressesVo.getPhone());
......@@ -685,8 +685,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
httpData.add("open_id", payAgainParam.getOpenId());
if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
httpData.add("show_url", payAgainParam.getShowUrl());
httpData.add("return_url", payAgainParam.getReturnUrl());
httpData.add("show_url", payAgainParam.getShowUrl() + payAgainParam.getOrderId());
httpData.add("return_url", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
}
String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
......@@ -787,7 +787,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
if(orderTicketData.getStatus()==0){
if (orderTicketData.getStatus() == 2) {
orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
} else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
log.error("订单号位 {} 的订单正在退款 或者已退款", syncOrderParam.getOrder_code());
} else {
orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
orderTickets.setPaymentType(syncOrderParam.getPayment_type());
orderTickets.setPayCode(syncOrderParam.getCode());
......@@ -877,12 +881,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
} else if (orderTicketData.getGetTicketType().equals("electronic")) {
configVo.setId(ticketData.getIsShowCode() == 1 ? "SMS_171358560" : "SMS_181500419");
}
otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
// otherUtils.sendMessage(orderTicketData.getUserMobile(), dataVo, configVo, 1);
// 大麦回调
sycDamaiOrder(orderTickets.getOrderTicketsId());
}else{
orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
}
redisLockUtil.unlock(lock);
return "success";
......@@ -910,7 +912,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
item.setKuaidi_status(-2);
}
if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
item.setRestTime(DateUtil.intervalSeconds(
DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
......@@ -940,6 +942,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
checkOrderTime(uid);
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
if (!orderTicketVo.getUserId().equals(uid)) {
log.error("ORDER_TICKET_USER_ID : {}",orderTicketVo.getUserId());
log.error("TOKEN UID : {}",uid);
return null;
}
if (null != orderTicketVo) {
......@@ -1087,6 +1091,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
String orderTicketId = t.split(",")[0];
String uid = t.split(",")[1];
KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(orderTicketId);
vo.setStatus(2);
redisUtil.set(KylinRedisConst.ORDER + orderTicketId, vo);
mongoVoUtils.resetOrderListVo(uid, 2, orderTicketId, vo);
// redis 限购
......@@ -1134,9 +1139,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
String uid = CurrentUtil.getCurrentUid();
List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
Integer unPayCount = 0;
for (KylinOrderListVo item : voList ){
if(item.getStatus()==0){
unPayCount+=1;
for (KylinOrderListVo item : voList) {
if (item.getStatus() == 0) {
unPayCount += 1;
}
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ db77b556
......@@ -143,12 +143,14 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
}
public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom) {
KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
performancesInfo = checkAppStatusInfo(performancesInfo);
performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
try {
performancesInfo = checkAppStatusInfo(performancesInfo);
performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
} catch (Exception e) {
e.printStackTrace();
log.debug(" ERROR PERFORMANCE DETAILS PERFORMANCE_ID : " + performancesId);
}
// 处理距离
if (longitudeFrom != CommonConst.DFT_DOUBLE_VAL) {
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @ db77b556
......@@ -109,15 +109,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
// 无 performancesId 则 创建
if (null == step1Param.getPerformancesId()) {
result = createStep1(step1Param);
log.info(" PERFORMANCE 演出第一步 创建");
} else { // 获取 create 数据 status = 0 或 无数据 创建
PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if (createParam == null) {
result = createStep1(step1Param);
log.info(" PERFORMANCE 演出第一步 创建");
} else {// 修改
result = updateStep1(step1Param);
log.info(" PERFORMANCE 演出第一步 修改");
}
}
return result;
......@@ -217,7 +214,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if (data == null) {
return ResponseDto.failure(ErrorMapping.get(20104));
}
log.info(" PERFORMANCE 演出第一步 获取");
return ResponseDto.success(data);
}
......@@ -230,10 +226,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", step2Param.getPerformancesId()));
if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
result = createStep2(step2Param);
log.info(" PERFORMANCE 演出第二步 创建(拒绝/撤回/第一次)");
} else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9 || performanceStatus.getStatus() == 10) {// 修改
} else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9 ) {// 修改
result = updateStep2(step2Param);
log.info(" PERFORMANCE 演出第二步 修改");
}else if(performanceStatus.getStatus() == 10){
result = ResponseDto.success("演出已结束不可修改");
}
}
return result;
......@@ -370,12 +366,15 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
mapSql.put("updatedAt", createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
KylinPerformances performances = new KylinPerformances();
performances.setAuditTime(LocalDateTime.now());
performances.setNoticeImage(kylinPerformanceMisVo.getNoticeImage());
performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
performanceStatus.setAuditStatus((int) map.get("auditStatus"));
performanceStatus.setIsTrueName(step2Param.getIsTrueName());
performanceStatus.setLimitCount(step2Param.getLimitCount());
performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
//提示：票种价格、售票时间、购票限制 直接生效
//提示：票种价格、售票时间、票种购票限制 直接生效 (演出购票限制，购票须知 演出是否实名 票种缺货登记 票种是否电子票 票种是否快递票 票种最低购买张数 票种是否显示二维码)
List<TicketTimesTicketCreatePartnerVo> timeList = kylinPerformanceMisVo.getTicketTimes();
for (TicketTimesTicketCreatePartnerVo timesItem : timeList) {
List<KylinTicketPartnerVo> ticketList = timesItem.getTicket();
......@@ -396,6 +395,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
inventory.setTotalGeneral(ticketItem.getTotalGeneral());
inventory.setIsTrueName(kylinPerformanceMisVo.getIsTrueName());
inventory.setLimitCount(ticketItem.getLimitCount());
inventory.setIsLackRegister(ticketItem.getIsLackRegister());
inventory.setIsExpress(ticketItem.getIsExpress());
inventory.setIsElectronic(ticketItem.getIsElectronic());
inventory.setCounts(ticketItem.getCounts());
inventory.setIsShowCode(ticketItem.getIsShowCode());
//修改 mysql 售卖时间
KylinTickets ticketSellTime = new KylinTickets();
ticketSellTime.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketItem.getTimeEnd()));
......@@ -450,7 +455,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
BeanUtils.copyProperties(data, performanceStep2Param);
performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
log.info(" PERFORMANCE 演出第二步 获取");
return ResponseDto.success(performanceStep2Param);
}
......@@ -572,7 +576,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
int size = performancePartnerListParam.getSize();
PageInfo<PerformancePartnerListDao> pageInfoTmp = null;
if (status == 0) {//未发布演出
log.info(" PERFORMANCE 演出列表 未提交");
// 排序 分页
Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
//条件
......@@ -595,7 +598,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
pageInfoTmp = new PageInfo(voList);
pageInfoTmp.setTotal(count);
} else {//演出列表
log.info(" PERFORMANCE 演出列表 已提交");
try {
PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java
View file @ db77b556
......@@ -66,15 +66,12 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId()));
if (null == performanceStatus) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(" PERFORMANCE 场次 创建");
} else if(performanceStatus.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20101));
}else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketTimesPartnerVo = addNewTimes(createTicketTimesParam);
log.info(" PERFORMANCE 场次 新增");
} else {
ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(" PERFORMANCE 场次 创建");
}
return ticketTimesPartnerVo;
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ db77b556
......@@ -78,17 +78,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesPartnerVo.getPerformancesId()));
if (null == performanceStatus) {
ticketPartnerVo = createTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 创建");
} else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketPartnerVo = addNewTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 添加");
} else {
ticketPartnerVo = createTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 创建");
}
} else {
ticketPartnerVo = createTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 创建");
}
return ticketPartnerVo;
}
......@@ -200,7 +196,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
@Override
public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
log.info("票 修改");
try {
KylinTicketTimesPartnerVo ticketTimeRelation = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())),
KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
......@@ -253,7 +248,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
@Override
public ResponseDto<String> deleteTicket(String ticketsId) {
log.info("票 删除");
try {
LocalDateTime updatedAt = LocalDateTime.now();
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ db77b556
......@@ -398,10 +398,6 @@ public class PerformanceVoTask {
return true;
} else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
return true;
} else if (!misVo.getLimitCount().equals(mongoVo.getLimitCount())) {
return true;
} else if (!misVo.getIsTrueName().equals(mongoVo.getIsTrueName())) {
return true;
}
boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is(-1).and("performancesId").is(performanceId)),
......@@ -412,10 +408,29 @@ public class PerformanceVoTask {
for (int i = 0; i < misVo.getTicketTimes().size(); i++) {
TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
KylinTicketTimesVo timesVo = mongoVo.getTicketTimeList().get(i);
boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is(-2).and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
if (exists2) {
return true;
}
for (KylinTicketPartnerVo ticketPartnerVo : times.getTicket()){
for (KylinTicketVo ticketVo : timesVo.getTicketList()){
if(ticketVo.getTicketsId().equals(ticketPartnerVo.getTicketsId())){
if (!ticketVo.getTitle().equals(ticketPartnerVo.getTitle())) {
return true;
}else if (!ticketVo.getQrCodeShowTime().equals(ticketPartnerVo.getQrCodeShowTime())) {
return true;
}else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
return true;
}else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribesExpress())) {
return true;
}if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
return true;
}
break;
}
}
}
}
return false;
}
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/MongoVoUtils.java
View file @ db77b556
......@@ -180,13 +180,16 @@ public class MongoVoUtils {
data = dataSingle;
}
BeanUtils.copyProperties(data, voItem);
redisVo.add(voItem);
List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
if (redisData.size() > 0) {
if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
redisData.remove(0);
if(type == 1) {
redisVo.add(voItem);
if (redisData.size() > 0) {
if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
redisData.remove(0);
}
}
}
redisVo.addAll(redisData);
switch (type) {
......
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