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

Commit 19f0628d authored by 胡佳晨's avatar 胡佳晨

KylinDamaiServiceImpl.java 删除 010 020后缀

KylinOrderTicketsServiceImpl.java
订单支付回调增加 实时同步
订单支付回调增加 超时支付退款关闭订单
TaobaoTicketUtils.java 增加 大麦订单退款
KylinRefundsStatusServiceImpl.java 增加 财务通过 大麦同步
KylinOrderTicketsServiceImpl.java 增加新接口 放开订单列表
parent a2a64325
......@@ -25,6 +25,9 @@ public interface IKylinOrderTicketsService {
//订单列表(状态 待支付 已支付 倒计时 已失效)
PageInfo<List<KylinOrderListVo>> orderList();
//订单列表(状态 待支付 已支付 倒计时 已失效)
PageInfo<List<KylinOrderListVo>> orderListMongo(Integer page,Integer size);
//订单详情
OrderDetailsVo orderDetails(String orderId);
......
......@@ -74,6 +74,13 @@ public class KylinOrderTicketsController {
return ResponseDto.success(orderTicketsService.orderList());
}
@GetMapping("list/unLimit")
@ApiOperation("订单列表Mongo")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<List<KylinOrderListVo>>> orderListMongo(@RequestParam(value = "page", required = false) Integer page, @RequestParam(value = "size", required = false) Integer size) {
return ResponseDto.success(orderTicketsService.orderListMongo(page, size));
}
@GetMapping("details")
@ApiOperation("订单详情")
@ApiResponse(code = 200, message = "接口返回对象参数")
......
......@@ -11,6 +11,7 @@ import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.UserPathDto;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderRefundEntitiesVo;
......@@ -30,6 +31,9 @@ import org.apache.commons.lang.StringUtils;
import org.bson.Document;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
......@@ -113,6 +117,73 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
}
@Override
public PageInfo<List<KylinOrderListVo>> orderListMongo(Integer page, Integer size) {
PageInfo<List<KylinOrderListVo>> mPageInfo = null;
String uid = CurrentUtil.getCurrentUid();
if (size == null || size == 0) {
size = 40;
}
if (page == null || page == 1 || page == 0) {
page = 1;
}
try {
HashMap<String, Object> info = CollectionUtil.mapStringObject();
// 排序 分页
Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "createdAt"));
//条件
Query query = Query.query(Criteria.where("userId").is(uid));
// 查询总数
long count = mongoTemplate.count(query, KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
query.with(pageable);
List<KylinOrderListVo> voList = mongoTemplate.find(query, KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
info.put("total", count);
info.put("data", voList);
for (int i = 0; i < voList.size(); i++) {
KylinOrderListVo item = voList.get(i);
item.setStatus(item.getStatus());
Integer orderExpressStatus = dataUtils.getOrderExpressInfo(item.getOrderTicketsId());
item.setExpressStatus(orderExpressStatus);
if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
try {
item.setRestTime(DateUtil.intervalSeconds(
DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
));
if (item.getRestTime() <= 0L) {
item.setRestTime(0L);
}
} catch (Exception e) {
e.printStackTrace();
}
} else {
item.setRestTime(0L);
}
if (i >= 40) {
break;
}
}
KylinOrderTicketVo orderTicketVo = dataUtils.getTransferOrder(uid);
if (orderTicketVo != null) {
voList.add(0, KylinOrderListVo.getNew().copy(orderTicketVo));
}
mPageInfo = new PageInfo(voList);
mPageInfo.setTotal(count);
log.info(UserPathDto.setData("订单列表", "", voList));
return mPageInfo;
} catch (Exception e) {
e.printStackTrace();
return mPageInfo;
}
}
@Override
public OrderDetailsVo orderDetails(String orderId) {
try {
......@@ -365,7 +436,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
for (int i = 0; i < kylinOrderTicketEntitiesVoList.size(); i++) {
KylinOrderTicketEntitiesVo data = kylinOrderTicketEntitiesVoList.get(i);
String orderTicketEntitiesId = data.getOrderTicketEntitiesId();
if(data.getEnterName().trim().length()>0){
if (data.getEnterName().trim().length() > 0) {
return ResponseDto.failure("订单已实名不可更改");
}
AdamEntersVo adamEntersData = adamEnters.get(i);
......
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