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

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

order 去掉 无关new

parent 86c065de
package com.liquidnet.service.kylin.dto.vo.returns; package com.liquidnet.service.kylin.dto.vo.returns;
import com.liquidnet.service.kylin.entity.KylinBannersRelations;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@Data @Data
public class KylinOrderListVo implements Serializable { public class KylinOrderListVo implements Serializable,Cloneable {
private static final long serialVersionUID = 6554829077875538374L; private static final long serialVersionUID = 6554829077875538374L;
private String orderTicketsId; private String orderTicketsId;
private String performanceId; private String performanceId;
...@@ -25,4 +26,13 @@ public class KylinOrderListVo implements Serializable { ...@@ -25,4 +26,13 @@ public class KylinOrderListVo implements Serializable {
private Integer expressStatus; private Integer expressStatus;
private String getTicketType; private String getTicketType;
private String createdAt; private String createdAt;
private static final KylinOrderListVo obj = new KylinOrderListVo();
public static KylinOrderListVo getNew() {
try {
return (KylinOrderListVo) obj.clone();
} catch (CloneNotSupportedException e) {
return new KylinOrderListVo();
}
}
} }
...@@ -38,9 +38,4 @@ public class ServiceOrderApplication implements CommandLineRunner { ...@@ -38,9 +38,4 @@ public class ServiceOrderApplication implements CommandLineRunner {
e.printStackTrace(); e.printStackTrace();
} }
} }
// @Bean
// MongoTransactionManager transactionManager(MongoDbFactory factory){
// return new MongoTransactionManager(factory);
// }
} }
...@@ -10,6 +10,7 @@ import com.liquidnet.service.kylin.dto.param.PayOrderParam; ...@@ -10,6 +10,7 @@ import com.liquidnet.service.kylin.dto.param.PayOrderParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam; import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.returns.*; import com.liquidnet.service.kylin.dto.vo.returns.*;
import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService; import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
import com.liquidnet.service.order.utils.ObjectUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponse;
...@@ -81,7 +82,7 @@ public class KylinOrderTicketsController { ...@@ -81,7 +82,7 @@ public class KylinOrderTicketsController {
if (null == status) { if (null == status) {
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
} else { } else {
HashMap<String, Integer> map = new HashMap<>(); HashMap<String, Integer> map = ObjectUtil.cloneHashMapStringAndInteger();
map.put("status", status); map.put("status", status);
return ResponseDto.success(map); return ResponseDto.success(map);
} }
......
...@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl {
public Boolean orderTicketRefunding( public Boolean orderTicketRefunding(
KylinOrderTicketVo orderInfo, String orderTicketsId, KylinOrderTicketVo orderInfo, String orderTicketsId,
BigDecimal RefundPriceExpress, BigDecimal RefundPriceExpress,
List<String> ticketEntityIds, List<BigDecimal> entitiesPrice,String paymentId List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId
) { ) {
if (CollectionUtil.isEmpty(ticketEntityIds)) { if (CollectionUtil.isEmpty(ticketEntityIds)) {
return false; return false;
...@@ -81,7 +81,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -81,7 +81,7 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew(); KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3); kylinOrderTicketVo.setStatus(KylinTableStatusConst.ORDER_STATUS3);
kylinOrderTicketVo.setUpdatedAt(nowTimeStr); kylinOrderTicketVo.setUpdatedAt(nowTimeStr);
BasicDBObject orderObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo))); BasicDBObject orderObject = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketVo)));
mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(), Query.query(Criteria.where("orderTicketsId").is(orderTicketsId)).getQueryObject(),
orderObject orderObject
...@@ -98,7 +98,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -98,7 +98,7 @@ public class KylinRefundsStatusServiceImpl {
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew(); KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2); kylinOrderTicketEntitiesVo.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT2);
kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr); kylinOrderTicketEntitiesVo.setUpdatedAt(nowTimeStr);
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo))); BasicDBObject entitiesObject = ObjectUtil.cloneBasicDBObject().append("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj(); LinkedList<Object[]> sqlsDataB = ObjectUtil.cloneLinkedListObj();
for (String v : ticketEntityIds) { for (String v : ticketEntityIds) {
...@@ -160,11 +160,11 @@ public class KylinRefundsStatusServiceImpl { ...@@ -160,11 +160,11 @@ public class KylinRefundsStatusServiceImpl {
kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i)); kylinOrderRefundEntities.setOrderTicketEntitiesId(ticketEntityIds.get(i));
Object[] objectD = ObjectUtil.cloneObjectsArray(); Object[] objectD = ObjectUtil.cloneObjectsArray();
objectD[0]=kylinOrderRefundEntities.getOrderRefundsEntitiesId(); objectD[0] = kylinOrderRefundEntities.getOrderRefundsEntitiesId();
objectD[1]=kylinOrderRefundEntities.getOrderRefundsId(); objectD[1] = kylinOrderRefundEntities.getOrderRefundsId();
objectD[2]=kylinOrderRefundEntities.getRefundPrice(); objectD[2] = kylinOrderRefundEntities.getRefundPrice();
objectD[3]=kylinOrderRefundEntities.getOrderTicketEntitiesId(); objectD[3] = kylinOrderRefundEntities.getOrderTicketEntitiesId();
objectD[4]=kylinOrderRefundEntities.getCreatedAt(); objectD[4] = kylinOrderRefundEntities.getCreatedAt();
sqlsDataD.add(objectD); sqlsDataD.add(objectD);
KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew(); KylinOrderRefundEntitiesVo orderRefundEntitiesVo = KylinOrderRefundEntitiesVo.getNew();
...@@ -185,39 +185,39 @@ public class KylinRefundsStatusServiceImpl { ...@@ -185,39 +185,39 @@ public class KylinRefundsStatusServiceImpl {
sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund")); sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
Object[] objectE = ObjectUtil.cloneObjectsArray(); Object[] objectE = ObjectUtil.cloneObjectsArray();
objectE[0]=paymentId; objectE[0] = paymentId;
objectE[1]=orderStatusTable.getUpdatedAt(); objectE[1] = orderStatusTable.getUpdatedAt();
objectE[2]=orderInfo.getOrderTicketsId(); objectE[2] = orderInfo.getOrderTicketsId();
objectE[3]=orderInfo.getChangeDate(); objectE[3] = orderInfo.getChangeDate();
objectE[4]=orderInfo.getChangeDate(); objectE[4] = orderInfo.getChangeDate();
sqlsDataE.add(objectE); sqlsDataE.add(objectE);
Object[] objectA = ObjectUtil.cloneObjectsArray(); Object[] objectA = ObjectUtil.cloneObjectsArray();
objectA[0]=orderStatusTable.getStatus(); objectA[0] = orderStatusTable.getStatus();
objectA[1]=orderStatusTable.getUpdatedAt(); objectA[1] = orderStatusTable.getUpdatedAt();
objectA[2]=orderInfo.getOrderTicketsId(); objectA[2] = orderInfo.getOrderTicketsId();
objectA[3]=orderInfo.getChangeDate(); objectA[3] = orderInfo.getChangeDate();
objectA[4]=orderInfo.getChangeDate(); objectA[4] = orderInfo.getChangeDate();
sqlsDataA.add(objectA); sqlsDataA.add(objectA);
Object[] objectC = ObjectUtil.cloneObjectsArray(); Object[] objectC = ObjectUtil.cloneObjectsArray();
objectC[0]=kylinOrderRefunds.getOrderRefundsId(); objectC[0] = kylinOrderRefunds.getOrderRefundsId();
objectC[1]=kylinOrderRefunds.getOrderTicketsId(); objectC[1] = kylinOrderRefunds.getOrderTicketsId();
objectC[2]= kylinOrderRefunds.getOrderRefundCode(); objectC[2] = kylinOrderRefunds.getOrderRefundCode();
objectC[3]=kylinOrderRefunds.getPrice(); objectC[3] = kylinOrderRefunds.getPrice();
objectC[4]=kylinOrderRefunds.getPriceExpress(); objectC[4] = kylinOrderRefunds.getPriceExpress();
objectC[5]=kylinOrderRefunds.getStatus(); objectC[5] = kylinOrderRefunds.getStatus();
objectC[6]=kylinOrderRefunds.getType(); objectC[6] = kylinOrderRefunds.getType();
objectC[7]=kylinOrderRefunds.getApplicantId(); objectC[7] = kylinOrderRefunds.getApplicantId();
objectC[8]=kylinOrderRefunds.getApplicantName(); objectC[8] = kylinOrderRefunds.getApplicantName();
objectC[9]=kylinOrderRefunds.getApplicantAt(); objectC[9] = kylinOrderRefunds.getApplicantAt();
objectC[10]=kylinOrderRefunds.getReason(); objectC[10] = kylinOrderRefunds.getReason();
objectC[11]=kylinOrderRefunds.getRefundCate(); objectC[11] = kylinOrderRefunds.getRefundCate();
objectC[12]=kylinOrderRefunds.getCreatedAt(); objectC[12] = kylinOrderRefunds.getCreatedAt();
sqlsDataC.add(objectC); sqlsDataC.add(objectC);
queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_OVERTIME_REFUND.getKey(), queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_OVERTIME_REFUND.getKey(),
SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD,sqlsDataE)); SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
return true; return true;
} }
......
...@@ -108,7 +108,7 @@ public class DataUtils { ...@@ -108,7 +108,7 @@ public class DataUtils {
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 = 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) {
......
package com.liquidnet.service.order.utils; package com.liquidnet.service.order.utils;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo; import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.mongodb.BasicDBObject; import com.mongodb.BasicDBObject;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
...@@ -25,11 +26,15 @@ public class ObjectUtil { ...@@ -25,11 +26,15 @@ public class ObjectUtil {
private static final LinkedList<String> linkedListStr = new LinkedList<String>(); private static final LinkedList<String> linkedListStr = new LinkedList<String>();
private static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>(); private static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>(); private static final HashMap<String, Object> hashMapStringAndObject = new HashMap<String, Object>();
private static final HashMap<String, Integer> hashMapStringAndInteger = new HashMap();
private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>(); private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
private static final ArrayList<String> arrayListString = new ArrayList<>();
private static final ArrayList<KylinOrderListVo> arrayKylinOrderListVo = new ArrayList<>();
private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>(); private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
private static final BasicDBObject basicDBObject = new BasicDBObject(); private static final BasicDBObject basicDBObject = new BasicDBObject();
public static final Object[] objectsArray = new Object[100]; public static final Object[] objectsArray = new Object[100];
public static final Integer[] integerArray2 = new Integer[2];
public static LinkedList<Object[]> cloneLinkedListObj() { public static LinkedList<Object[]> cloneLinkedListObj() {
return (LinkedList<Object[]>) linkedListObj.clone(); return (LinkedList<Object[]>) linkedListObj.clone();
...@@ -47,10 +52,22 @@ public class ObjectUtil { ...@@ -47,10 +52,22 @@ public class ObjectUtil {
return (HashMap<String, Object>) hashMapStringAndObject.clone(); return (HashMap<String, Object>) hashMapStringAndObject.clone();
} }
public static HashMap<String, Integer> cloneHashMapStringAndInteger() {
return (HashMap<String, Integer>) hashMapStringAndInteger.clone();
}
public static ArrayList<AdamEntersVo> cloneArrayListObject() { public static ArrayList<AdamEntersVo> cloneArrayListObject() {
return (ArrayList<AdamEntersVo>) arrayListObject.clone(); return (ArrayList<AdamEntersVo>) arrayListObject.clone();
} }
public static ArrayList<KylinOrderListVo> cloneArrayKylinOrderListVo() {
return (ArrayList<KylinOrderListVo>) arrayKylinOrderListVo.clone();
}
public static ArrayList<String> cloneArrayListString() {
return (ArrayList<String>) arrayListString.clone();
}
public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() { public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
return linkedMultiValueMapStringAndString.clone(); return linkedMultiValueMapStringAndString.clone();
} }
...@@ -59,6 +76,10 @@ public class ObjectUtil { ...@@ -59,6 +76,10 @@ public class ObjectUtil {
return objectsArray.clone(); return objectsArray.clone();
} }
public static Integer[] cloneInteger2Array() {
return integerArray2.clone();
}
public static BasicDBObject cloneBasicDBObject() { public static BasicDBObject cloneBasicDBObject() {
return (BasicDBObject) basicDBObject.clone(); return (BasicDBObject) basicDBObject.clone();
} }
......
...@@ -62,7 +62,10 @@ public class OrderUtils { ...@@ -62,7 +62,10 @@ public class OrderUtils {
performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId); performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId); ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
} }
return new Integer[]{performanceBuyCount, ticketBuyCount}; Integer[] array = ObjectUtil.cloneInteger2Array();
array[0]=performanceBuyCount;
array[1]=ticketBuyCount;
return array;
} }
public Integer[] festivalOrderLimit( public Integer[] festivalOrderLimit(
...@@ -82,7 +85,10 @@ public class OrderUtils { ...@@ -82,7 +85,10 @@ public class OrderUtils {
ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId); ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
} }
return new Integer[]{performanceBuyCount, ticketBuyCount}; Integer[] array = ObjectUtil.cloneInteger2Array();
array[0]=performanceBuyCount;
array[1]=ticketBuyCount;
return array;
} }
public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) { public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) {
...@@ -128,9 +134,9 @@ public class OrderUtils { ...@@ -128,9 +134,9 @@ public class OrderUtils {
* @param orderId 订单id [需要新增或者修改的订单id] * @param orderId 订单id [需要新增或者修改的订单id]
*/ */
public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) { public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
List<KylinOrderListVo> vo = new ArrayList<>(); List<KylinOrderListVo> vo = ObjectUtil.cloneArrayKylinOrderListVo();
List<KylinOrderListVo> redisVo = new ArrayList(); List<KylinOrderListVo> redisVo = ObjectUtil.cloneArrayKylinOrderListVo();
KylinOrderListVo voItem = new KylinOrderListVo(); KylinOrderListVo voItem = KylinOrderListVo.getNew();
KylinOrderTicketVo data; KylinOrderTicketVo data;
if (dataSingle == null) { if (dataSingle == null) {
data = dataUtils.getOrderTicketVo(orderId); data = dataUtils.getOrderTicketVo(orderId);
......
...@@ -35,7 +35,7 @@ public class QueueUtils { ...@@ -35,7 +35,7 @@ public class QueueUtils {
* @param jsonMsg Json字符串 * @param jsonMsg Json字符串
*/ */
public void sendMsgByRedis(String streamKey, String jsonMsg) { public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
map.put("message", jsonMsg); map.put("message", jsonMsg);
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey)); stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
} }
......
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