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

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

修改转赠

parent 10896886
...@@ -196,7 +196,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -196,7 +196,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
vo.setRestTime(0L); vo.setRestTime(0L);
} }
//计算 转正倒计时 //计算 转正倒计时
if (orderTicketVo.getTransferTime()!=null) { if (orderTicketVo.getTransferTime() != null) {
vo.setRestTransferTime(DateUtil.intervalSeconds( vo.setRestTransferTime(DateUtil.intervalSeconds(
DateUtil.parse(orderTicketVo.getTransferTime(), "yyyy-MM-dd HH:mm:ss"), DateUtil.parse(orderTicketVo.getTransferTime(), "yyyy-MM-dd HH:mm:ss"),
nowDate nowDate
...@@ -678,7 +678,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -678,7 +678,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
if (!orderTicketVo.getUserId().equals(uid)) { if (!orderTicketVo.getUserId().equals(uid)) {
return ResponseDto.success("无权查看"); return ResponseDto.success("无权查看");
} }
if(!orderTicketVo.getTransferStatus().equals(0)){ if (!orderTicketVo.getTransferStatus().equals(0)) {
return ResponseDto.failure("已转票一次,无法再次转票"); return ResponseDto.failure("已转票一次,无法再次转票");
} }
Boolean isCanTransfer; Boolean isCanTransfer;
...@@ -812,7 +812,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -812,7 +812,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
Integer enterSize; Integer enterSize;
if (enterIdList == null || enterIdList.equals("")) { if (enterIdList == null || enterIdList.equals("")) {
enterSize = 0; enterSize = 0;
enterIdList=""; enterIdList = "";
} else { } else {
enterSize = enterIdList.split(",").length; enterSize = enterIdList.split(",").length;
} }
...@@ -856,7 +856,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -856,7 +856,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
List<AdamEntersVo> entersVoList = ObjectUtil.cloneArrayListObject(); List<AdamEntersVo> entersVoList = ObjectUtil.cloneArrayListObject();
if (isTrueName == 1) { if (isTrueName == 1) {
List<AdamEntersVo> adamEnters = orderUtils.getEnters(enterIdList, uid); List<AdamEntersVo> adamEnters = orderUtils.getEnters(enterIdList, uid);
if(adamEnters.size()==0){ if (adamEnters == null) {
return ResponseDto.failure("入场人数据异常");//乱七八糟异常 return ResponseDto.failure("入场人数据异常");//乱七八糟异常
} }
for (AdamEntersVo item : adamEnters) { for (AdamEntersVo item : adamEnters) {
...@@ -914,7 +914,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -914,7 +914,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderTickets.setPrice(orderTicketVo.getPrice()); orderTickets.setPrice(orderTicketVo.getPrice());
orderTickets.setPriceMember(orderTicketVo.getPriceMember()); orderTickets.setPriceMember(orderTicketVo.getPriceMember());
orderTickets.setPriceTotal(orderTicketVo.getPriceTotal()); orderTickets.setPriceTotal(orderTicketVo.getPriceTotal());
orderTickets.setPriceActual(orderTickets.getPriceActual()==null?BigDecimal.ZERO:orderTickets.getPriceActual()); orderTickets.setPriceActual(orderTickets.getPriceActual() == null ? BigDecimal.ZERO : orderTickets.getPriceActual());
orderTickets.setPriceVoucher(orderTicketVo.getPriceVoucher()); orderTickets.setPriceVoucher(orderTicketVo.getPriceVoucher());
orderTickets.setPriceExpress(orderTicketVo.getPriceExpress()); orderTickets.setPriceExpress(orderTicketVo.getPriceExpress());
orderTickets.setPriceRefund(orderTicketVo.getPriceRefund()); orderTickets.setPriceRefund(orderTicketVo.getPriceRefund());
...@@ -1106,7 +1106,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -1106,7 +1106,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
//redis //redis
vo.setTransferStatus(6); vo.setTransferStatus(6);
dataUtils.setOrderTicketVo(orderId, vo); dataUtils.setOrderTicketVo(orderId, vo);
orderUtils.resetOrderListVo(vo.getUserId(), 2,orderId, vo); orderUtils.resetOrderListVo(vo.getUserId(), 2, orderId, vo);
//mongo //mongo
mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne( mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketsId").is(orderId)).getQueryObject(), Query.query(Criteria.where("orderTicketsId").is(orderId)).getQueryObject(),
......
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