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

Commit 3777fd58 authored by 张国柄's avatar 张国柄

opt;

parent 2e4c2a89
...@@ -132,8 +132,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -132,8 +132,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
memberOrderVo.setUid(CurrentUtil.getCurrentUid()); memberOrderVo.setUid(CurrentUtil.getCurrentUid());
memberOrderVo.setPrice(param.getPrice()); memberOrderVo.setPrice(param.getPrice());
memberOrderVo.setClientIp(clientIp); memberOrderVo.setClientIp(clientIp);
String headerCliVersion = CurrentUtil.getHeaderCliVersion(); String headerCliVersion = CurrentUtil.getHeaderCliVersion(), headerCliSource = CurrentUtil.getHeaderCliSource();
String headerCliSource = CurrentUtil.getHeaderCliSource();
memberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource); memberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource);
memberOrderVo.setVersion(null == headerCliVersion ? "" : headerCliVersion); memberOrderVo.setVersion(null == headerCliVersion ? "" : headerCliVersion);
...@@ -349,8 +348,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -349,8 +348,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initMemberOrderVo.setPaymentAt(now); initMemberOrderVo.setPaymentAt(now);
initMemberOrderVo.setCreatedAt(now); initMemberOrderVo.setCreatedAt(now);
initMemberOrderVo.setClientIp(CurrentUtil.getCliIpAddr()); initMemberOrderVo.setClientIp(CurrentUtil.getCliIpAddr());
String headerCliVersion = CurrentUtil.getHeaderCliVersion(); String headerCliVersion = CurrentUtil.getHeaderCliVersion(), headerCliSource = CurrentUtil.getHeaderCliSource();
String headerCliSource = CurrentUtil.getHeaderCliSource();
initMemberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource); initMemberOrderVo.setSource(null == headerCliSource ? "" : headerCliSource);
initMemberOrderVo.setVersion(null == headerCliVersion ? "" : headerCliVersion); initMemberOrderVo.setVersion(null == headerCliVersion ? "" : headerCliVersion);
......
...@@ -328,8 +328,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -328,8 +328,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData, Long currentTime) { private ResponseDto<PayInnerResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData, List<AdamEntersVo> entersVoList, Integer isStudent, KylinTicketTimesVo ticketTimesData, Long currentTime) {
LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr(); LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
String source = CurrentUtil.getHeaderCliSource() == null ? "" : CurrentUtil.getHeaderCliSource(); String headerCliSource = CurrentUtil.getHeaderCliSource(), headerCliVersion = CurrentUtil.getHeaderCliVersion();
String version = CurrentUtil.getHeaderCliVersion() == null ? "" : CurrentUtil.getHeaderCliVersion(); String source = headerCliSource == null ? "" : headerCliSource;
String version = headerCliVersion == null ? "" : headerCliVersion;
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
//生成订单 order_ticket //生成订单 order_ticket
KylinOrderTickets orderTickets = KylinOrderTickets.getNew(); KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
......
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