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

Commit 28e7175b authored by 胡佳晨's avatar 胡佳晨

提交

parent 5ca4638a
...@@ -34,7 +34,10 @@ public final class RedisUtil extends AbstractRedisUtil{ ...@@ -34,7 +34,10 @@ public final class RedisUtil extends AbstractRedisUtil{
public static void main(String[] args) { public static void main(String[] args) {
String[] keys = { String[] keys = {
"kylin:performances_inventory:ticket:id:530885109799526402280996:surplusGeneral", "kylin:performances_inventory:ticket:id:549879610247536644974635:surplusGeneral",
"kylin:performances_inventory:ticket:id:549884198197207048081342:surplusGeneral",
"kylin:performances_inventory:ticket:id:549881492273684485996036:surplusGeneral",
"kylin:performances_inventory:ticket:id:549885632271687689854215:surplusGeneral",
}; };
for (String key : keys) { for (String key : keys) {
long value = key.hashCode(); long value = key.hashCode();
......
...@@ -225,11 +225,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa ...@@ -225,11 +225,11 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
String performanceId = step2Param.getPerformancesId(); String performanceId = step2Param.getPerformancesId();
// 获取 当前时间 -> 创建时间 // 获取 当前时间 -> 创建时间
LocalDateTime createdAt = LocalDateTime.now(); LocalDateTime createdAt = LocalDateTime.now();
String merchantId = step2Param.getMerchantId(); // String merchantId = step2Param.getMerchantId();
boolean isExistsSubmit = mongoMerchantUtils.isExistsSubmitPerformancePartner(performanceId); // boolean isExistsSubmit = mongoMerchantUtils.isExistsSubmitPerformancePartner(performanceId);
if (isExistsSubmit) { // if (isExistsSubmit) {
return ResponseDto.failure(ErrorMapping.get(20112)); // return ResponseDto.failure(ErrorMapping.get(20112));
} // }
//演出修改数据 //演出修改数据
PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew(); PerformancePartnerVo performancePartnerVo = PerformancePartnerVo.getNew();
......
...@@ -217,23 +217,26 @@ public class PerformanceUtils { ...@@ -217,23 +217,26 @@ public class PerformanceUtils {
try { try {
LinkedList<String> sqls = CollectionUtil.linkedListString(); LinkedList<String> sqls = CollectionUtil.linkedListString();
sqls.add(SqlMapping.get("kylin_performances.del")); sqls.add(SqlMapping.get("kylin_performances.del"));
sqls.add(SqlMapping.get("kylin_performances.insert"));
sqls.add(SqlMapping.get("kylin_performance_status.del")); sqls.add(SqlMapping.get("kylin_performance_status.del"));
sqls.add(SqlMapping.get("kylin_performance_status.insert"));
sqls.add(SqlMapping.get("kylin_performance_relations.del")); sqls.add(SqlMapping.get("kylin_performance_relations.del"));
sqls.add(SqlMapping.get("kylin_performance_relations.insert"));
sqls.add(SqlMapping.get("kylin_ticket_times.del")); sqls.add(SqlMapping.get("kylin_ticket_times.del"));
sqls.add(SqlMapping.get("kylin_ticket_times.insert"));
sqls.add(SqlMapping.get("kylin_ticket_time_relation.del")); sqls.add(SqlMapping.get("kylin_ticket_time_relation.del"));
sqls.add(SqlMapping.get("kylin_ticket_time_relation.insert"));
sqls.add(SqlMapping.get("kylin_tickets.del")); sqls.add(SqlMapping.get("kylin_tickets.del"));
sqls.add(SqlMapping.get("kylin_tickets.insert"));
sqls.add(SqlMapping.get("kylin_ticket_status.del")); sqls.add(SqlMapping.get("kylin_ticket_status.del"));
sqls.add(SqlMapping.get("kylin_ticket_status.insert"));
sqls.add(SqlMapping.get("kylin_ticket_relations.del")); sqls.add(SqlMapping.get("kylin_ticket_relations.del"));
sqls.add(SqlMapping.get("kylin_ticket_relations.insert"));
sqls.add(SqlMapping.get("kylin_ticket_express_module.del")); sqls.add(SqlMapping.get("kylin_ticket_express_module.del"));
sqls.add(SqlMapping.get("kylin_ticket_express_module.insert"));
LinkedList<String> sqlsInsert = CollectionUtil.linkedListString();
sqlsInsert.add(SqlMapping.get("kylin_performances.insert"));
sqlsInsert.add(SqlMapping.get("kylin_performance_status.insert"));
sqlsInsert.add(SqlMapping.get("kylin_performance_relations.insert"));
sqlsInsert.add(SqlMapping.get("kylin_ticket_times.insert"));
sqlsInsert.add(SqlMapping.get("kylin_ticket_time_relation.insert"));
sqlsInsert.add(SqlMapping.get("kylin_tickets.insert"));
sqlsInsert.add(SqlMapping.get("kylin_ticket_status.insert"));
sqlsInsert.add(SqlMapping.get("kylin_ticket_relations.insert"));
sqlsInsert.add(SqlMapping.get("kylin_ticket_express_module.insert"));
LinkedList<Object[]> del1 = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> del1 = CollectionUtil.linkedListObjectArr();
LinkedList<Object[]> del2 = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> del2 = CollectionUtil.linkedListObjectArr();
...@@ -337,8 +340,8 @@ public class PerformanceUtils { ...@@ -337,8 +340,8 @@ public class PerformanceUtils {
tickets.setPriceDiscountMember(BigDecimal.ZERO); tickets.setPriceDiscountMember(BigDecimal.ZERO);
tickets.setPriceDiscount(BigDecimal.ZERO); tickets.setPriceDiscount(BigDecimal.ZERO);
tickets.setTimeStart(LocalDateTime.parse(ticketItem.getTimeStart(),DTF_YMD_HMS)); tickets.setTimeStart(LocalDateTime.parse(ticketItem.getTimeStart(), DTF_YMD_HMS));
tickets.setTimeEnd(LocalDateTime.parse(ticketItem.getTimeEnd(),DTF_YMD_HMS)); tickets.setTimeEnd(LocalDateTime.parse(ticketItem.getTimeEnd(), DTF_YMD_HMS));
if (ticketItem.getIsExpress() == 1) { if (ticketItem.getIsExpress() == 1) {
tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress()))); tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
tickets.setDescribeExpress(ticketItem.getDescribeExpress()); tickets.setDescribeExpress(ticketItem.getDescribeExpress());
...@@ -351,11 +354,11 @@ public class PerformanceUtils { ...@@ -351,11 +354,11 @@ public class PerformanceUtils {
} else { } else {
tickets.setDescribeElectronic(""); tickets.setDescribeElectronic("");
} }
tickets.setUseStart(LocalDateTime.parse(ticketTimeItem.getUseStart(),DTF_YMD_HMS)); tickets.setUseStart(LocalDateTime.parse(ticketTimeItem.getUseStart(), DTF_YMD_HMS));
tickets.setUseEnd(LocalDateTime.parse(ticketTimeItem.getUseEnd(),DTF_YMD_HMS)); tickets.setUseEnd(LocalDateTime.parse(ticketTimeItem.getUseEnd(), DTF_YMD_HMS));
tickets.setSaleRemindMinute(60); tickets.setSaleRemindMinute(60);
tickets.setAdvanceMinuteMember(5); tickets.setAdvanceMinuteMember(5);
tickets.setCreatedAt(LocalDateTime.parse(ticketTimeItem.getCreatedAt(),DTF_YMD_HMS)); tickets.setCreatedAt(LocalDateTime.parse(ticketTimeItem.getCreatedAt(), DTF_YMD_HMS));
tickets.setUpdatedAt(updatedAt); tickets.setUpdatedAt(updatedAt);
ticketStatus.setTicketStatusId(IDGenerator.nextSnowId()); ticketStatus.setTicketStatusId(IDGenerator.nextSnowId());
ticketStatus.setTicketId(tickets.getTicketsId()); ticketStatus.setTicketId(tickets.getTicketsId());
...@@ -365,7 +368,7 @@ public class PerformanceUtils { ...@@ -365,7 +368,7 @@ public class PerformanceUtils {
ticketStatus.setMemberLimitCount(1); ticketStatus.setMemberLimitCount(1);
ticketStatus.setStatusExchange(7); ticketStatus.setStatusExchange(7);
if (ticketItem.getIsShowCode() == 1) { if (ticketItem.getIsShowCode() == 1) {
ticketStatus.setQrCodeShowTime(LocalDateTime.parse(ticketItem.getQrCodeShowTime(),DTF_YMD_HMS)); ticketStatus.setQrCodeShowTime(LocalDateTime.parse(ticketItem.getQrCodeShowTime(), DTF_YMD_HMS));
} else { } else {
ticketStatus.setQrCodeShowTime(updatedAt); ticketStatus.setQrCodeShowTime(updatedAt);
} }
...@@ -390,7 +393,7 @@ public class PerformanceUtils { ...@@ -390,7 +393,7 @@ public class PerformanceUtils {
//快递相关 //快递相关
KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId()); KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMPVo(tickets.getTicketsId());
redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo); redisMerchantUtils.setTEMVo(tickets.getTicketsId(), moduleVo);
del9.add(new Object[]{tickets.getTicketsId()}); del9.add(new Object[]{tickets.getTicketsId(), updatedAt});
for (String mVo : moduleVo.getProduceCodeList()) for (String mVo : moduleVo.getProduceCodeList())
insert9.add(new Object[]{ insert9.add(new Object[]{
tickets.getTicketsId(), mVo, updatedAt, updatedAt tickets.getTicketsId(), mVo, updatedAt, updatedAt
...@@ -398,18 +401,34 @@ public class PerformanceUtils { ...@@ -398,18 +401,34 @@ public class PerformanceUtils {
} }
} }
String sqlData = SqlMapping.gets(sqls, String sqlData = SqlMapping.gets(sqls,
del1, insert1, del1,
del2, insert2, del2,
del3, insert3, del3,
del4, insert4, del4,
del5, insert5, del5,
del6, insert6, del6,
del7, insert7, del7,
del8, insert8, del8,
del9, insert9 del9
); );
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_INSERT.getKey(), queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_INSERT.getKey(),
sqlData); sqlData);
Thread.sleep(100);
String sqlDataInsert = SqlMapping.gets(sqlsInsert,
insert1,
insert2,
insert3,
insert4,
insert5,
insert6,
insert7,
insert8,
insert9
);
queueUtil.sendMsgByRedis(MQConst.MerchantQueue.SQL_MERCHANT_PERFORMANCE_INSERT.getKey(),
sqlDataInsert);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
...@@ -65,5 +65,5 @@ kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,price,pric ...@@ -65,5 +65,5 @@ kylin_tickets.insert=INSERT INTO kylin_tickets (tickets_id,title,type,price,pric
kylin_ticket_status.insert=INSERT INTO kylin_ticket_status (ticket_status_id,ticket_id,is_student,is_electronic,is_express,status,counts,status_exchange,is_show_code,qr_code_show_time,is_lack_register,total_general,total_exchange,surplus_general,surplus_exchange,express_type,is_transfer,is_true_name,limit_count,member_limit_count,is_exclusive,is_member,is_agent,sync_damai,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) kylin_ticket_status.insert=INSERT INTO kylin_ticket_status (ticket_status_id,ticket_id,is_student,is_electronic,is_express,status,counts,status_exchange,is_show_code,qr_code_show_time,is_lack_register,total_general,total_exchange,surplus_general,surplus_exchange,express_type,is_transfer,is_true_name,limit_count,member_limit_count,is_exclusive,is_member,is_agent,sync_damai,created_at,updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
kylin_ticket_relations.insert=INSERT INTO kylin_ticket_relations (ticket_relations_id,ticket_id,times_id,created_at,updated_at) VALUES (?,?,?,?,?) kylin_ticket_relations.insert=INSERT INTO kylin_ticket_relations (ticket_relations_id,ticket_id,times_id,created_at,updated_at) VALUES (?,?,?,?,?)
kylin_ticket_express_module.del=DELETE FROM kylin_ticket_express_module WHERE ticket_id = ? kylin_ticket_express_module.del=DELETE FROM kylin_ticket_express_module WHERE ticket_id = ? and created_at < ?
kylin_ticket_express_module.insert=INSERT INTO kylin_ticket_express_module (ticket_id,express_module_id,comment,created_at,updated_at) VALUES (?,?,?,?,?) kylin_ticket_express_module.insert=INSERT INTO kylin_ticket_express_module (ticket_id,produce_code,created_at,updated_at) VALUES (?,?,?,?)
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