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

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

增加日志

parent d6831cd4
...@@ -46,7 +46,7 @@ public class OrderUtils { ...@@ -46,7 +46,7 @@ public class OrderUtils {
) { ) {
Integer[] integers = orderLimit(userId, idCard, performanceId, ticketId, isTrueName); Integer[] integers = orderLimit(userId, idCard, performanceId, ticketId, isTrueName);
return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, performanceLimitIdCard, return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, performanceLimitIdCard,
ticketLimitCount, ticketMemberLimitCount,ticketLimitIdCard, ticketLimitCount, ticketMemberLimitCount, ticketLimitIdCard,
memberType, integers[0], integers[1], integers[2], integers[3], isTrueName); memberType, integers[0], integers[1], integers[2], integers[3], isTrueName);
} }
...@@ -83,15 +83,18 @@ public class OrderUtils { ...@@ -83,15 +83,18 @@ public class OrderUtils {
public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int performanceLimitIdCard, public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int performanceLimitIdCard,
int ticketLimitCount, int ticketMemberLimitCount, int ticketLimitIdCard, int memberType, int ticketLimitCount, int ticketMemberLimitCount, int ticketLimitIdCard, int memberType,
int performanceBuyCountUid, int ticketBuyCountUid, int performanceBuyCountIdCard, int ticketBuyCountIdCard, int isTrueName) { int performanceBuyCountUid, int ticketBuyCountUid, int performanceBuyCountIdCard, int ticketBuyCountIdCard, int isTrueName) {
log.info("转赠:\n演出数量=" + performanceBuyCountUid + "\n演出实名数量=" + performanceBuyCountIdCard + "\n票种数量=" + ticketBuyCountUid + "\n票种实名数量=" + ticketBuyCountIdCard);
if (memberType == 1 || memberType == 2) { if (memberType == 1 || memberType == 2) {
if(isTrueName==1){ if (isTrueName == 1) {
if (performanceBuyCountIdCard > performanceMemberLimitCount && performanceMemberLimitCount != 0) { if (performanceBuyCountIdCard > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
return "实名制演出限购" + performanceMemberLimitCount + "张,已超出";//超过演出维度购买量 return "实名制演出限购" + performanceMemberLimitCount + "张,已超出";//超过演出维度购买量
} }
if (ticketBuyCountIdCard > ticketMemberLimitCount && ticketMemberLimitCount != 0) { if (ticketBuyCountIdCard > ticketMemberLimitCount && ticketMemberLimitCount != 0) {
return "实名制票种限购" + ticketMemberLimitCount + "张,已超出";//超过票维度购买量 return "实名制票种限购" + ticketMemberLimitCount + "张,已超出";//超过票维度购买量
} }
}else{ } else {
if (performanceBuyCountUid > performanceMemberLimitCount && performanceMemberLimitCount != 0) { if (performanceBuyCountUid > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
return "本场演出限购" + performanceMemberLimitCount + "张,已超出";//超过演出维度购买量 return "本场演出限购" + performanceMemberLimitCount + "张,已超出";//超过演出维度购买量
} }
...@@ -100,7 +103,7 @@ public class OrderUtils { ...@@ -100,7 +103,7 @@ public class OrderUtils {
} }
} }
} else {//非会员区间 } else {//非会员区间
if(isTrueName==1){ if (isTrueName == 1) {
if (performanceBuyCountUid > performanceLimitCount && performanceLimitCount != 0) { if (performanceBuyCountUid > performanceLimitCount && performanceLimitCount != 0) {
return "本场演出限购" + performanceLimitCount + "张,已超出";//超过演出维度购买量 return "本场演出限购" + performanceLimitCount + "张,已超出";//超过演出维度购买量
} }
...@@ -113,7 +116,7 @@ public class OrderUtils { ...@@ -113,7 +116,7 @@ public class OrderUtils {
if (ticketBuyCountIdCard > ticketLimitIdCard && ticketLimitIdCard != 0) { if (ticketBuyCountIdCard > ticketLimitIdCard && ticketLimitIdCard != 0) {
return "实名制票种限购" + ticketLimitIdCard + "张,已超出";//超过演出维度购买量 return "实名制票种限购" + ticketLimitIdCard + "张,已超出";//超过演出维度购买量
} }
}else{ } else {
if (performanceBuyCountUid > performanceLimitCount && performanceLimitCount != 0) { if (performanceBuyCountUid > performanceLimitCount && performanceLimitCount != 0) {
return "本场演出限购" + performanceLimitCount + "张,已超出";//超过演出维度购买量 return "本场演出限购" + performanceLimitCount + "张,已超出";//超过演出维度购买量
} }
...@@ -192,7 +195,7 @@ public class OrderUtils { ...@@ -192,7 +195,7 @@ public class OrderUtils {
public List<AdamEntersVo> getEnters(String entersIds, String uid) { public List<AdamEntersVo> getEnters(String entersIds, String uid) {
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString(); MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8"); headers.add("Accept", "application/json;charset=UTF-8");
String returnVo = HttpUtil.get( adamUrl+ "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers); String returnVo = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() { ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
}); });
return ResponseVo.getData(); return ResponseVo.getData();
......
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