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

Commit 99984ded authored by 胡佳晨's avatar 胡佳晨

增加入库

parent 7a34d187
......@@ -258,16 +258,21 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
vo.setIsCanTransfer(0);
}
//是否可回退
if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
&& orderTicketVo.getTransferStatus().equals(3)) {
// if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
// LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
// LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
// if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
// && orderTicketVo.getTransferStatus().equals(3)) {
// vo.setIsCanBack(1);
// } else {
// vo.setIsCanBack(0);
// }
// } else {
// vo.setIsCanBack(0);
// }
if(orderTicketVo.getTransferStatus().equals(3)){
vo.setIsCanBack(1);
} else {
vo.setIsCanBack(0);
}
} else {
}else{
vo.setIsCanBack(0);
}
......@@ -430,7 +435,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
for (int i = 0; i < kylinOrderTicketEntitiesVoList.size(); i++) {
String orderTicketEntitiesId = kylinOrderTicketEntitiesVoList.get(i).getOrderTicketEntitiesId();
AdamEntersVo adamEntersData = adamEnters.get(i);
mongoTemplate.getCollection(KylinOrderTicketEntities.class.getSimpleName()).updateOne(
mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(orderTicketEntitiesId)).getQueryObject(),
new Document("$set", new Document("enterType", adamEntersData.getType())
.append("enterName", adamEntersData.getName())
......
......@@ -184,7 +184,7 @@ public class OrderUtils {
public List<AdamEntersVo> getEnters(String entersIds, String uid) {
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
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( "http://testadam.zhengzai.tv"+ "/adam/rsc/inquire/enters?entersIds=" + entersIds + "&uid=" + uid, null, headers);
ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
});
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