Commit cd550654 by 徐康

麦咖啡推送数据测试

parent 020c2d01
...@@ -2602,7 +2602,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2602,7 +2602,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
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");
mcCafePushOrderDto.setDayPart("2"); mcCafePushOrderDto.setDayPart("2");
mcCafePushOrderDto.setChannel("10"); mcCafePushOrderDto.setChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"43":"10");
mcCafePushOrderDto.setStatus(NewOrderStatus.COMPLETE.getIndex().equals(orderInfoReqs.getOrderState())?"40":"80"); mcCafePushOrderDto.setStatus(NewOrderStatus.COMPLETE.getIndex().equals(orderInfoReqs.getOrderState())?"40":"80");
mcCafePushOrderDto.setInvoiceNeeded(orderExtInfoDto.getNeedInvoice()); mcCafePushOrderDto.setInvoiceNeeded(orderExtInfoDto.getNeedInvoice());
mcCafePushOrderDto.setInvoiced(1); mcCafePushOrderDto.setInvoiced(1);
...@@ -2764,7 +2765,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2764,7 +2765,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
McCafePushOrderDto.OrderPayment orderPayment = new McCafePushOrderDto.OrderPayment(); McCafePushOrderDto.OrderPayment orderPayment = new McCafePushOrderDto.OrderPayment();
orderPayment.setChannelPayTransactionId(orderExtInfoDto.getPayTransId()); orderPayment.setChannelPayTransactionId(orderExtInfoDto.getPayTransId());
orderPayment.setPayStatus("PAID"); orderPayment.setPayStatus("PAID");
orderPayment.setPaySource("10"); orderPayment.setPaySource(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"43":"10");
orderPayment.setPayChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALI":"WX"); orderPayment.setPayChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"ALI":"WX");
orderPayment.setPayAmount(orderInfoReqs.getActualPayAmount().intValue()); orderPayment.setPayAmount(orderInfoReqs.getActualPayAmount().intValue());
if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) { if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) {
...@@ -2841,7 +2842,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2841,7 +2842,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderDelivery.setCompletedTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getReceiveTime())), "yyyy-MM-dd HH:mm:ss")); orderDelivery.setCompletedTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getReceiveTime())), "yyyy-MM-dd HH:mm:ss"));
orderDelivery.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss")); orderDelivery.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss"));
orderAddress.setChannel("10"); orderAddress.setChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"43":"10");
orderAddress.setCustomerId(orderExtInfoDto.getThirdPartyMemberId()); orderAddress.setCustomerId(orderExtInfoDto.getThirdPartyMemberId());
orderAddress.setCustomerNickName(orderInfoReqs.getUserName()); orderAddress.setCustomerNickName(orderInfoReqs.getUserName());
......
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