Skip to content

O
order-group
Commit 5e6dae4b by 徐康
Options

预约单

parent dd2121ff
Showing with 4 additions and 4 deletions
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -2538,7 +2538,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2538,7 +2538,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderConditionsReq.setPartnerId(mcCafePartnerId); orderConditionsReq.setPartnerId(mcCafePartnerId);
orderConditionsReq.setOrderStatuses(Arrays.asList(6,7)); orderConditionsReq.setOrderStatuses(Arrays.asList(6,7));
orderConditionsReq.setPayStatuses(Arrays.asList(2,3,5)); orderConditionsReq.setPayStatuses(Arrays.asList(2,3,5));
orderConditionsReq.setOrderTypes(Arrays.asList(1,3,5)); orderConditionsReq.setOrderTypes(Arrays.asList(1,2,3,4,5,6));
orderConditionsReq.setStartTimestamp(DateUtil.convert2Date(queryOrderVo.getStartDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000); orderConditionsReq.setStartTimestamp(DateUtil.convert2Date(queryOrderVo.getStartDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000);
orderConditionsReq.setEndTimestamp(DateUtil.convert2Date(queryOrderVo.getEndDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000); orderConditionsReq.setEndTimestamp(DateUtil.convert2Date(queryOrderVo.getEndDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000);
orderConditionsReq.setPageNum(i); orderConditionsReq.setPageNum(i);
...@@ -2630,9 +2630,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2630,9 +2630,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
McCafePushOrderDto mcCafePushOrderDto = new McCafePushOrderDto(); McCafePushOrderDto mcCafePushOrderDto = new McCafePushOrderDto();
mcCafePushOrderDto.setMpOrderId(orderInfoReqs.getOrderCode()); mcCafePushOrderDto.setMpOrderId(orderInfoReqs.getOrderCode());
mcCafePushOrderDto.setDisplayOrderId(orderInfoReqs.getDownstreamThirdOrderCode()); mcCafePushOrderDto.setDisplayOrderId(orderInfoReqs.getDownstreamThirdOrderCode());
mcCafePushOrderDto.setType(orderInfoReqs.getOrderType()==3?"2":"1"); mcCafePushOrderDto.setType(orderInfoReqs.getOrderType()==3||orderInfoReqs.getOrderType()==4?"2":"1");
mcCafePushOrderDto.setSaleType("1"); mcCafePushOrderDto.setSaleType(orderInfoReqs.getOrderType()==1||orderInfoReqs.getOrderType()==3||orderInfoReqs.getOrderType()==5?"1":"2");
mcCafePushOrderDto.setEatType(orderInfoReqs.getOrderType()==3?"2":"1"); mcCafePushOrderDto.setEatType(orderInfoReqs.getOrderType()==3||orderInfoReqs.getOrderType()==4?"2":"1");
mcCafePushOrderDto.setDeliveryType("1"); mcCafePushOrderDto.setDeliveryType("1");
mcCafePushOrderDto.setSourceType(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALIMP":"WXMP"); mcCafePushOrderDto.setSourceType(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALIMP":"WXMP");
mcCafePushOrderDto.setBeType("3"); mcCafePushOrderDto.setBeType("3");
......
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