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

Skip to content

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

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

parents 86487878 d2f9455e
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 132 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
View file @ d301b222
...@@ -3,10 +3,8 @@ package com.liquidnet.service.adam.dto; ...@@ -3,10 +3,8 @@ package com.liquidnet.service.adam.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.validation.annotation.Validated;
import javax.validation.Valid; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
...@@ -15,6 +13,7 @@ import java.io.Serializable; ...@@ -15,6 +13,7 @@ import java.io.Serializable;
public class AdamThirdPartParam implements Serializable { public class AdamThirdPartParam implements Serializable {
private static final long serialVersionUID = 675588088506034208L; private static final long serialVersionUID = 675588088506034208L;
@ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]") @ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
@NotBlank
private String openId; private String openId;
@ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger") @ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
// @Size(min = 2, max = 64) // @Size(min = 2, max = 64)
......
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java
View file @ d301b222
...@@ -64,7 +64,7 @@ public class KylinTicketPartnerVo implements Serializable { ...@@ -64,7 +64,7 @@ public class KylinTicketPartnerVo implements Serializable {
private String describes; private String describes;
@ApiModelProperty(value = "快递票种说明", example = "这是票种说明") @ApiModelProperty(value = "快递票种说明", example = "这是票种说明")
private String describesExpress; private String describeExpress;
@ApiModelProperty(value = "电子票种说明", example = "这是票种说明") @ApiModelProperty(value = "电子票种说明", example = "这是票种说明")
private String describeElectronic; private String describeElectronic;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ d301b222
...@@ -87,7 +87,7 @@ public class PerformanceVoUtils { ...@@ -87,7 +87,7 @@ public class PerformanceVoUtils {
List<String> performanceIdList = new ArrayList<>(); List<String> performanceIdList = new ArrayList<>();
if (performanceSingleId == null) { if (performanceSingleId == null) {
List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6,8,9)); List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
for (KylinPerformanceStatus item : list) { for (KylinPerformanceStatus item : list) {
performanceIdList.add(item.getPerformanceId()); performanceIdList.add(item.getPerformanceId());
} }
...@@ -138,7 +138,7 @@ public class PerformanceVoUtils { ...@@ -138,7 +138,7 @@ public class PerformanceVoUtils {
} }
} }
if(kylinTicketVoItem.getStatus()==7){ if (kylinTicketVoItem.getStatus() == 7) {
status = 7; status = 7;
} }
//修改票状态 //修改票状态
...@@ -165,20 +165,20 @@ public class PerformanceVoUtils { ...@@ -165,20 +165,20 @@ public class PerformanceVoUtils {
} }
} }
if(vo.getAppStatus()<=4){ if (vo.getAppStatus() <= 4) {
appStatus=vo.getAppStatus(); appStatus = vo.getAppStatus();
} }
if(vo.getAppStatus()==7){ if (vo.getAppStatus() == 7) {
appStatus=7; appStatus = 7;
} }
//修改演出状态 //修改演出状态
KylinPerformanceStatus changeStatus = new KylinPerformanceStatus(); KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
changeStatus.setStatus(appStatus); changeStatus.setStatus(appStatus);
performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId)); performanceStatusMapper.update(changeStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
vo.setAppStatus(appStatus); vo.setAppStatus(appStatus);
dataUtils.updatePerformanceMongo(performancesId,vo); dataUtils.updatePerformanceMongo(performancesId, vo);
} }
} }
...@@ -220,7 +220,8 @@ public class PerformanceVoUtils { ...@@ -220,7 +220,8 @@ public class PerformanceVoUtils {
kylinPerformanceMisVo.setIsDistribution(0); kylinPerformanceMisVo.setIsDistribution(0);
kylinPerformanceMisVo.setSyncAgent(0); kylinPerformanceMisVo.setSyncAgent(0);
kylinPerformanceMisVo.setNoticeImageList(JsonUtils.fromJson(kylinPerformanceMisVo.getNoticeImage(), new TypeReference<List<KylinBuyNoticeVo>>() {})); kylinPerformanceMisVo.setNoticeImageList(JsonUtils.fromJson(kylinPerformanceMisVo.getNoticeImage(), new TypeReference<List<KylinBuyNoticeVo>>() {
}));
return kylinPerformanceMisVo; return kylinPerformanceMisVo;
} }
...@@ -259,6 +260,7 @@ public class PerformanceVoUtils { ...@@ -259,6 +260,7 @@ public class PerformanceVoUtils {
performanceStatus.setUpdatedAt(updatedAt); performanceStatus.setUpdatedAt(updatedAt);
performanceRelations.setPerformanceId(performances.getPerformancesId()); performanceRelations.setPerformanceId(performances.getPerformancesId());
performanceRelations.setRoadShowId(null);
performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString()); performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString());
performanceRelations.setCreatedAt(null); performanceRelations.setCreatedAt(null);
performanceRelations.setUpdatedAt(updatedAt); performanceRelations.setUpdatedAt(updatedAt);
...@@ -293,9 +295,9 @@ public class PerformanceVoUtils { ...@@ -293,9 +295,9 @@ public class PerformanceVoUtils {
ticketTimesMapper.insert(ticketTimes); ticketTimesMapper.insert(ticketTimes);
ticketTimeRelationMapper.insert(ticketTimeRelation); ticketTimeRelationMapper.insert(ticketTimeRelation);
HashMap<String ,Object> map2 = new HashMap<>(); HashMap<String, Object> map2 = new HashMap<>();
map2.put("status",1); map2.put("status", 1);
map2.put("updatedAt",map.get("updatedAt")); map2.put("updatedAt", map.get("updatedAt"));
BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2)); BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map2));
mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinTicketTimesPartnerVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("ticketTimesId").is(ticketTimeRelation.getTimesId())).getQueryObject(), Query.query(Criteria.where("ticketTimesId").is(ticketTimeRelation.getTimesId())).getQueryObject(),
...@@ -382,7 +384,6 @@ public class PerformanceVoUtils { ...@@ -382,7 +384,6 @@ public class PerformanceVoUtils {
ticketStatus.setIsMember(null); ticketStatus.setIsMember(null);
ticketRelations.setCreatedAt(null); ticketRelations.setCreatedAt(null);
tickets.setCreatedAt(null); tickets.setCreatedAt(null);
ticketsMapper.update(tickets, new UpdateWrapper<KylinTickets>().eq("tickets_id", tickets.getTicketsId())); ticketsMapper.update(tickets, new UpdateWrapper<KylinTickets>().eq("tickets_id", tickets.getTicketsId()));
ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", tickets.getTicketsId())); ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", tickets.getTicketsId()));
ticketRelationsMapper.update(ticketRelations, new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", tickets.getTicketsId())); ticketRelationsMapper.update(ticketRelations, new UpdateWrapper<KylinTicketRelations>().eq("ticket_id", tickets.getTicketsId()));
......
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ d301b222
...@@ -50,4 +50,13 @@ liquidnet: ...@@ -50,4 +50,13 @@ liquidnet:
xxl: xxl:
admin: admin:
addresses: 127.0.0.1:8090 addresses: 127.0.0.1:8090
client:
admin:
phpPayUrl: http://testpay.zhengzai.tv
kylinApiUrl: https://kylin.zhengzai.tv
phpServiceUrl: https://devservice.zhengzai.tv
phpoMediaApiUrl: https://devmediaapi.zhengzai.tv
phpMallUrl: https://devmall.zhengzai.tv
phpMerchantApiUrl: https://devmerchantapi.zhengzai.tv
phpPassportUrl: https://devpassport.zhengzai.tv
#application-dev-end #application-dev-end
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ d301b222
...@@ -54,3 +54,12 @@ liquidnet: ...@@ -54,3 +54,12 @@ liquidnet:
xxl: xxl:
admin: admin:
addresses: 172.17.121.166:8090 addresses: 172.17.121.166:8090
client:
admin:
phpPayUrl: http://testpay.zhengzai.tv
kylinApiUrl: https://kylin.zhengzai.tv
phpServiceUrl: https://testservice.zhengzai.tv
phpoMediaApiUrl: https://testmediaapi.zhengzai.tv
phpMallUrl: https://testmall.zhengzai.tv
phpMerchantApiUrl: https://testmerchantapi.zhengzai.tv
phpPassportUrl: https://testpassport.zhengzai.tv
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml
View file @ d301b222
...@@ -9,59 +9,20 @@ liquidnet: ...@@ -9,59 +9,20 @@ liquidnet:
name: client-admin-web name: client-admin-web
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n' level: debug
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
mysql: mysql:
master: master:
urlHostAndPort: 39.106.122.201:3308 urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
username: testmall username: ${liquidnet.mysql.username}
password: zhengzai!mYT password: ${liquidnet.mysql.password}
database-name: dev_ln_scene database-name: dev_ln_scene
slave: slave:
urlHostAndPort: 39.106.122.201:3308 urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
username: testmall username: ${liquidnet.mysql.username}
password: zhengzai!mYT password: ${liquidnet.mysql.password}
database-name: dev_ln_scene database-name: dev_ln_scene
mongodb: mongodb:
host: 39.106.122.201:27017
port: 27017
user: root
pwd: S&y$6d*JwJ
sslEnabled: false sslEnabled: false
database: dev_ln_scene database: dev_ln_scene
redis:
host: 39.106.122.201
port: 6379
password: 3Xa%8p
url-refund:
apply: "http://testpay.zhengzai.tv/refund/single"
notify: "https://devkylin.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://devservice.zhengzai.tv/provinces" #省份
url1: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://devmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://devmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
url7: "https://devmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://devkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "https://devmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://devmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://devmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://devmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://devmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://devmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://devpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
al-oss:
imgUrl: "https://img.zhengzai.tv/"
endpoint: http://oss-cn-hangzhou.aliyuncs.com
accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
appid: 557104628450889728
# end-dev-这里是配置信息基本值 # end-dev-这里是配置信息基本值
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-test.yml
View file @ d301b222
# begin-dev-这里是配置信息基本值 # begin-test-这里是配置信息基本值
liquidnet: liquidnet:
info: info:
port: 7099 port: 7099
...@@ -9,59 +9,20 @@ liquidnet: ...@@ -9,59 +9,20 @@ liquidnet:
name: client-admin-web name: client-admin-web
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n' level: debug
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
mysql: mysql:
master: master:
urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306 urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
username: zhengzai username: ${liquidnet.mysql.username}
password: $hAh4SGcDQ password: ${liquidnet.mysql.password}
database-name: test_ln_scene database-name: test_ln_scene
slave: slave:
urlHostAndPort: zhengzai-test.rwlb.rds.aliyuncs.com:3306 urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}
username: zhengzai username: ${liquidnet.mysql.username}
password: $hAh4SGcDQ password: ${liquidnet.mysql.password}
database-name: test_ln_scene database-name: test_ln_scene
mongodb: mongodb:
host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
port: 3717
user: root
pwd: $hAh4SGcDQ
sslEnabled: false sslEnabled: false
database: test_ln_scene database: test_ln_scene
redis:
host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com # end-test-这里是配置信息基本值
# host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com \ No newline at end of file
port: 6380
password: PO@B!Iud32
url-refund:
apply: "http://testpay.zhengzai.tv/refund/single"
notify: "https://testkylin.zhengzai.tv/kylin/refund/callback"
url-banner:
provinces: "https://testservice.zhengzai.tv/provinces" #省份
url1: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "https://testmediaapi.zhengzai.tv/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "https://testmall.zhengzai.tv/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
url7: "https://testmall.zhengzai.tv/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "https://testkylin.zhengzai.tv/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "https://testmall.zhengzai.tv/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "https://testmall.zhengzai.tv/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "https://testmerchantapi.zhengzai.tv/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "https://testmerchantapi.zhengzai.tv/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "https://testmediaapi.zhengzai.tv/api/play/list?page=1&per_page=50" #视频播单
url24: "https://testmerchantapi.zhengzai.tv/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "https://testpassport.zhengzai.tv/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
al-oss:
imgUrl: "https://img.zhengzai.tv/"
endpoint: http://oss-cn-hangzhou.aliyuncs.com
accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
appid: 557104628450889728
# end-dev-这里是配置信息基本值
\ No newline at end of file
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml
View file @ d301b222
...@@ -13,6 +13,37 @@ ruoyi: ...@@ -13,6 +13,37 @@ ruoyi:
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
#系统自定义配置
liquidnet:
url-refund:
apply: "${liquidnet.client.admin.phpPayUrl}/refund/single"
notify: "${liquidnet.client.admin.kylinApiUrl}/kylin/refund/callback"
url-banner:
provinces: "${liquidnet.client.admin.phpServiceUrl}/provinces" #省份
url1: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "${liquidnet.client.admin.phpMallUrl}/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)&title=''" #票务
url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "${liquidnet.client.admin.kylinApiUrl}/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "${liquidnet.client.admin.phpMallUrl}/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "${liquidnet.client.admin.phpMallUrl}/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "${liquidnet.client.admin.phpoMediaApiUrl}/api/play/list?page=1&per_page=50" #视频播单
url24: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "${liquidnet.client.admin.phpPassportUrl}/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
al-oss:
imgUrl: "https://img.zhengzai.tv/"
endpoint: http://oss-cn-hangzhou.aliyuncs.com
accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
shunfeng:
url: "https://butler-dev-ms.sf-express.com"
sk: 21e9a70f677a2bf29dfa2b3bead4f018
appid: 557104628450889728
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为80 # 服务器的HTTP端口，默认为80
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ d301b222
...@@ -17,6 +17,7 @@ import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo; ...@@ -17,6 +17,7 @@ import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.service.*; import com.liquidnet.service.adam.service.*;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.UserPathDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -170,6 +171,7 @@ public class AdamLoginController { ...@@ -170,6 +171,7 @@ public class AdamLoginController {
loginInfoVo.setUserInfo(userInfoVo); loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo)); loginInfoVo.setToken(this.ssoProcess(userInfoVo));
loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4)); loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo);
} }
...@@ -207,19 +209,16 @@ public class AdamLoginController { ...@@ -207,19 +209,16 @@ public class AdamLoginController {
loginInfoVo.setUserInfo(userInfoVo); loginInfoVo.setUserInfo(userInfoVo);
loginInfoVo.setToken(this.ssoProcess(userInfoVo)); loginInfoVo.setToken(this.ssoProcess(userInfoVo));
loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4)); loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(userInfoVo.getMobile(), 3, 4));
log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo);
} }
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@ApiOperation(value = "第三方账号登录") @ApiOperation(value = "第三方账号登录")
@PostMapping(value = {"login/tpa"}) @PostMapping(value = {"login/tpa"})
public ResponseDto<AdamLoginInfoVo> loginByTpa(@RequestBody @Valid AdamThirdPartParam parameter) { public ResponseDto<AdamLoginInfoVo> loginByTpa(@Valid @RequestBody AdamThirdPartParam parameter) {
log.debug("login by tpa:{}", JsonUtils.toJson(parameter)); log.debug("login by tpa:{}", JsonUtils.toJson(parameter));
boolean toRegister = false;
if (StringUtils.isBlank(parameter.getOpenId())) {
return ResponseDto.failure(ErrorMapping.get("10009"));
}
AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew(); AdamLoginInfoVo loginInfoVo = AdamLoginInfoVo.getNew();
if (StringUtils.isEmpty(parameter.getMobile())) { if (StringUtils.isEmpty(parameter.getMobile())) {
String uid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId()); String uid = adamRdmService.getUidByPlatformOpenId(parameter.getPlatform(), parameter.getOpenId());
...@@ -238,12 +237,14 @@ public class AdamLoginController { ...@@ -238,12 +237,14 @@ public class AdamLoginController {
if (null == registerUserInfo) { if (null == registerUserInfo) {
return ResponseDto.failure(ErrorMapping.get("10000")); return ResponseDto.failure(ErrorMapping.get("10000"));
} }
toRegister = true;
loginInfoVo.setUserInfo(registerUserInfo); loginInfoVo.setUserInfo(registerUserInfo);
loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid())); loginInfoVo.setThirdPartInfo(adamRdmService.getThirdPartVoListByUid(registerUserInfo.getUid()));
// loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo()); // loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
} }
loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo())); loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4)); loginInfoVo.getUserInfo().setMobile(SensitizeUtil.custom(loginInfoVo.getUserInfo().getMobile(), 3, 4));
log.info(UserPathDto.setData(toRegister ? "注册":"登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
return ResponseDto.success(loginInfoVo); return ResponseDto.success(loginInfoVo);
} }
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties
View file @ d301b222
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
10006=第三方账号未注册 10006=第三方账号未注册
10007=该第三方账号已经被其他用户绑定 10007=该第三方账号已经被其他用户绑定
10008=已经绑定过该类型的第三方账号 10008=已经绑定过该类型的第三方账号
10009=OPENID不能为空 10009=
10010= 10010=
10011=性别标签无效 10011=性别标签无效
10012=音乐风格标签无效 10012=音乐风格标签无效
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/DataImpl.java
View file @ d301b222
...@@ -386,7 +386,7 @@ public class DataImpl { ...@@ -386,7 +386,7 @@ public class DataImpl {
ticketPartnerVo.setUseStart(DateUtil.Formatter.yyyyMMddHHmmss.format(tickets.getUseStart())); ticketPartnerVo.setUseStart(DateUtil.Formatter.yyyyMMddHHmmss.format(tickets.getUseStart()));
ticketPartnerVo.setUseEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(tickets.getUseEnd())); ticketPartnerVo.setUseEnd(DateUtil.Formatter.yyyyMMddHHmmss.format(tickets.getUseEnd()));
ticketPartnerVo.setDescribes(tickets.getDescribes()); ticketPartnerVo.setDescribes(tickets.getDescribes());
ticketPartnerVo.setDescribesExpress(tickets.getDescribeExpress()); ticketPartnerVo.setDescribeExpress(tickets.getDescribeExpress());
ticketPartnerVo.setDescribeElectronic(tickets.getDescribeElectronic()); ticketPartnerVo.setDescribeElectronic(tickets.getDescribeElectronic());
ticketPartnerVo.setStatus(ticketStatus.getStatus()); ticketPartnerVo.setStatus(ticketStatus.getStatus());
ticketPartnerVo.setIsShowCode(ticketStatus.getIsShowCode()); ticketPartnerVo.setIsShowCode(ticketStatus.getIsShowCode());
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @ d301b222
...@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.CommonConst; ...@@ -5,6 +5,7 @@ import com.liquidnet.commons.lang.CommonConst;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.DistanceUtil; import com.liquidnet.commons.lang.util.DistanceUtil;
import com.liquidnet.commons.lang.util.ServletUtils; import com.liquidnet.commons.lang.util.ServletUtils;
import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum; import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
...@@ -15,6 +16,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper; ...@@ -15,6 +16,7 @@ import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
import com.liquidnet.service.kylin.service.IKylinPerformancesService; import com.liquidnet.service.kylin.service.IKylinPerformancesService;
import com.liquidnet.service.kylin.timerTask.PerformanceVoTask; import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
import com.liquidnet.service.kylin.utils.DataUtils; import com.liquidnet.service.kylin.utils.DataUtils;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
...@@ -40,6 +42,7 @@ import java.util.stream.Collectors; ...@@ -40,6 +42,7 @@ import java.util.stream.Collectors;
* @since 2021-05-11 * @since 2021-05-11
*/ */
@Service @Service
@Slf4j
public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesService { public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesMapper, KylinPerformances> implements IKylinPerformancesService {
@Autowired @Autowired
...@@ -116,6 +119,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -116,6 +119,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
info.put("total", 0); info.put("total", 0);
info.put("list", performancesListNew); info.put("list", performancesListNew);
log.info(UserPathDto.setData("演出列表",cityName+"/"+type+"/"+isDiscount+"/"+isAdvance+"/"+"/"+isExclusive,info));
return info; return info;
} }
...@@ -165,6 +169,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -165,6 +169,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
performancesInfo.setDiffDistance(diffDistance); performancesInfo.setDiffDistance(diffDistance);
} }
log.info(UserPathDto.setData("演出详情",performancesId+"/"+latitudeFrom+"/"+longitudeFrom,performancesInfo));
return performancesInfo; return performancesInfo;
} }
...@@ -289,6 +294,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -289,6 +294,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
info.put("total", count); info.put("total", count);
info.put("list", list); info.put("list", list);
log.info(UserPathDto.setData("演出搜索",title+"/"+page+"/"+size,info));
return info; return info;
} }
...@@ -315,6 +321,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -315,6 +321,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
PayDetailVo payDetailVo = new PayDetailVo(); PayDetailVo payDetailVo = new PayDetailVo();
payDetailVo.setPerformanceInfo(performancesInfo); payDetailVo.setPerformanceInfo(performancesInfo);
payDetailVo.setTicketInfo(ticketVo); payDetailVo.setTicketInfo(ticketVo);
log.info(UserPathDto.setData("预支付",performancesId+"/"+ticketsId,payDetailVo));
return payDetailVo; return payDetailVo;
} }
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ d301b222
...@@ -18,7 +18,6 @@ import com.liquidnet.service.kylin.timerTask.PerformanceVoTask; ...@@ -18,7 +18,6 @@ import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
import com.mongodb.client.model.ReturnDocument; import com.mongodb.client.model.ReturnDocument;
import com.mongodb.client.result.UpdateResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.bson.Document; import org.bson.Document;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -113,12 +112,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -113,12 +112,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setStatus(0); kylinTicketPartnerVo.setStatus(0);
kylinTicketPartnerVo.setDefault(); kylinTicketPartnerVo.setDefault();
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
} else { } else {
kylinTicketPartnerVo.setDescribesExpress(""); kylinTicketPartnerVo.setDescribeExpress("");
} }
if (ticketCreateParam.getIsElectronic() == 1) { if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
} else { } else {
kylinTicketPartnerVo.setDescribeElectronic(""); kylinTicketPartnerVo.setDescribeElectronic("");
} }
...@@ -163,12 +162,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -163,12 +162,12 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd()); kylinTicketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType()); kylinTicketPartnerVo.setType(kylinTicketTimesPartnerVo.getType());
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
} else { } else {
kylinTicketPartnerVo.setDescribesExpress(""); kylinTicketPartnerVo.setDescribeExpress("");
} }
if (ticketCreateParam.getIsElectronic() == 1) { if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
} else { } else {
kylinTicketPartnerVo.setDescribeElectronic(""); kylinTicketPartnerVo.setDescribeElectronic("");
} }
...@@ -217,10 +216,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -217,10 +216,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
kylinTicketPartnerVo.setTimesId(null); kylinTicketPartnerVo.setTimesId(null);
kylinTicketPartnerVo.setStatus(null); kylinTicketPartnerVo.setStatus(null);
if (ticketCreateParam.getIsExpress() == 1) { if (ticketCreateParam.getIsExpress() == 1) {
kylinTicketPartnerVo.setDescribesExpress(ticketCreateParam.getDescribesExpress()); kylinTicketPartnerVo.setDescribeExpress(ticketCreateParam.getDescribesExpress()==null?"":ticketCreateParam.getDescribesExpress());
} }
if (ticketCreateParam.getIsElectronic() == 1) { if (ticketCreateParam.getIsElectronic() == 1) {
kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()); kylinTicketPartnerVo.setDescribeElectronic(ticketCreateParam.getDescribeElectronic()==null?"":ticketCreateParam.getDescribeElectronic());
} }
kylinTicketPartnerVo.setDefault(); kylinTicketPartnerVo.setDefault();
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java
View file @ d301b222
...@@ -32,7 +32,6 @@ import org.springframework.stereotype.Component; ...@@ -32,7 +32,6 @@ import org.springframework.stereotype.Component;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
...@@ -330,7 +329,7 @@ public class PerformanceVoTask { ...@@ -330,7 +329,7 @@ public class PerformanceVoTask {
tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd()))); tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd())));
if (ticketItem.getIsExpress() == 1) { if (ticketItem.getIsExpress() == 1) {
tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress()))); tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
tickets.setDescribeExpress(ticketItem.getDescribesExpress()); tickets.setDescribeExpress(ticketItem.getDescribeExpress());
} }
if (ticketItem.getIsElectronic() == 1) { if (ticketItem.getIsElectronic() == 1) {
tickets.setDescribeElectronic(ticketItem.getDescribeElectronic()); tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
...@@ -422,7 +421,7 @@ public class PerformanceVoTask { ...@@ -422,7 +421,7 @@ public class PerformanceVoTask {
return true; return true;
}else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) { }else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
return true; return true;
}else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribesExpress())) { }else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribeExpress())) {
return true; return true;
}if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) { }if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
return true; return true;
......
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