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

Skip to content

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

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

parents 83ea932d b694ce5c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 376 additions and 302 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java
View file @ 640b683d
...@@ -46,7 +46,6 @@ public class AdamRedisConst { ...@@ -46,7 +46,6 @@ public class AdamRedisConst {
public static final String SWITCH = ADAM.concat("switch:"); public static final String SWITCH = ADAM.concat("switch:");
public static final String SWITCH_BUY_MEMBER = SWITCH.concat("buy:member"); public static final String SWITCH_BUY_MEMBER = SWITCH.concat("buy:member");
public static final String SWITCH_GRAY_LOGIN_SMS = SWITCH.concat("gray:login:sms");
/* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberSimpleVo.java
View file @ 640b683d
...@@ -8,7 +8,7 @@ import java.io.Serializable; ...@@ -8,7 +8,7 @@ import java.io.Serializable;
@ApiModel(value = "AdamMemberSimpleVo", description = "会员简述响应数据") @ApiModel(value = "AdamMemberSimpleVo", description = "会员简述响应数据")
@Data @Data
public class AdamMemberSimpleVo implements Serializable { public class AdamMemberSimpleVo implements Serializable, Cloneable {
private static final long serialVersionUID = -3246848259206596250L; private static final long serialVersionUID = -3246848259206596250L;
@ApiModelProperty(position = 10, value = "会员ID[50]") @ApiModelProperty(position = 10, value = "会员ID[50]")
private String memberId; private String memberId;
...@@ -20,4 +20,24 @@ public class AdamMemberSimpleVo implements Serializable { ...@@ -20,4 +20,24 @@ public class AdamMemberSimpleVo implements Serializable {
private String subTitle; private String subTitle;
@ApiModelProperty(position = 14, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png") @ApiModelProperty(position = 14, value = "icon图标[200]", example = "https://img.zhengzai.tv/files/2020/08/28/5f490418d30b4.png")
private String icon; private String icon;
private static final AdamMemberSimpleVo obj = new AdamMemberSimpleVo();
public static AdamMemberSimpleVo getNew() {
try {
return (AdamMemberSimpleVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new AdamMemberSimpleVo();
}
}
public AdamMemberSimpleVo copy(AdamMemberVo source) {
if (null == this) return this;
this.setMemberId(source.getMemberId());
this.setName(source.getName());
this.setTitle(source.getTitle());
this.setSubTitle(source.getSubTitle());
this.setIcon(source.getIcon());
return this;
}
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamSwitchAdminController.java
View file @ 640b683d
...@@ -45,19 +45,8 @@ public class AdamSwitchAdminController { ...@@ -45,19 +45,8 @@ public class AdamSwitchAdminController {
@ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "会员用户最大ID_NO", example = "15000"), @ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "会员用户最大ID_NO", example = "15000"),
}) })
@PostMapping("set/memberno") @PostMapping("set/memberno")
public ResponseDto<Object> purchaseStartMemberNo(@Max(1) @Min(0) @RequestParam int opt) { public ResponseDto<Object> purchaseStartMemberNo(@Min(11417) @RequestParam int opt) {
redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, opt); redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, opt);
return ResponseDto.success(redisUtil.get(AdamRedisConst.INCR_MEMBER_NO)); return ResponseDto.success(redisUtil.get(AdamRedisConst.INCR_MEMBER_NO));
} }
@RequiresPermissions("adam:switch:gray:login")
@ApiOperation(value = "开放/限制校验证码")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "int", name = "opt", value = "0-限制｜1-开放", example = "0"),
})
@PostMapping("gray/login")
public ResponseDto<Object> loginSmsSwitch(@Max(1) @Min(0) @RequestParam int opt) {
redisUtil.set(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, 0 == opt ? 612543 : 615243);
return ResponseDto.success(redisUtil.get(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS));
}
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/index-topnav.html
View file @ 640b683d
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</div> </div>
<!-- 右侧栏 --> <!-- 右侧栏 -->
<ul class="nav navbar-top-links navbar-right welcome-message"> <ul class="nav navbar-top-links navbar-right welcome-message">
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li> <!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/index.html
View file @ 640b683d
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
</a> </a>
</div> </div>
<ul class="nav navbar-top-links navbar-right welcome-message"> <ul class="nav navbar-top-links navbar-right welcome-message">
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li> <!-- <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="开发文档" href="http://doc.ruoyi.vip/ruoyi" target="_blank"><i class="fa fa-question-circle"></i> 文档</a></li>-->
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="锁定屏幕" href="#" id="lockScreen"><i class="fa fa-lock"></i> 锁屏</a></li>
<li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li> <li><a data-toggle="tooltip" data-trigger="hover" data-placement="bottom" title="全屏显示" href="#" id="fullScreen"><i class="fa fa-arrows-alt"></i> 全屏</a></li>
<li class="dropdown user-menu"> <li class="dropdown user-menu">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @ 640b683d
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
</li> </li>
<li class=""><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a> <li class=""><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a>
</li> </li>
<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">校园分销</a> <!-- <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">校园分销</a>-->
</li> <!-- </li>-->
<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">社会分销</a> <!-- <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">社会分销</a>-->
</li> <!-- </li>-->
<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">状态管理</a> <!-- <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">状态管理</a>-->
</li> <!-- </li>-->
<li class=""><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a> <li class=""><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
</li> </li>
<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a> <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java
View file @ 640b683d
...@@ -22,6 +22,7 @@ import com.taobao.api.response.AlibabaDamaiMevOpenBatchpushticketResponse; ...@@ -22,6 +22,7 @@ import com.taobao.api.response.AlibabaDamaiMevOpenBatchpushticketResponse;
import com.taobao.api.response.AlibabaDamaiMevOpenPushitemResponse; import com.taobao.api.response.AlibabaDamaiMevOpenPushitemResponse;
import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse; import com.taobao.api.response.AlibabaDamaiMevOpenPushperformResponse;
import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse; import com.taobao.api.response.AlibabaDamaiMevOpenPushprojectResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.data.mongodb.core.convert.MongoConverter;
...@@ -41,6 +42,7 @@ import java.util.List; ...@@ -41,6 +42,7 @@ import java.util.List;
* @since 2021-05-11 * @since 2021-05-11
*/ */
@Service @Service
@Slf4j
public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, KylinRoadShows> implements DamaiService { public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, KylinRoadShows> implements DamaiService {
@Autowired @Autowired
...@@ -85,7 +87,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -85,7 +87,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId)); KylinPerformances performanceData = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
obj1.setPicUrl(performanceData.getImgPoster()); obj1.setPicUrl(performanceData.getImgPoster());
obj1.setProjectId(Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12)))); long performanceKey = 0l;
if (performanceData.getPerformancesId().length() < 13) {
performanceKey = Long.valueOf(performanceData.getPerformancesId());
} else {
performanceKey = Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12)));
}
obj1.setProjectId(performanceKey);
obj1.setProjectName(performanceData.getTitle()); obj1.setProjectName(performanceData.getTitle());
obj1.setCityId(performanceData.getCityId().longValue()); obj1.setCityId(performanceData.getCityId().longValue());
obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj1.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
...@@ -98,7 +106,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -98,7 +106,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
for (int i = 0; i < timeRelation.size(); i++) { for (int i = 0; i < timeRelation.size(); i++) {
KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId())); KylinTicketTimes timeData = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", timeRelation.get(i).getTimesId()));
boolean result = sycTimes(Long.valueOf(performanceData.getPerformancesId().substring(0, 5).concat(performanceData.getPerformancesId().substring(7, 12))), timeData); boolean result = sycTimes(performanceKey, timeData);
if (!result) { if (!result) {
return false; return false;
} }
...@@ -121,7 +129,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -121,7 +129,14 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam(); ThirdPerformPushOpenParam obj1 = new ThirdPerformPushOpenParam();
obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))); obj1.setEndTime(StringUtils.parseDateTime(timesData.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
obj1.setPerformId(Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12)))); long ticketTimesKey = 0l;
if (timesData.getTicketTimesId().length() > 13) {
ticketTimesKey = Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12)));
} else {
ticketTimesKey = Long.valueOf(timesData.getTicketTimesId());
}
obj1.setPerformId(ticketTimesKey);
obj1.setPerformName(timesData.getTitle()); obj1.setPerformName(timesData.getTitle());
obj1.setProjectId(performancesmId); obj1.setProjectId(performancesmId);
obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))); obj1.setStartTime(StringUtils.parseDateTime(timesData.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
...@@ -134,7 +149,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -134,7 +149,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
for (int i = 0; i < ticketRelation.size(); i++) { for (int i = 0; i < ticketRelation.size(); i++) {
if (null != ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelation.get(i).getTicketId()).eq("sync_damai", 1))) { if (null != ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketRelation.get(i).getTicketId()).eq("sync_damai", 1))) {
KylinTickets ticketData = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketRelation.get(i).getTicketId())); KylinTickets ticketData = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("tickets_id", ticketRelation.get(i).getTicketId()));
boolean result = sycTicket(Long.valueOf(timesData.getTicketTimesId().substring(0, 5).concat(timesData.getTicketTimesId().substring(7, 12))), ticketData); boolean result = sycTicket(ticketTimesKey, ticketData);
if (!result) { if (!result) {
return false; return false;
} }
...@@ -157,7 +172,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -157,7 +172,13 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest(); AlibabaDamaiMevOpenPushitemRequest req = new AlibabaDamaiMevOpenPushitemRequest();
PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam(); PushTicketItemPushOpenParam obj1 = new PushTicketItemPushOpenParam();
obj1.setItemId(Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12)))); long ticketIdKey = 0l;
if (ticketsData.getTicketsId().length() > 13) {
ticketIdKey = Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12)));
} else {
ticketIdKey = Long.valueOf(ticketsData.getTicketsId());
}
obj1.setItemId(ticketIdKey);
obj1.setItemName(ticketsData.getTitle()); obj1.setItemName(ticketsData.getTitle());
obj1.setItemPrice(ticketsData.getPrice().longValue()); obj1.setItemPrice(ticketsData.getPrice().longValue());
obj1.setPerformId(timemId); obj1.setPerformId(timemId);
...@@ -167,7 +188,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -167,7 +188,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
req.setPushItemParam(obj1); req.setPushItemParam(obj1);
AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req); AlibabaDamaiMevOpenPushitemResponse rsp = client.execute(req);
if (rsp.getResult().getSuccess()) { if (rsp.getResult().getSuccess()) {
return sycOrder(timemId, ticketsData.getTicketsId(), Long.valueOf(ticketsData.getTicketsId().substring(0, 5).concat(ticketsData.getTicketsId().substring(7, 12)))); return sycOrder(timemId, ticketsData.getTicketsId(), ticketIdKey);
} else { } else {
return false; return false;
} }
...@@ -184,14 +205,35 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -184,14 +205,35 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest(); AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
List<ThirdTicketPushOpenParam> list2 = new ArrayList<>(); List<ThirdTicketPushOpenParam> list2 = new ArrayList<>();
List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId); List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
for (int i = 0; i < data.size(); i++) { for (int i = 0; i < data.size(); i++) {
OrderPushDamaiDto item = data.get(i); OrderPushDamaiDto item = data.get(i);
ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
long orderTicketEntitiesKey = 0l;
if (item.getIsMember() == 1) {
if (item.getOrderTicketEntitiesId().length() > 13) {
orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12)) + "010");
} else {
orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId() + "010");//票单号 入场人id
}
} else {
if (item.getOrderTicketEntitiesId().length() > 13) {
orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12) + "020"));//票单号 入场人id
} else {
orderTicketEntitiesKey = Long.valueOf(item.getOrderTicketEntitiesId() + "020");//票单号 入场人id
}
}
long orderIdKey;
if (item.getOrderTicketsId().length() > 13) {
orderIdKey = Long.valueOf(item.getOrderTicketsId().substring(0, 5).concat(item.getOrderTicketsId().substring(7, 12)));
} else {
orderIdKey = Long.valueOf(item.getOrderTicketsId());
}
if (item.getStatus() == 4) { if (item.getIsPayment() == 3) {
taobaoTicketUtils.withdrawDamaiOrder(timemId + "", item.getOrderTicketEntitiesId()); taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
} else { } else {
ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
list2.add(obj3); list2.add(obj3);
obj3.setUserName(item.getEnterName());//用户名 入场人姓名 obj3.setUserName(item.getEnterName());//用户名 入场人姓名
obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证 obj3.setCertificateNo(item.getEnterIdCode());//证件号 入场人身份证
...@@ -199,15 +241,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -199,15 +241,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type obj3.setCertificateType(item.getEnterType().longValue());//证件内容 入场人证件type
obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间 obj3.setPayTime(DateUtils.parseDate(item.getTimePay()));//支付时间
obj3.setPerformId(timemId);//场次id obj3.setPerformId(timemId);//场次id
// obj3.setTicketItemId(ticketsmId); obj3.setTicketItemId(ticketsmId);
if (item.getIsMember() == 1) { obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
obj3.setTicketItemId(Long.parseLong(ticketsmId + "010"));//票品id ticketId+01会员 ticketId+0非会员 obj3.setOrderId(orderIdKey);//订单id orderId
} else {
obj3.setTicketItemId(Long.parseLong(ticketsmId + "020"));
}
obj3.setOrderId(Long.parseLong(item.getOrderTicketsId()));//订单id orderId
obj3.setVoucherId(Long.valueOf(item.getOrderTicketEntitiesId().substring(0, 5).concat(item.getOrderTicketEntitiesId().substring(7, 12))));//票单号 入场人id
obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子 obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/TaobaoTicketUtils.java
View file @ 640b683d
...@@ -39,13 +39,13 @@ public class TaobaoTicketUtils { ...@@ -39,13 +39,13 @@ public class TaobaoTicketUtils {
* @param orderEntitiesId 入场人的id * @param orderEntitiesId 入场人的id
* @return * @return
*/ */
public boolean withdrawDamaiOrder(String timesId, String orderEntitiesId) { public boolean withdrawDamaiOrder(long timesId, long orderEntitiesId) {
try { try {
TaobaoClient client = initTaobaoClient(); TaobaoClient client = initTaobaoClient();
AlibabaDamaiMevOpenWithdrawticketRequest req = new AlibabaDamaiMevOpenWithdrawticketRequest(); AlibabaDamaiMevOpenWithdrawticketRequest req = new AlibabaDamaiMevOpenWithdrawticketRequest();
AlibabaDamaiMevOpenWithdrawticketRequest.TicketIdOpenParam obj1 = new AlibabaDamaiMevOpenWithdrawticketRequest.TicketIdOpenParam(); AlibabaDamaiMevOpenWithdrawticketRequest.TicketIdOpenParam obj1 = new AlibabaDamaiMevOpenWithdrawticketRequest.TicketIdOpenParam();
obj1.setPerformId(Long.valueOf(timesId.substring(0, 5).concat(timesId.substring(7, 12))));//场次id obj1.setPerformId(timesId);//场次id
obj1.setVoucherId(Long.valueOf(orderEntitiesId.substring(0, 5).concat(orderEntitiesId.substring(7, 12))));//票单号 入场人id obj1.setVoucherId(orderEntitiesId);//票单号 入场人id
obj1.setSupplierSecret(SUPPLIER_SECRET); obj1.setSupplierSecret(SUPPLIER_SECRET);
obj1.setSystemId(SYSTEM_ID); obj1.setSystemId(SYSTEM_ID);
req.setTicketIdOpenParam(obj1); req.setTicketIdOpenParam(obj1);
......
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java
View file @ 640b683d
...@@ -44,4 +44,15 @@ public class UserPathDto implements Serializable { ...@@ -44,4 +44,15 @@ public class UserPathDto implements Serializable {
instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent"); instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
return "MDSKY.NOW.ELK." + ( instance.uid.equals("UID") ? CurrentUtil.getCliIpAddr() : instance.uid )+ " = " + JsonUtils.toJson(instance); return "MDSKY.NOW.ELK." + ( instance.uid.equals("UID") ? CurrentUtil.getCliIpAddr() : instance.uid )+ " = " + JsonUtils.toJson(instance);
} }
public static String setPartnerData(String merchantId ,String interfaceName, Object params, Object result) {
instance.ip = CurrentUtil.getCliIpAddr();
instance.uid = merchantId;
instance.time = DateUtil.Formatter.yyyyMMddHHmmssSSSUnTrim.format(LocalDateTime.now());
instance.interfaceName = interfaceName;
instance.params = params.toString().equals("") ? "NanParams" : params.toString();
instance.result = result.toString().equals("") ? "NanResults" : result.toString();
instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
return "MDSKY.NOW.PDK." + instance.uid+ " = " + JsonUtils.toJson(instance);
}
} }
liquidnet-bus-config/liquidnet-config/application-dev.yml
View file @ 640b683d
...@@ -53,6 +53,8 @@ liquidnet: ...@@ -53,6 +53,8 @@ liquidnet:
check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
order: order:
adam:
url: http://devadam.zhengzai.tv/adam
url-pay: url-pay:
pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder
......
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 640b683d
...@@ -47,12 +47,15 @@ liquidnet: ...@@ -47,12 +47,15 @@ liquidnet:
pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
callback: http://testadam.zhengzai.tv/adam/member/order/callback callback: http://testadam.zhengzai.tv/adam/member/order/callback
url: http://devadam.zhengzai.tv/adam
kylin: kylin:
url-pay: url-pay:
pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
order: order:
adam:
url: http://testadam.zhengzai.tv/adam
url-pay: url-pay:
pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder check: http://testdragon.zhengzai.tv/dragon/pay/checkOrder
......
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml
View file @ 640b683d
# 项目相关配置 # 项目相关配置
ruoyi: ruoyi:
# 名称 # 名称
name: RuoYi name: ModernSky
# 版本 # 版本
version: 4.6.1 version: 4.6.1
# 版权年份 # 版权年份
copyrightYear: 2021 copyrightYear: 2021
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: /usr/local/var/www/uploadPath profile: /usr/local/var/www/uploadPath
# 获取ip地址开关 # 获取ip地址开关
......
liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml
View file @ 640b683d
...@@ -24,3 +24,5 @@ liquidnet: ...@@ -24,3 +24,5 @@ liquidnet:
pay: ${liquidnet.service.order.url-pay.pay} pay: ${liquidnet.service.order.url-pay.pay}
check: ${liquidnet.service.order.url-pay.check} check: ${liquidnet.service.order.url-pay.check}
localUrl: ${liquidnet.service.order.url-pay.localUrl} localUrl: ${liquidnet.service.order.url-pay.localUrl}
adam:
url:${liquidnet.service.order.adam.url}
liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml
View file @ 640b683d
...@@ -24,3 +24,5 @@ liquidnet: ...@@ -24,3 +24,5 @@ liquidnet:
pay: ${liquidnet.service.order.url-pay.pay} pay: ${liquidnet.service.order.url-pay.pay}
check: ${liquidnet.service.order.url-pay.check} check: ${liquidnet.service.order.url-pay.check}
localUrl: ${liquidnet.service.order.url-pay.localUrl} localUrl: ${liquidnet.service.order.url-pay.localUrl}
adam:
url:${liquidnet.service.order.adam.url}
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMember.java
View file @ 640b683d
...@@ -108,4 +108,6 @@ public class AdamMember implements Serializable { ...@@ -108,4 +108,6 @@ public class AdamMember implements Serializable {
private LocalDateTime createdAt; private LocalDateTime createdAt;
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private String comment;
} }
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberCode.java
View file @ 640b683d
...@@ -66,6 +66,8 @@ public class AdamMemberCode { ...@@ -66,6 +66,8 @@ public class AdamMemberCode {
private LocalDateTime useAt; private LocalDateTime useAt;
private LocalDateTime createdAt; private LocalDateTime createdAt;
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private String comment;
} }
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMemberPrice.java
View file @ 640b683d
...@@ -70,4 +70,6 @@ public class AdamMemberPrice implements Serializable { ...@@ -70,4 +70,6 @@ public class AdamMemberPrice implements Serializable {
* 更新时间 * 更新时间
*/ */
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private String comment;
} }
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUser.java
View file @ 640b683d
...@@ -38,6 +38,11 @@ public class AdamUser implements Serializable { ...@@ -38,6 +38,11 @@ public class AdamUser implements Serializable {
*/ */
private Integer state; private Integer state;
/**
* 完善信息进度:0-未完善,1-已完善
*/
private Integer isComplete;
private LocalDateTime createdAt; private LocalDateTime createdAt;
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
......
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamUserMember.java
View file @ 640b683d
...@@ -28,4 +28,6 @@ public class AdamUserMember { ...@@ -28,4 +28,6 @@ public class AdamUserMember {
private LocalDateTime createdAt; private LocalDateTime createdAt;
private LocalDateTime updatedAt; private LocalDateTime updatedAt;
private String comment;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderPushDamaiDto.java
View file @ 640b683d
...@@ -21,6 +21,7 @@ public class OrderPushDamaiDto { ...@@ -21,6 +21,7 @@ public class OrderPushDamaiDto {
String enterMobile; String enterMobile;
String timePay; String timePay;
String timeId; String timeId;
Integer isPayment;
String ticketId; String ticketId;
Integer isMember; Integer isMember;
String orderTicketEntitiesId; String orderTicketEntitiesId;
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 640b683d
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<result column="order_tickets_id" property="orderTicketsId"/> <result column="order_tickets_id" property="orderTicketsId"/>
<result column="mid" property="mid"/> <result column="mid" property="mid"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="is_payment" property="isPayment"/>
<result column="enter_name" property="enterName"/> <result column="enter_name" property="enterName"/>
<result column="enter_id_code" property="enterIdCode"/> <result column="enter_id_code" property="enterIdCode"/>
<result column="enter_mobile" property="enterMobile"/> <result column="enter_mobile" property="enterMobile"/>
...@@ -231,7 +232,8 @@ ...@@ -231,7 +232,8 @@
order_tickets_id, order_tickets_id,
enter_name, enter_name,
enter_id_code, enter_id_code,
ots.status, ote.status,
ote.is_payment,
enter_type, enter_type,
enter_mobile, enter_mobile,
time_pay, time_pay,
...@@ -244,9 +246,9 @@ ...@@ -244,9 +246,9 @@
LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
WHERE ots.pay_status = 1 LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
AND ote.is_payment = 1 WHERE ots.pay_status = 1
AND ote.sys_damai = 1 AND kys.sync_damai = 1
AND ote.ticket_id = ${ticketsId} AND ote.ticket_id = ${ticketsId}
</select> </select>
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamEntersController.java
View file @ 640b683d
...@@ -191,6 +191,8 @@ public class AdamEntersController { ...@@ -191,6 +191,8 @@ public class AdamEntersController {
return ResponseDto.success(vo); return ResponseDto.success(vo);
} }
@ApiOperationSupport(order = 99)
@ApiOperation(value = "@API:入场人详情", notes = "查取用户指定入场人详情")
@GetMapping("query/depth") @GetMapping("query/depth")
public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersId, public ResponseDto<AdamEntersVo> queryForDepth(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersId,
@NotBlank(message = "用户ID不能为空") @RequestParam String uid) { @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamMemberOrderController.java
View file @ 640b683d
...@@ -245,6 +245,13 @@ public class AdamMemberOrderController { ...@@ -245,6 +245,13 @@ public class AdamMemberOrderController {
@GetMapping("info/{orderNo}") @GetMapping("info/{orderNo}")
public ResponseDto<AdamMemberOrderVo> getMemberOrder(@NotBlank(message = "订单号不能为空") @PathVariable String orderNo) { public ResponseDto<AdamMemberOrderVo> getMemberOrder(@NotBlank(message = "订单号不能为空") @PathVariable String orderNo) {
AdamMemberOrderVo mOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo); AdamMemberOrderVo mOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
if (null == mOrderVo) {
List<AdamMemberOrderVo> memberOrderVos = adamRdmService.getMemberOrderVosByUid(CurrentUtil.getCurrentUid());
mOrderVo = adamRdmService.getMemberOrderVoByOrderNo(memberOrderVos, orderNo);
}
if (null != mOrderVo) { if (null != mOrderVo) {
AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(mOrderVo.getMemberId()); AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(mOrderVo.getMemberId());
mOrderVo.setMemberNotes(memberVo.getNotes()); mOrderVo.setMemberNotes(memberVo.getNotes());
...@@ -263,9 +270,21 @@ public class AdamMemberOrderController { ...@@ -263,9 +270,21 @@ public class AdamMemberOrderController {
@GetMapping("check") @GetMapping("check")
public ResponseDto<Integer> checkOrderResult(@NotBlank(message = "订单号不能为空") @RequestParam String orderNo) { public ResponseDto<Integer> checkOrderResult(@NotBlank(message = "订单号不能为空") @RequestParam String orderNo) {
AdamMemberOrderVo memberOrderInfo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo); AdamMemberOrderVo memberOrderInfo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
if (null == memberOrderInfo) {
List<AdamMemberOrderVo> memberOrderVos = adamRdmService.getMemberOrderVosByUid(CurrentUtil.getCurrentUid());
memberOrderInfo = adamRdmService.getMemberOrderVoByOrderNo(memberOrderVos, orderNo);
if (null != memberOrderInfo && memberOrderInfo.getState() == 1) {
return ResponseDto.success(1);
}
}
if (null == memberOrderInfo) { if (null == memberOrderInfo) {
return ResponseDto.failure(ErrorMapping.get("10211")); return ResponseDto.failure(ErrorMapping.get("10211"));
} }
if (memberOrderInfo.getMode() <= 1) { if (memberOrderInfo.getMode() <= 1) {
try { try {
// 支付中心返回说明:已支付订单status==1，未支付订单status==0 // 支付中心返回说明:已支付订单status==1，未支付订单status==0
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 640b683d
...@@ -53,6 +53,9 @@ public class AdamUserController { ...@@ -53,6 +53,9 @@ public class AdamUserController {
@Autowired @Autowired
IAdamUserInfoService adamUserInfoService; IAdamUserInfoService adamUserInfoService;
private static final String avatarDefUrl = "https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png";
private static final String backgroundDefUrl = "https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png";
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "资料编辑") @ApiOperation(value = "资料编辑")
@PostMapping(value = {"edit"}) @PostMapping(value = {"edit"})
...@@ -119,13 +122,17 @@ public class AdamUserController { ...@@ -119,13 +122,17 @@ public class AdamUserController {
String currentUid = CurrentUtil.getCurrentUid(); String currentUid = CurrentUtil.getCurrentUid();
AdamUserInfoVo editVo = adamRdmService.getUserInfoVoByUid(currentUid); AdamUserInfoVo editVo = adamRdmService.getUserInfoVoByUid(currentUid);
editVo.setAvatar(parameter.getAvatar()); // editVo.setAvatar(parameter.getAvatar());
editVo.setBackground(parameter.getBackground()); // editVo.setBackground(parameter.getBackground());
editVo.setNickname(parameter.getNickname()); // editVo.setNickname(parameter.getNickname());
editVo.setAvatar(editVo.getAvatar());
editVo.setBackground(editVo.getBackground());
editVo.setNickname(editVo.getNickname());
editVo.setSex(sex); editVo.setSex(sex);
editVo.setBirthday(parameter.getBirthday()); editVo.setBirthday(parameter.getBirthday());
editVo.setArea(parameter.getArea()); editVo.setArea(parameter.getArea());
editVo.setSignature(parameter.getSignature()); // editVo.setSignature(parameter.getSignature());
editVo.setSignature(editVo.getSignature());
// editVo.setTagMe(tagMeVoList); // editVo.setTagMe(tagMeVoList);
editVo.setUpdatedAt(LocalDateTime.now()); editVo.setUpdatedAt(LocalDateTime.now());
editVo.setIsComplete(1); editVo.setIsComplete(1);
...@@ -197,10 +204,17 @@ public class AdamUserController { ...@@ -197,10 +204,17 @@ public class AdamUserController {
@RequestParam String code) { @RequestParam String code) {
log.debug("mobile:{},code:{}", mobile, code); log.debug("mobile:{},code:{}", mobile, code);
ResponseDto checkSmsCodeDto = this.checkSmsCode(mobile, code); String currentUid = CurrentUtil.getCurrentUid();
String bindMobileExistUid = adamRdmService.getUidByMobile(mobile);
if (StringUtils.isNotEmpty(bindMobileExistUid)) {
return ResponseDto.failure(ErrorMapping.get("10009"));
}
ResponseDto<String> checkSmsCodeDto = this.checkSmsCode(mobile, code);
if (!checkSmsCodeDto.isSuccess()) return checkSmsCodeDto; if (!checkSmsCodeDto.isSuccess()) return checkSmsCodeDto;
return ResponseDto.success(adamUserInfoService.editMobile(CurrentUtil.getCurrentUid(), mobile)); return ResponseDto.success(adamUserInfoService.editMobile(currentUid, mobile));
} }
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
...@@ -311,7 +325,7 @@ public class AdamUserController { ...@@ -311,7 +325,7 @@ public class AdamUserController {
private static final String PHP_API_SMS_CODE_VALID = "/smsValidation"; private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
private ResponseDto checkSmsCode(String mobile, String code) { private ResponseDto<String> checkSmsCode(String mobile, String code) {
if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE)) if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
&& CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) { && CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
return ResponseDto.success(); return ResponseDto.success();
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java
View file @ 640b683d
...@@ -207,10 +207,7 @@ public class AdamRdmService { ...@@ -207,10 +207,7 @@ public class AdamRdmService {
public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(List<AdamThirdPartInfoVo> vos, String platform) { public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(List<AdamThirdPartInfoVo> vos, String platform) {
if (!CollectionUtils.isEmpty(vos)) { if (!CollectionUtils.isEmpty(vos)) {
Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny(); return vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny().orElse(null);
if (any.isPresent()) {
return any.get();
}
} }
return null; return null;
} }
...@@ -220,10 +217,7 @@ public class AdamRdmService { ...@@ -220,10 +217,7 @@ public class AdamRdmService {
if (!CollectionUtils.isEmpty(vos)) { if (!CollectionUtils.isEmpty(vos)) {
// for (AdamThirdPartInfoVo r : vos) // for (AdamThirdPartInfoVo r : vos)
// if (platform.equals(r.getPlatform())) return r; // if (platform.equals(r.getPlatform())) return r;
Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny(); return vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny().orElse(null);
if (any.isPresent()) {
return any.get();
}
} }
return null; return null;
} }
...@@ -273,7 +267,10 @@ public class AdamRdmService { ...@@ -273,7 +267,10 @@ public class AdamRdmService {
} }
public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) { public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null); if (!CollectionUtils.isEmpty(vos)) {
return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
}
return null;
} }
public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) { public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
...@@ -330,7 +327,10 @@ public class AdamRdmService { ...@@ -330,7 +327,10 @@ public class AdamRdmService {
} }
public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) { public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null); if (!CollectionUtils.isEmpty(vos)) {
return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
}
return null;
} }
public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) { public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
...@@ -459,10 +459,7 @@ public class AdamRdmService { ...@@ -459,10 +459,7 @@ public class AdamRdmService {
// return r; // return r;
// } // }
// } // }
Optional<AdamMemberPriceVo> any = vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny(); return vos.stream().filter(r -> r.getMemberPriceId().equals(memberPriceId)).findAny().orElse(null);
if (any.isPresent()) {
return any.get();
}
} }
return null; return null;
} }
...@@ -532,6 +529,13 @@ public class AdamRdmService { ...@@ -532,6 +529,13 @@ public class AdamRdmService {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos); return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
} }
public AdamMemberOrderVo getMemberOrderVoByOrderNo(List<AdamMemberOrderVo> vos, String orderNo) {
if (!CollectionUtils.isEmpty(vos)) {
return vos.stream().filter(r -> r.getOrderNo().equals(orderNo)).findAny().orElse(null);
}
return null;
}
public void delMemberOrderVoByUid(String uid) { public void delMemberOrderVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER + uid); redisUtil.del(AdamRedisConst.INFO_MEMBER_ORDER + uid);
} }
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 640b683d
...@@ -153,7 +153,9 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -153,7 +153,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()}); initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
s = System.currentTimeMillis(); s = System.currentTimeMillis();
adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid); adamRdmService.addThirdPartVoListByUid(thirdPartInfoVo.getUid(), null, thirdPartInfoVo);
adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), thirdPartInfoVo.getUid());
adamRdmService.setUidByMobile(param.getMobile(), thirdPartInfoVo.getUid());
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s); log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
s = System.currentTimeMillis(); s = System.currentTimeMillis();
...@@ -171,7 +173,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -171,7 +173,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
} else if (thirdPartVo.getOpenId().equals(param.getOpenId())) { } else if (thirdPartVo.getOpenId().equals(param.getOpenId())) {
userInfoVo = adamRdmService.getUserInfoVoByUid(uid); userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
} else { } else {
return ResponseDto.failure(ErrorMapping.get("10007")); return ResponseDto.failure(ErrorMapping.get("10010"));
} }
} }
return ResponseDto.success(userInfoVo); return ResponseDto.success(userInfoVo);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties
View file @ 640b683d
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
10006=第三方账号未注册 10006=第三方账号未注册
10007=该第三方账号已经被其他用户绑定 10007=该第三方账号已经被其他用户绑定
10008=已经绑定过该类型的第三方账号 10008=已经绑定过该类型的第三方账号
10009= 10009=手机号已经注册
10010= 10010=该手机号已被其它账号绑定
10011=性别标签无效 10011=性别标签无效
10012=音乐风格标签无效 10012=音乐风格标签无效
10013= 10013=
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
10502=会员订单回调处理失败，该订单已处理 10502=会员订单回调处理失败，该订单已处理
10503=会员订单回调处理失败，订单金额有误 10503=会员订单回调处理失败，订单金额有误
10504=会员订单回调处理失败，会员价格信息不存在 10504=会员订单回调处理失败，会员价格信息不存在
10505=会员订单回调处理异常
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 640b683d
...@@ -50,153 +50,6 @@ public class KylinRefundsStatusServiceImpl { ...@@ -50,153 +50,6 @@ public class KylinRefundsStatusServiceImpl {
@Autowired @Autowired
private QueueUtils queueUtils; private QueueUtils queueUtils;
public Boolean orderTicketRefunding(
KylinOrderTicketVo orderInfo, String orderTicketsId,
double RefundPriceExpress,
List<String> ticketEntityIds, List<Double> entitiesPrice
) {
if (CollectionUtil.isEmpty(ticketEntityIds)) {
return false;
}
// 基础数据
String authId = "";
String authName = "system_overtime_order_refund";
String reason = "订单支付超时自动退款";
// 本次退款票总金额
double entitiesPriceSum = entitiesPrice.stream().mapToDouble(Double::doubleValue).sum();
// 更新数据
// 订单状态表 和 缓存
LocalDateTime nowTime = LocalDateTime.now();
String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
KylinOrderTicketStatus orderStatusTable = new KylinOrderTicketStatus();
orderStatusTable.setStatus(KylinTableStatusConst.ORDER_STATUS3);
orderStatusTable.setUpdatedAt(nowTime);
/*kylinOrderTicketStatusMapper.update(orderStatusTable, new UpdateWrapper<KylinOrderTicketStatus>()
.eq("order_id", orderTicketsId));*/
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3);
kylinOrderTicketVo.setUpdatedAt(nowTimeStr);
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
UpdateResult orderResult = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
orderObject
);
dataUtils.delOrderTicketRedis(orderTicketsId);
log.info("orderInfo.getUserId() = "+ orderInfo.getUserId());
orderUtils.resetOrderListVo(orderInfo.getUserId(), 2, orderTicketsId, null);
// 订单入场人表 和 缓存
KylinOrderTicketEntities entitiesTable = new KylinOrderTicketEntities();
entitiesTable.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
entitiesTable.setUpdatedAt(nowTime);
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
for (String v : ticketEntityIds) {
LocalDateTime now1 = LocalDateTime.now();
sqlsDataB.add(new Object[]{
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v, now1, now1
});
/*kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
.eq("order_ticket_entities_id", v));*/
UpdateResult entitiesResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(v)).getQueryObject(),
entitiesObject
);
dataUtils.delOrderTicketEntitiesRedis(v);
}
// 退款明细
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
String orderRefundsId = IDGenerator.nextSnowId();
kylinOrderRefunds.setOrderRefundsId(orderRefundsId);
kylinOrderRefunds.setOrderTicketsId(orderTicketsId);
String orderRefundCode = orderInfo.getOrderCode();
String codeNum = StringUtils.leftPad(String.valueOf(5), 3, "0");
kylinOrderRefunds.setOrderRefundCode(orderRefundCode.concat(codeNum));
kylinOrderRefunds.setPrice(BigDecimal.valueOf(entitiesPriceSum));
kylinOrderRefunds.setPriceExpress(BigDecimal.valueOf(RefundPriceExpress));
kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
kylinOrderRefunds.setType(KylinTableStatusConst.ORDER_REFUND_TYPE_AUTO);
kylinOrderRefunds.setApplicantId(authId);
kylinOrderRefunds.setApplicantName(authName);
kylinOrderRefunds.setApplicantAt(nowTime);
kylinOrderRefunds.setReason(reason);
if (RefundPriceExpress > 0 && entitiesPriceSum > 0) {
kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE3);
} else if (RefundPriceExpress > 0) {
kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE2);
} else if (entitiesPriceSum > 0) {
kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE1);
}
kylinOrderRefunds.setCreatedAt(nowTime);
/*int rows = kylinOrderRefundsMapper.insert(kylinOrderRefunds);*/
KylinOrderRefundsVo orderRefundsVo = KylinOrderRefundsVo.getNew();
BeanUtils.copyProperties(kylinOrderRefunds, orderRefundsVo);
mongoTemplate.insert(orderRefundsVo, KylinOrderRefundsVo.class.getSimpleName());
// 退款入场人表
KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
kylinOrderRefundEntities.setOrderRefundsId(orderRefundsId);
kylinOrderRefundEntities.setCreatedAt(LocalDateTime.now());
LinkedList<Object[]> sqlsDataD = CollectionUtil.linkedListObjectArr();
for (int i = 0; i <= ticketEntityIds.size() - 1; i++) {
String orderRefundsEntitiesId = IDGenerator.nextSnowId();
kylinOrderRefundEntities.setOrderRefundsEntitiesId(orderRefundsEntitiesId);
kylinOrderRefundEntities.setRefundPrice(BigDecimal.valueOf(entitiesPrice.get(i)));
kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i));
sqlsDataD.add(new Object[]{
kylinOrderRefundEntities.getOrderRefundsEntitiesId(), kylinOrderRefundEntities.getOrderRefundsId(), kylinOrderRefundEntities.getRefundPrice(),
kylinOrderRefundEntities.getOrderTicketEntitiesId(), kylinOrderRefundEntities.getCreatedAt()
});
/*int rowsR = kylinOrderRefundsEntitiesMapper.insert(kylinOrderRefundEntities);*/
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew();
BeanUtils.copyProperties(kylinOrderRefundEntities, orderRefundEntitiesVo);
mongoTemplate.insert(orderRefundEntitiesVo, KylinOrderRefundEntitiesVo.class.getSimpleName());
}
//mq更改数据库
LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> sqlsDataC = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("kylin_order_ticket_status.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_ticket_entities.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_refund.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
LocalDateTime now1 = LocalDateTime.now();
sqlsDataA.add(new Object[]{
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId(), now1, now1
});
sqlsDataC.add(new Object[]{
kylinOrderRefunds.getOrderRefundsId(), kylinOrderRefunds.getOrderTicketsId(), kylinOrderRefunds.getOrderRefundCode(),
kylinOrderRefunds.getPrice(), kylinOrderRefunds.getPriceExpress(), kylinOrderRefunds.getStatus(),
kylinOrderRefunds.getType(), kylinOrderRefunds.getApplicantId(), kylinOrderRefunds.getApplicantName(),
kylinOrderRefunds.getApplicantAt(), kylinOrderRefunds.getReason(),
kylinOrderRefunds.getRefundCate(), kylinOrderRefunds.getCreatedAt()
});
queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_OVERTIME_REFUND.getKey(),
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD));
return true;
}
public String userOrderTicketRefunding( public String userOrderTicketRefunding(
KylinOrderTicketVo orderInfo, KylinOrderTicketVo orderInfo,
double refundPrice, double refundPrice,
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties
View file @ 640b683d
...@@ -27,7 +27,7 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay ...@@ -27,7 +27,7 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay
# ------------------------用户发起订单退款---------------------------- # ------------------------用户发起订单退款----------------------------
kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
wkylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ? WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ? WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?) kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?) kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?) kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java
View file @ 640b683d
package com.liquidnet.service.order.utils; package com.liquidnet.service.order.utils;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.constant.AdamRedisConst; import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo; import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo; import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo; import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo; import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -19,6 +25,8 @@ public class OrderUtils { ...@@ -19,6 +25,8 @@ public class OrderUtils {
@Autowired @Autowired
private DataUtils dataUtils; private DataUtils dataUtils;
// @Value("${liquidnet.adam.url}")
// private String adamUrl;
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
...@@ -63,8 +71,8 @@ public class OrderUtils { ...@@ -63,8 +71,8 @@ public class OrderUtils {
ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId); ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
} }
Integer[] array = ObjectUtil.cloneInteger2Array(); Integer[] array = ObjectUtil.cloneInteger2Array();
array[0]=performanceBuyCount; array[0] = performanceBuyCount;
array[1]=ticketBuyCount; array[1] = ticketBuyCount;
return array; return array;
} }
...@@ -86,8 +94,8 @@ public class OrderUtils { ...@@ -86,8 +94,8 @@ public class OrderUtils {
} }
Integer[] array = ObjectUtil.cloneInteger2Array(); Integer[] array = ObjectUtil.cloneInteger2Array();
array[0]=performanceBuyCount; array[0] = performanceBuyCount;
array[1]=ticketBuyCount; array[1] = ticketBuyCount;
return array; return array;
} }
...@@ -111,18 +119,28 @@ public class OrderUtils { ...@@ -111,18 +119,28 @@ public class OrderUtils {
} }
public boolean isMember(String uid) { public boolean isMember(String uid) {
// String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
// AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid); String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk); AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
return null != vo && vo.isActive(); return null != vo && vo.isActive();
} }
public AdamAddressesVo getAddress(String uid, String addressesId) { public AdamAddressesVo getAddress(String uid, String addressesId) {
// String resultData = HttpUtil.get("/adam/addr/query/depth?uid=" + uid + "&addrId=" + addressesId, null);
// List<AdamAddressesVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamAddressesVo>>() {
// });
String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid); String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk); List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null); return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
} }
public AdamEntersVo getEnters(String uid, String entersId) { public AdamEntersVo getEnters(String uid, String entersId) {
// String resultData = HttpUtil.get("/adam/enters/query/depth?uid=" + uid + "&entersId=" + entersId, null);
// List<AdamEntersVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamEntersVo>>() {
// });
String rk = AdamRedisConst.INFO_ENTERS.concat(uid); String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk); List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null); return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DMRdmService.java
View file @ 640b683d
...@@ -364,6 +364,10 @@ public class DMRdmService { ...@@ -364,6 +364,10 @@ public class DMRdmService {
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_SIMPLE_INFO> */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_SIMPLE_INFO> */
public boolean setMemberSimpleVo(AdamMemberSimpleVo vo) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_SIMPLE, vo);
}
public AdamMemberSimpleVo getMemberSimpleVo() { public AdamMemberSimpleVo getMemberSimpleVo() {
AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE); AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
// if (null == vo) { // if (null == vo) {
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java
View file @ 640b683d
package com.liquidnet.service.platform.service.impl.adam.dm.processor; package com.liquidnet.service.platform.service.impl.adam.dm.processor;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo; import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo; import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.entity.AdamMember; import com.liquidnet.service.adam.entity.AdamMember;
import com.liquidnet.service.adam.entity.AdamMemberPrice; import com.liquidnet.service.adam.entity.AdamMemberPrice;
...@@ -20,7 +20,6 @@ import java.sql.DriverManager; ...@@ -20,7 +20,6 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
@Slf4j @Slf4j
...@@ -86,6 +85,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService { ...@@ -86,6 +85,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
AdamMemberVo vo = AdamMemberVo.getNew().copy(o); AdamMemberVo vo = AdamMemberVo.getNew().copy(o);
dmRdmService.setMemberVoByMemberId(vo.getMemberId(), vo); dmRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
dmRdmService.setMemberSimpleVo(AdamMemberSimpleVo.getNew().copy(vo));
memberMapper.insert(o); memberMapper.insert(o);
// mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName()); // mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java
View file @ 640b683d
...@@ -104,6 +104,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService { ...@@ -104,6 +104,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
String mobile = row.getString(2); String mobile = row.getString(2);
user.setMobile(mobile); user.setMobile(mobile);
LocalDateTime createdAt = row.getLocalDateTime(10), updatedAt = row.getLocalDateTime(11); LocalDateTime createdAt = row.getLocalDateTime(10), updatedAt = row.getLocalDateTime(11);
user.setIsComplete(row.getInt(12));
user.setCreatedAt(createdAt); user.setCreatedAt(createdAt);
user.setUpdatedAt(updatedAt); user.setUpdatedAt(updatedAt);
user.setState(1); user.setState(1);
...@@ -134,7 +135,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService { ...@@ -134,7 +135,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
vo.setBackground(userInfo.getBackground()); vo.setBackground(userInfo.getBackground());
vo.setCreateAt(user.getCreatedAt()); vo.setCreateAt(user.getCreatedAt());
vo.setUpdatedAt(user.getUpdatedAt()); vo.setUpdatedAt(user.getUpdatedAt());
vo.setIsComplete(row.getInt(12)); vo.setIsComplete(user.getIsComplete());
vo.setQrCode(userInfo.getQrCode()); vo.setQrCode(userInfo.getQrCode());
userList.add(user); userList.add(user);
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ 640b683d
...@@ -503,7 +503,6 @@ public class DataImpl { ...@@ -503,7 +503,6 @@ public class DataImpl {
KylinOrderTickets orderTickets = new KylinOrderTickets(); KylinOrderTickets orderTickets = new KylinOrderTickets();
KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus(); KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
KylinOrderTicketRelations orderTicketRelations = new KylinOrderTicketRelations(); KylinOrderTicketRelations orderTicketRelations = new KylinOrderTicketRelations();
KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo(); KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
ArrayList<KylinOrderTicketEntitiesVo> entitiesVosList = new ArrayList<>(); ArrayList<KylinOrderTicketEntitiesVo> entitiesVosList = new ArrayList<>();
...@@ -678,8 +677,9 @@ public class DataImpl { ...@@ -678,8 +677,9 @@ public class DataImpl {
pstmt = con.prepareStatement(enterSql); pstmt = con.prepareStatement(enterSql);
ResultSet enterData = pstmt.executeQuery(); ResultSet enterData = pstmt.executeQuery();
while (enterData.next()) { while (enterData.next()) {
KylinOrderTicketEntitiesVo entitiesVo = new KylinOrderTicketEntitiesVo(); KylinOrderTicketEntitiesVo entitiesVo = new KylinOrderTicketEntitiesVo();
KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
orderTicketEntities.setOrderTicketEntitiesId(enterData.getInt("id") + ""); orderTicketEntities.setOrderTicketEntitiesId(enterData.getInt("id") + "");
orderTicketEntities.setOrderId(orderTickets.getOrderTicketsId()); orderTicketEntities.setOrderId(orderTickets.getOrderTicketsId());
orderTicketEntities.setTicketId(enterData.getInt("ticket_id") + ""); orderTicketEntities.setTicketId(enterData.getInt("ticket_id") + "");
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java
View file @ 640b683d
...@@ -11,6 +11,7 @@ import com.liquidnet.commons.lang.util.DateUtil; ...@@ -11,6 +11,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
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 com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao; import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao; import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
...@@ -112,8 +113,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -112,8 +113,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
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(UserPathDto.setPartnerData(step1Param.getMerchantId(),"createStep1", step1Param,result));
} else {// 修改 } else {// 修改
result = updateStep1(step1Param); result = updateStep1(step1Param);
log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"updateStep1", step1Param,result));
} }
} }
return result; return result;
...@@ -217,6 +220,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -217,6 +220,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
if (null != performanceStatus) { if (null != performanceStatus) {
data.setStatus(performanceStatus.getStatus()); data.setStatus(performanceStatus.getStatus());
} }
log.info(UserPathDto.setPartnerData("0","getStep1", "performancesId="+performancesId,data));
return ResponseDto.success(data); return ResponseDto.success(data);
} }
...@@ -229,8 +233,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -229,8 +233,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, step2Param.getPerformancesId())); KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, 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(UserPathDto.setPartnerData("0","createStep2", step2Param,result));
} 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(UserPathDto.setPartnerData("0","updateStep2(step2Param", step2Param,result));
} else if (performanceStatus.getStatus() == 10) { } else if (performanceStatus.getStatus() == 10) {
result = ResponseDto.failure("演出已结束不可修改"); result = ResponseDto.failure("演出已结束不可修改");
} }
...@@ -472,6 +478,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -472,6 +478,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} }
performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList); performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
log.info(UserPathDto.setPartnerData("0","getStep2", "performancesId="+performancesId,performanceStep2Param));
return ResponseDto.success(performanceStep2Param); return ResponseDto.success(performanceStep2Param);
} }
...@@ -518,6 +525,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -518,6 +525,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
} }
// 判断状态 // 判断状态
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","onLinePerformance", "performancesId="+performancesId,"上线成功"));
return ResponseDto.success("上线成功"); return ResponseDto.success("上线成功");
} catch (Exception e) { } catch (Exception e) {
log.debug("上线失败", e); log.debug("上线失败", e);
...@@ -539,6 +547,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -539,6 +547,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId)); , Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","outLinePerformance", "performancesId="+performancesId,"下线成功"));
return ResponseDto.success("下线成功"); return ResponseDto.success("下线成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20111)); return ResponseDto.failure(ErrorMapping.get(20111));
...@@ -577,6 +586,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -577,6 +586,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
mongoTemplate.insert(ticketItem, KylinTicketPartnerVo.class.getSimpleName()); mongoTemplate.insert(ticketItem, KylinTicketPartnerVo.class.getSimpleName());
} }
} }
log.info(UserPathDto.setPartnerData("0","copyPerformance", "performancesId="+performancesId,performancePartnerVo.getPerformancesId()));
return performancePartnerVo.getPerformancesId(); return performancePartnerVo.getPerformancesId();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -640,7 +650,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -640,7 +650,6 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
@Override @Override
public ResponseDto<String> withdraw(String performancesId) { public ResponseDto<String> withdraw(String performancesId) {
try { try {
//mysql auditStatus
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId)); KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
if (performanceStatus != null && performanceStatus.getAuditStatus() == 0) { if (performanceStatus != null && performanceStatus.getAuditStatus() == 0) {
KylinPerformanceStatus data1 = KylinPerformanceStatus.getNew(); KylinPerformanceStatus data1 = KylinPerformanceStatus.getNew();
...@@ -665,6 +674,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor ...@@ -665,6 +674,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(), Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
object object
); );
log.info(UserPathDto.setPartnerData("0","withdraw", "performancesId="+performancesId,"撤回成功"));
return ResponseDto.success("撤回成功"); return ResponseDto.success("撤回成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20116)); return ResponseDto.failure(ErrorMapping.get(20116));
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketTimesPartnerServiceImpl.java
View file @ 640b683d
...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator; ...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
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 com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam; import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.entity.KylinPerformanceStatus; import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
...@@ -68,12 +69,15 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -68,12 +69,15 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId())); Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, createTicketTimesParam.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(UserPathDto.setPartnerData("0","createTimes", createTicketTimesParam,ticketTimesPartnerVo));
} 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(UserPathDto.setPartnerData("0","addNewTimes", createTicketTimesParam,ticketTimesPartnerVo));
} else { } else {
ticketTimesPartnerVo = createTimes(createTicketTimesParam); ticketTimesPartnerVo = createTimes(createTicketTimesParam);
log.info(UserPathDto.setPartnerData("0","createTimes", createTicketTimesParam,ticketTimesPartnerVo));
} }
return ticketTimesPartnerVo; return ticketTimesPartnerVo;
} }
...@@ -189,6 +193,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -189,6 +193,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(), Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)).getQueryObject(),
object object
); );
log.info(UserPathDto.setPartnerData("0","deleteTimes", "ticketTimesId="+ticketTimesId,"删除成功"));
return ResponseDto.success("删除成功"); return ResponseDto.success("删除成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20106)); return ResponseDto.failure(ErrorMapping.get(20106));
...@@ -229,6 +234,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT ...@@ -229,6 +234,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
object, object,
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER) new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
); );
log.info(UserPathDto.setPartnerData("0","changeTimes", createTicketTimesParam,JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class)));
return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class)); return ResponseDto.success(JsonUtils.fromJson(doc.toJson(), KylinTicketTimesPartnerVo.class));
} catch (Exception e) { } catch (Exception e) {
return ResponseDto.failure(ErrorMapping.get(20103)); return ResponseDto.failure(ErrorMapping.get(20103));
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinTicketsPartnerServiceImpl.java
View file @ 640b683d
...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator; ...@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
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 com.liquidnet.service.kylin.dto.param.PerformancePartnerVo; import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.TicketCreateParam; import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo; import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
...@@ -20,6 +21,7 @@ import com.liquidnet.service.platform.utils.PerformanceVoTask; ...@@ -20,6 +21,7 @@ import com.liquidnet.service.platform.utils.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 io.github.classgraph.json.JSONUtils;
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;
...@@ -79,13 +81,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -79,13 +81,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, timesPartnerVo.getPerformancesId())); Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, timesPartnerVo.getPerformancesId()));
if (null == performanceStatus) { if (null == performanceStatus) {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,ticketPartnerVo));
} else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出 } else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
ticketPartnerVo = addNewTicket(ticketCreateParam); ticketPartnerVo = addNewTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","addNewTicket", ticketCreateParam,ticketPartnerVo));
} else { } else {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,ticketPartnerVo));
} }
} else { } else {
ticketPartnerVo = createTicket(ticketCreateParam); ticketPartnerVo = createTicket(ticketCreateParam);
log.info(UserPathDto.setPartnerData("0","createTicket", ticketCreateParam,ticketPartnerVo));
} }
return ticketPartnerVo; return ticketPartnerVo;
} }
...@@ -240,6 +246,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -240,6 +246,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
); );
KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class); KylinTicketPartnerVo kylinTicketPartnerVoData = JsonUtils.fromJson(doc.toJson(), KylinTicketPartnerVo.class);
log.info(UserPathDto.setPartnerData("0","updateTicket", ticketCreateParam,kylinTicketPartnerVoData));
return ResponseDto.success(kylinTicketPartnerVoData); return ResponseDto.success(kylinTicketPartnerVoData);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -281,6 +288,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -281,6 +288,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(), Query.query(Criteria.where("ticketsId").is(ticketsId)).getQueryObject(),
object object
); );
log.info(UserPathDto.setPartnerData("0","deleteTicket", "ticketsId="+ticketsId,"删除成功"));
return ResponseDto.success("删除成功"); return ResponseDto.success("删除成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20106)); return ResponseDto.failure(ErrorMapping.get(20106));
...@@ -309,6 +317,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -309,6 +317,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
KylinTicketPartnerVo data = mongoTemplate.insert( KylinTicketPartnerVo data = mongoTemplate.insert(
kylinTicketPartnerVo, KylinTicketPartnerVo.class.getSimpleName() kylinTicketPartnerVo, KylinTicketPartnerVo.class.getSimpleName()
); );
log.info(UserPathDto.setPartnerData("0","deleteTicket", "performanceId="+performanceId+",ticketsId="+ticketsId,kylinTicketPartnerVo));
return ResponseDto.success(kylinTicketPartnerVo); return ResponseDto.success(kylinTicketPartnerVo);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -373,6 +382,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -373,6 +382,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
); );
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","onLine", "performancesId="+performancesId+",ticketsId="+ticketsId,"上线成功"));
return ResponseDto.success("上线成功"); return ResponseDto.success("上线成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20110)); return ResponseDto.failure(ErrorMapping.get(20110));
...@@ -404,6 +414,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp ...@@ -404,6 +414,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
); );
performanceVoTask.performanceVoStatus(performancesId); performanceVoTask.performanceVoStatus(performancesId);
log.info(UserPathDto.setPartnerData("0","outLine", "performancesId="+performancesId+",ticketsId="+ticketsId,"下线成功"));
return ResponseDto.success("下线成功"); return ResponseDto.success("下线成功");
} else { } else {
return ResponseDto.failure(ErrorMapping.get(20111)); return ResponseDto.failure(ErrorMapping.get(20111));
......
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