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

Commit 4fec91be authored by 胡佳晨's avatar 胡佳晨

changeBuyInfo 注释没用逻辑

parent a3be52c7
...@@ -229,22 +229,22 @@ public class DataUtils { ...@@ -229,22 +229,22 @@ public class DataUtils {
KylinPerformanceVo vo = getPerformanceVo(performanceId); KylinPerformanceVo vo = getPerformanceVo(performanceId);
int isTrueName = vo.getIsTrueName(); int isTrueName = vo.getIsTrueName();
String useTime = ""; // String useTime = "";
HashMap<String, ArrayList<String>> allTicketId = new HashMap<>(); // HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
for (int x = 0; x < vo.getTicketTimeList().size(); x++) { // for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x); // KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
ArrayList<String> ticketList = new ArrayList<>(); // ArrayList<String> ticketList = new ArrayList<>();
for (int y = 0; y < timeItem.getTicketList().size(); y++) { // for (int y = 0; y < timeItem.getTicketList().size(); y++) {
KylinTicketVo ticketItem = timeItem.getTicketList().get(y); // KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
if (ticketItem.getType() == 1) { // if (ticketItem.getType() == 1) {
ticketList.add(ticketItem.getTicketsId()); // ticketList.add(ticketItem.getTicketsId());
} // }
if (ticketItem.getTicketsId().equals(ticketId)) { // if (ticketItem.getTicketsId().equals(ticketId)) {
useTime = ticketItem.getUseStart(); // useTime = ticketItem.getUseStart();
} // }
} // }
allTicketId.put(timeItem.getUseStart(), ticketList); // allTicketId.put(timeItem.getUseStart(), ticketList);
} // }
if (0 == isTrueName) { if (0 == isTrueName) {
redisKey = KylinRedisConst.USERID_BUY_INFO + userId; redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
...@@ -254,8 +254,8 @@ public class DataUtils { ...@@ -254,8 +254,8 @@ public class DataUtils {
String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId; String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId; String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME; // String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
redisUtil.set(ticketUseTimeKey, useTime); // redisUtil.set(ticketUseTimeKey, useTime);
if (buyCount > 0) { if (buyCount > 0) {
redisUtil.incr(ticketIdKey, buyCount); redisUtil.incr(ticketIdKey, buyCount);
......
...@@ -89,22 +89,22 @@ public class KylinUtils { ...@@ -89,22 +89,22 @@ public class KylinUtils {
String redisKey; String redisKey;
KylinPerformanceVo vo = getPerformanceVo(performanceId); KylinPerformanceVo vo = getPerformanceVo(performanceId);
int isTrueName = vo.getIsTrueName(); int isTrueName = vo.getIsTrueName();
String useTime = ""; // String useTime = "";
HashMap<String, ArrayList<String>> allTicketId = new HashMap<>(); // HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
for (int x = 0; x < vo.getTicketTimeList().size(); x++) { // for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x); // KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
ArrayList<String> ticketList = new ArrayList<>(); // ArrayList<String> ticketList = new ArrayList<>();
for (int y = 0; y < timeItem.getTicketList().size(); y++) { // for (int y = 0; y < timeItem.getTicketList().size(); y++) {
KylinTicketVo ticketItem = timeItem.getTicketList().get(y); // KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
if (ticketItem.getType() == 1) { // if (ticketItem.getType() == 1) {
ticketList.add(ticketItem.getTicketsId()); // ticketList.add(ticketItem.getTicketsId());
} // }
if (ticketItem.getTicketsId().equals(ticketId)) { // if (ticketItem.getTicketsId().equals(ticketId)) {
useTime = ticketItem.getUseStart(); // useTime = ticketItem.getUseStart();
} // }
} // }
allTicketId.put(timeItem.getUseStart(), ticketList); // allTicketId.put(timeItem.getUseStart(), ticketList);
} // }
if (0 == isTrueName) { if (0 == isTrueName) {
redisKey = KylinRedisConst.USERID_BUY_INFO + userId; redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
...@@ -114,8 +114,8 @@ public class KylinUtils { ...@@ -114,8 +114,8 @@ public class KylinUtils {
String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId; String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId; String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME; // String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
redisUtil.set(ticketUseTimeKey, useTime); // redisUtil.set(ticketUseTimeKey, useTime);
if (buyCount > 0) { if (buyCount > 0) {
redisUtil.incr(ticketIdKey, buyCount); redisUtil.incr(ticketIdKey, buyCount);
......
...@@ -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)
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) 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_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 (?,?,?,?)
......
...@@ -104,22 +104,22 @@ public class DataUtils { ...@@ -104,22 +104,22 @@ public class DataUtils {
KylinPerformanceVo vo = getPerformanceVo(performanceId); KylinPerformanceVo vo = getPerformanceVo(performanceId);
int isTrueName = vo.getIsTrueName(); int isTrueName = vo.getIsTrueName();
String useTime = ""; // String useTime = "";
HashMap<String, ArrayList<String>> allTicketId = new HashMap<>(); // HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
for (int x = 0; x < vo.getTicketTimeList().size(); x++) { // for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x); // KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
ArrayList<String> ticketList = ObjectUtil.cloneArrayListString(); // ArrayList<String> ticketList = ObjectUtil.cloneArrayListString();
for (int y = 0; y < timeItem.getTicketList().size(); y++) { // for (int y = 0; y < timeItem.getTicketList().size(); y++) {
KylinTicketVo ticketItem = timeItem.getTicketList().get(y); // KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
if (ticketItem.getType() == 1) { // if (ticketItem.getType() == 1) {
ticketList.add(ticketItem.getTicketsId()); // ticketList.add(ticketItem.getTicketsId());
} // }
if (ticketItem.getTicketsId().equals(ticketId)) { // if (ticketItem.getTicketsId().equals(ticketId)) {
useTime = ticketItem.getUseStart(); // useTime = ticketItem.getUseStart();
} // }
} // }
allTicketId.put(timeItem.getUseStart(), ticketList); // allTicketId.put(timeItem.getUseStart(), ticketList);
} // }
if (0 == isTrueName) { if (0 == isTrueName) {
redisKey = KylinRedisConst.USERID_BUY_INFO + userId; redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
...@@ -129,8 +129,8 @@ public class DataUtils { ...@@ -129,8 +129,8 @@ public class DataUtils {
String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId; String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId; String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME; // String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
redisUtil.set(ticketUseTimeKey, useTime); // redisUtil.set(ticketUseTimeKey, useTime);
if (buyCount > 0) { if (buyCount > 0) {
redisUtil.incr(ticketIdKey, buyCount); redisUtil.incr(ticketIdKey, buyCount);
......
...@@ -252,22 +252,22 @@ public class DataUtils { ...@@ -252,22 +252,22 @@ public class DataUtils {
KylinPerformanceVo vo = getPerformanceVo(performanceId); KylinPerformanceVo vo = getPerformanceVo(performanceId);
int isTrueName = vo.getIsTrueName(); int isTrueName = vo.getIsTrueName();
String useTime = ""; // String useTime = "";
HashMap<String, ArrayList<String>> allTicketId = new HashMap<>(); // HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
for (int x = 0; x < vo.getTicketTimeList().size(); x++) { // for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x); // KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
ArrayList<String> ticketList = new ArrayList<>(); // ArrayList<String> ticketList = new ArrayList<>();
for (int y = 0; y < timeItem.getTicketList().size(); y++) { // for (int y = 0; y < timeItem.getTicketList().size(); y++) {
KylinTicketVo ticketItem = timeItem.getTicketList().get(y); // KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
if (ticketItem.getType() == 1) { // if (ticketItem.getType() == 1) {
ticketList.add(ticketItem.getTicketsId()); // ticketList.add(ticketItem.getTicketsId());
} // }
if (ticketItem.getTicketsId().equals(ticketId)) { // if (ticketItem.getTicketsId().equals(ticketId)) {
useTime = ticketItem.getUseStart(); // useTime = ticketItem.getUseStart();
} // }
} // }
allTicketId.put(timeItem.getUseStart(), ticketList); // allTicketId.put(timeItem.getUseStart(), ticketList);
} // }
if (0 == isTrueName) { if (0 == isTrueName) {
redisKey = KylinRedisConst.USERID_BUY_INFO + userId; redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
...@@ -277,8 +277,8 @@ public class DataUtils { ...@@ -277,8 +277,8 @@ public class DataUtils {
String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId; String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId; String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME; // String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
redisUtil.set(ticketUseTimeKey, useTime); // redisUtil.set(ticketUseTimeKey, useTime);
if (buyCount > 0) { if (buyCount > 0) {
redisUtil.incr(ticketIdKey, buyCount); redisUtil.incr(ticketIdKey, buyCount);
......
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