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

Commit a03bc339 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'dev' into test

parents 32b80b02 e028e331
...@@ -32,6 +32,20 @@ liquidnet: ...@@ -32,6 +32,20 @@ liquidnet:
user: root user: root
pwd: S&y$6d*JwJ pwd: S&y$6d*JwJ
service: 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: executor-main:
xxl: xxl:
admin: admin:
......
config-server-git: prod config-server-git: prod
#application-dev-begin #application-prod-begin
#这里后续添加公共参数值 #这里后续添加公共参数值
liquidnet: liquidnet:
security: security:
username: user username: user
password: user123 password: user123
jwt:
secret: qZHglvNP0n0aOOckHiQXq5JMD468J4eG
expire-ttl: 43200
refresh-ttl: 525600
blacklist_grace_period: 5
mysql: mysql:
urlHostAndPort: 192.168.31.205:3306 urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306
username: liquidnet username: zhengzai
password: LiquidNet!@#4 password: $hAh4SGcDQ
rabbitmq: rabbitmq:
host: 192.168.31.205 host: amqp-cn-7pp26mhtn001.mq-amqp.cn-beijing-327844-a-internal.aliyuncs.com
port: 5672 port: 5672
username: liquidnet username: MjphbXFwLWNuLTdwcDI2bWh0bjAwMTpMVEFJNXRGajR0UWplbW82NjRCcmtxS1o=
password: LiquidNet!@#4 password: MzlENTBFRDE0NEE4MkM1RUE2MTc1RDhBMTVFNzhDQTNDQTQ3NEY4RDoxNjIyODE1ODU3ODEz
virtual-host: liquidnet
knife4j: knife4j:
disable: true disable: false
redis: redis:
host: 192.168.31.205 host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6379 # host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
password: LiquidNet!@#4 port: 6380
password: PO@B!Iud32
# host: r-2ze7002ckw5u75fguk.redis.rds.aliyuncs.com
# port: 6380
# password: PO@B!Iud32
mongodb: mongodb:
host: 192.168.31.205 host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
port: 27017 port: 3717
gfsdatabasename: liquidnet_mgdb user: root
#以下为各应用需要用到的ip及端口设置 pwd: $hAh4SGcDQ
#涉及到ip的地方尽量都放入公共变量,方便统一修改
#以下liquidnet.service.adam.conf.webUrl 对应liquidnet.conf.webUrl 依此类推
service: service:
adam: adam:
conf: url-pay:
webUrl: http://192.168.31.205 pay: http://pay.zhengzai.tv
check: http://pay.zhengzai.tv/order/verify
callback: http://adam.zhengzai.tv/adam/member/order/callback
url-service:
url: http://service.zhengzai.tv
kylin:
url-pay:
pay: http://pay.zhengzai.tv/
check: http://pay.zhengzai.tv/order/verify
localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
url-service:
url: http://service.zhengzai.tv/
executor-main: executor-main:
xxl: xxl:
admin: admin:
addresses: 192.168.31.205:8090 addresses: 172.17.121.166:8090
#application-dev-end
\ No newline at end of file
...@@ -36,6 +36,20 @@ liquidnet: ...@@ -36,6 +36,20 @@ liquidnet:
user: root user: root
pwd: $hAh4SGcDQ pwd: $hAh4SGcDQ
service: 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: executor-main:
xxl: xxl:
admin: admin:
......
liquidnet:
info:
context: /
name: liquidnet-client-job
port: 8090
logfile:
name: client-job
path: ./logs
mysql:
database-name: prod_ln_clijob
\ No newline at end of file
...@@ -23,11 +23,11 @@ liquidnet: ...@@ -23,11 +23,11 @@ liquidnet:
sslEnabled: false sslEnabled: false
database: dev_ln_scene database: dev_ln_scene
url-pay: url-pay:
pay: http://testpay.zhengzai.tv pay: ${liquidnet.service.adam.url-pay.pay}
check: http://testpay.zhengzai.tv/order/verify check: ${liquidnet.service.adam.url-pay.check}
callback: http://devadam.zhengzai.tv/adam/member/order/callback callback: ${liquidnet.service.adam.url-pay.callback}
url-service: url-service:
url: http://testservice.zhengzai.tv url: ${liquidnet.service.adam.url-service.url}
aliyun: aliyun:
accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
......
liquidnet:
system:
updating:
switch: false
info:
port: 9001
context: /adam
name: liquidnet-service-adam
logfile:
path: ./logs
name: service-adam
config: classpath:logback-spring.xml
file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level: debug
rabbitmq:
connection-timeout: 3000
mysql:
database-name: prod_ln_scene
mongodb:
sslEnabled: false
database: prod_ln_scene
url-pay:
pay: ${liquidnet.service.adam.url-pay.pay}
check: ${liquidnet.service.adam.url-pay.check}
callback: ${liquidnet.service.adam.url-pay.callback}
url-service:
url: ${liquidnet.service.adam.url-service.url}
aliyun:
accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
#以下为spring各环境个性配置
...@@ -23,11 +23,11 @@ liquidnet: ...@@ -23,11 +23,11 @@ liquidnet:
sslEnabled: false sslEnabled: false
database: test_ln_scene database: test_ln_scene
url-pay: url-pay:
pay: http://testpay.zhengzai.tv pay: ${liquidnet.service.adam.url-pay.pay}
check: http://testpay.zhengzai.tv/order/verify check: ${liquidnet.service.adam.url-pay.check}
callback: http://adam.zhengzai.tv/adam/member/order/callback callback: ${liquidnet.service.adam.url-pay.callback}
url-service: url-service:
url: http://testservice.zhengzai.tv url: ${liquidnet.service.adam.url-service.url}
aliyun: aliyun:
accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU
......
liquidnet:
system:
updating:
switch: false
info:
port: 9999
context:
# context: /service-consumer
name: liquidnet-service-consumer
logfile:
path: ./logs
name: service-consumer
config: classpath:logback-spring.xml
file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level-root: debug
rabbitmq:
connection-timeout: 3000
mysql:
database-name: prod_ln_scene
#以下为spring各环境个性配置
liquidnet:
info:
port: 8190
context: /service-executor-main
name: liquidnet-service-executor-main
logfile:
path: ./logs
name: service-executor-main
xxl:
accessToken: qk52rqSejRBm9enf6BTTxw==
admin:
# Job执行器注册地址,多个地址则用逗号分隔
# addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
executor:
# Job执行器IP,默认为空表示自动获取IP,多网卡时手动指定
ip:
# Job执行器端口,单机多个执行器端口号不能相同
port: 8191
# Job执行器心跳注册分组依据,按需配置
appname: liquidnet-service-executor
# Job执行器运行日志,注意目录读写权限
logpath: ./logs/job
...@@ -23,10 +23,10 @@ liquidnet: ...@@ -23,10 +23,10 @@ liquidnet:
sslEnabled: false sslEnabled: false
database: dev_ln_scene database: dev_ln_scene
url-pay: url-pay:
pay: http://testpay.zhengzai.tv/ pay: ${liquidnet.service.kylin.url-pay.pay}
check: http://testpay.zhengzai.tv/order/verify check: ${liquidnet.service.kylin.url-pay.check}
localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder localUrl: ${liquidnet.service.kylin.url-pay.callback}
url-service: url-service:
url: http://testservice.zhengzai.tv/ url: ${liquidnet.service.kylin.url-service.url}
al-oss: al-oss:
imgUrl: "https://img.zhengzai.tv/" imgUrl: "https://img.zhengzai.tv/"
liquidnet:
system:
updating:
switch: false
info:
port: 9002
context: /kylin
name: liquidnet-service-kylin
logfile:
path: ./logs
name: service-kylin
config: classpath:logback-spring.xml
file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
level-root: info
rabbitmq:
connection-timeout: 3000
mysql:
database-name: prod_ln_scene
mongodb:
sslEnabled: false
database: prod_ln_scene
url-pay:
pay: ${liquidnet.service.kylin.url-pay.pay}
check: ${liquidnet.service.kylin.url-pay.check}
localUrl: ${liquidnet.service.kylin.url-pay.callback}
url-service:
url: ${liquidnet.service.kylin.url-service.url}
al-oss:
imgUrl: "https://img.zhengzai.tv/"
...@@ -23,10 +23,10 @@ liquidnet: ...@@ -23,10 +23,10 @@ liquidnet:
sslEnabled: false sslEnabled: false
database: test_ln_scene database: test_ln_scene
url-pay: url-pay:
pay: http://testpay.zhengzai.tv/ pay: ${liquidnet.service.kylin.url-pay.pay}
check: http://testpay.zhengzai.tv/order/verify check: ${liquidnet.service.kylin.url-pay.check}
localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder localUrl: ${liquidnet.service.kylin.url-pay.callback}
url-service: url-service:
url: http://testservice.zhengzai.tv/ url: ${liquidnet.service.kylin.url-service.url}
al-oss: al-oss:
imgUrl: "https://img.zhengzai.tv/" imgUrl: "https://img.zhengzai.tv/"
...@@ -278,7 +278,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -278,7 +278,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
if (isTrueName == 1) { if (isTrueName == 1) {
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
for (String enterId : payOrderParam.getEnterIdList()) { 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); entersVoList.add(adamEnters);
if (isStudent == 1) { if (isStudent == 1) {
int age = IDCard.getAgeByIdCard(adamEnters.getIdCard()); int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
...@@ -379,7 +379,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -379,7 +379,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
orderTickets.setTimePay(null); orderTickets.setTimePay(null);
if (payOrderParam.getIsExpress() == 1) { if (payOrderParam.getIsExpress() == 1) {
currentTime = System.currentTimeMillis(); 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.setExpressContacts(addressesVo.getName());
orderTickets.setExpressAddress(addressesVo.getAddress()); orderTickets.setExpressAddress(addressesVo.getAddress());
orderTickets.setExpressPhone(addressesVo.getPhone()); orderTickets.setExpressPhone(addressesVo.getPhone());
...@@ -685,8 +685,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -685,8 +685,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
httpData.add("open_id", payAgainParam.getOpenId()); httpData.add("open_id", payAgainParam.getOpenId());
if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) { if (payAgainParam.getPayType().equals("alipay") && payAgainParam.getDeviceFrom().equals("wap")) {
httpData.add("show_url", payAgainParam.getShowUrl()); httpData.add("show_url", payAgainParam.getShowUrl() + payAgainParam.getOrderId());
httpData.add("return_url", payAgainParam.getReturnUrl()); httpData.add("return_url", payAgainParam.getReturnUrl() + payAgainParam.getOrderId());
} }
String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData); String returnData = HttpUtil.post(payUrl + payAgainParam.getDeviceFrom() + "/" + payAgainParam.getPayType(), httpData);
...@@ -787,11 +787,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -787,11 +787,11 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus(); KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities(); KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
if(orderTicketData.getStatus()==2){ if (orderTicketData.getStatus() == 2) {
orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId()); orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId());
}else if(orderTicketData.getStatus()==3 || orderTicketData.getStatus()==4){ } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
log.error("订单号位 {} 的订单正在退款 或者已退款",syncOrderParam.getOrder_code()); log.error("订单号位 {} 的订单正在退款 或者已退款", syncOrderParam.getOrder_code());
}else{ } else {
orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId()); orderTickets.setOrderTicketsId(orderTicketData.getOrderTicketsId());
orderTickets.setPaymentType(syncOrderParam.getPayment_type()); orderTickets.setPaymentType(syncOrderParam.getPayment_type());
orderTickets.setPayCode(syncOrderParam.getCode()); orderTickets.setPayCode(syncOrderParam.getCode());
...@@ -912,7 +912,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -912,7 +912,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
item.setKuaidi_status(-2); item.setKuaidi_status(-2);
} }
if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) { if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
item.setRestTime(DateUtil.intervalSeconds( item.setRestTime(DateUtil.intervalSeconds(
DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"), DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss") DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
...@@ -1136,9 +1136,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -1136,9 +1136,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
List<KylinOrderListVo> voList = dataUtils.getOrderList(uid); List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
Integer unPayCount = 0; Integer unPayCount = 0;
for (KylinOrderListVo item : voList ){ for (KylinOrderListVo item : voList) {
if(item.getStatus()==0){ if (item.getStatus() == 0) {
unPayCount+=1; unPayCount += 1;
} }
} }
......
...@@ -109,15 +109,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -109,15 +109,12 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
// 无 performancesId 则 创建 // 无 performancesId 则 创建
if (null == step1Param.getPerformancesId()) { if (null == step1Param.getPerformancesId()) {
result = createStep1(step1Param); result = createStep1(step1Param);
log.info(" PERFORMANCE 演出第一步 创建");
} else { // 获取 create 数据 status = 0 或 无数据 创建 } else { // 获取 create 数据 status = 0 或 无数据 创建
PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName()); PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
if (createParam == null) { if (createParam == null) {
result = createStep1(step1Param); result = createStep1(step1Param);
log.info(" PERFORMANCE 演出第一步 创建");
} else {// 修改 } else {// 修改
result = updateStep1(step1Param); result = updateStep1(step1Param);
log.info(" PERFORMANCE 演出第一步 修改");
} }
} }
return result; return result;
...@@ -217,7 +214,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -217,7 +214,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if (data == null) { if (data == null) {
return ResponseDto.failure(ErrorMapping.get(20104)); return ResponseDto.failure(ErrorMapping.get(20104));
} }
log.info(" PERFORMANCE 演出第一步 获取");
return ResponseDto.success(data); return ResponseDto.success(data);
} }
...@@ -230,10 +226,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -230,10 +226,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", step2Param.getPerformancesId())); KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", step2Param.getPerformancesId()));
if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) { if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
result = createStep2(step2Param); 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 ) {// 修改 } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9 ) {// 修改
result = updateStep2(step2Param); result = updateStep2(step2Param);
log.info(" PERFORMANCE 演出第二步 修改");
}else if(performanceStatus.getStatus() == 10){ }else if(performanceStatus.getStatus() == 10){
result = ResponseDto.success("演出已结束不可修改"); result = ResponseDto.success("演出已结束不可修改");
} }
...@@ -461,7 +455,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -461,7 +455,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param(); PerformanceStep2Param performanceStep2Param = new PerformanceStep2Param();
BeanUtils.copyProperties(data, performanceStep2Param); BeanUtils.copyProperties(data, performanceStep2Param);
performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList); performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
log.info(" PERFORMANCE 演出第二步 获取");
return ResponseDto.success(performanceStep2Param); return ResponseDto.success(performanceStep2Param);
} }
...@@ -583,7 +576,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -583,7 +576,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
int size = performancePartnerListParam.getSize(); int size = performancePartnerListParam.getSize();
PageInfo<PerformancePartnerListDao> pageInfoTmp = null; PageInfo<PerformancePartnerListDao> pageInfoTmp = null;
if (status == 0) {//未发布演出 if (status == 0) {//未发布演出
log.info(" PERFORMANCE 演出列表 未提交");
// 排序 分页 // 排序 分页
Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt")); Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt"));
//条件 //条件
...@@ -606,7 +598,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -606,7 +598,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
pageInfoTmp = new PageInfo(voList); pageInfoTmp = new PageInfo(voList);
pageInfoTmp.setTotal(count); pageInfoTmp.setTotal(count);
} else {//演出列表 } else {//演出列表
log.info(" PERFORMANCE 演出列表 已提交");
try { try {
PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize()); PageHelper.startPage(performancePartnerListParam.getPage(), performancePartnerListParam.getSize());
List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam)); List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
......
...@@ -66,15 +66,12 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -66,15 +66,12 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId())); new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", createTicketTimesParam.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(" PERFORMANCE 场次 创建");
} else if(performanceStatus.getAuditStatus()==0){ } else if(performanceStatus.getAuditStatus()==0){
return ResponseDto.failure(ErrorMapping.get(20101)); return ResponseDto.failure(ErrorMapping.get(20101));
}else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出 }else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketTimesPartnerVo = addNewTimes(createTicketTimesParam); ticketTimesPartnerVo = addNewTimes(createTicketTimesParam);
log.info(" PERFORMANCE 场次 新增");
} else { } else {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(" PERFORMANCE 场次 创建");
} }
return ticketTimesPartnerVo; return ticketTimesPartnerVo;
} }
......
...@@ -78,17 +78,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -78,17 +78,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesPartnerVo.getPerformancesId())); new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesPartnerVo.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 创建");
} else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出 } else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketPartnerVo = addNewTicket(ticketCreateParam); ticketPartnerVo = addNewTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 添加");
} else { } else {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 创建");
} }
} else { } else {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(" PERFORMANCE 票 创建");
} }
return ticketPartnerVo; return ticketPartnerVo;
} }
...@@ -200,7 +196,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -200,7 +196,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
@Override @Override
public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) { public ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam) {
log.info("票 修改");
try { try {
KylinTicketTimesPartnerVo ticketTimeRelation = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), KylinTicketTimesPartnerVo ticketTimeRelation = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())),
KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName()); KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
...@@ -253,7 +248,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -253,7 +248,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
@Override @Override
public ResponseDto<String> deleteTicket(String ticketsId) { public ResponseDto<String> deleteTicket(String ticketsId) {
log.info("票 删除");
try { try {
LocalDateTime updatedAt = LocalDateTime.now(); LocalDateTime updatedAt = LocalDateTime.now();
......
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