麦咖啡推送数据测试

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -2593,7 +2593,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         mcCafePushOrderDto.setCustomer_id(orderExtInfoDto.getThirdPartyMemberId());
         mcCafePushOrderDto.setStoreCode(orderInfoReqs.getStoreId());
         mcCafePushOrderDto.setStoreName(orderInfoReqs.getStoreName());
-        mcCafePushOrderDto.setBusinessDate(orderInfoReqs.getCreateTime().substring(0, 10));
+        mcCafePushOrderDto.setBusinessDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd"));
         mcCafePushOrderDto.setTablewareInfo(Integer.valueOf(1).equals(orderExtInfoDto.getNeedTableware())?"01":"02");
         mcCafePushOrderDto.setTotalAmount(orderInfoReqs.getActualPayAmount().intValue());
         mcCafePushOrderDto.setDiscountTotalAmount(orderInfoReqs.getOriginalAmount().subtract(orderInfoReqs.getActualPayAmount()).intValue());
@@ -2608,8 +2608,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             mcCafePushOrderDto.setRealDeliveryPrice(0);
         }
         mcCafePushOrderDto.setRemark(orderInfoReqs.getNote());
-        mcCafePushOrderDto.setSaleTime(orderInfoReqs.getPayTime());
-        mcCafePushOrderDto.setCompletionTime(orderInfoReqs.getReceiveTime());
+        mcCafePushOrderDto.setSaleTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getPayTime())), "yyyy-MM-dd HH:mm:ss"));
+        mcCafePushOrderDto.setCompletionTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getReceiveTime())), "yyyy-MM-dd HH:mm:ss"));
 
         Optional<AfterSalesOrderResp> afterSalesOrderRespOptional = Optional.empty();
         if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) {
@@ -2620,7 +2620,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 mcCafePushOrderDto.setCancellationRemark(afterSalesOrderRespOptional.get().getReqRemark());
             }
         }
-        mcCafePushOrderDto.setAcceptTime(orderInfoReqs.getAcceptTime()+".000");
+        mcCafePushOrderDto.setAcceptTime(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss"));
         mcCafePushOrderDto.setPickupCode(orderInfoReqs.getPickUpGoodsNo());
         mcCafePushOrderDto.setOpenId(orderExtInfoDto.getOpenid());
         GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto = new GetMemberInfoByIdRequestDto();
@@ -2636,7 +2636,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 mcCafePushOrderDto.setUnionId(channelListBeanOptional.get().getUnionId());
             }
         }
-        mcCafePushOrderDto.setCreatedDate(orderInfoReqs.getCreateTime());
+        mcCafePushOrderDto.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss"));
 
 
         List<McCafePushOrderDto.OrderItem> orderItemList = new ArrayList<>();
@@ -2737,7 +2737,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             } else {
                 orderItem.setCostInclusive("1");
             }
-            orderItem.setCreatedDate(orderInfoReqs.getCreateTime());
+            orderItem.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss"));
 
             orderItemList.add(orderItem);
         }
@@ -2789,7 +2789,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 orderPayment.setTenderCode("150");
             }
         }
-        orderPayment.setCreatedDate(orderInfoReqs.getPayTime());
+        orderPayment.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getPayTime())), "yyyy-MM-dd HH:mm:ss"));
         orderPaymentList.add(orderPayment);
         mcCafePushOrderDto.setOrderPayment(orderPaymentList);
 
@@ -2821,8 +2821,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     }
                 }
             }
-            orderDelivery.setCompletedTime(orderInfoReqs.getReceiveTime());
-            orderDelivery.setCreatedDate(orderInfoReqs.getCreateTime());
+            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"));
 
             orderAddress.setChannel(orderInfoReqs.getOrderClient().equals(OrderClientType.ALIPAY.getIndex())?"54":"45");
             orderAddress.setCustomerId(orderExtInfoDto.getThirdPartyMemberId());
@@ -2840,7 +2840,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         orderFoe.setPickupCode(orderInfoReqs.getPickUpGoodsNo());
         orderFoe.setStatus("20");
         orderFoe.setFoeType("1");
-        orderFoe.setCreatedDate(orderInfoReqs.getAcceptTime());
+        orderFoe.setCreatedDate(DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getAcceptTime())), "yyyy-MM-dd HH:mm:ss"));
         orderFoeList.add(orderFoe);
         if(NewOrderStatus.CLOSED.getIndex().equals(orderInfoReqs.getOrderState()) && CollectionUtils.isNotEmpty(orderInfoReqs.getAfterSalesOrderList())) {
             McCafePushOrderDto.OrderFoe afterSaleOrderFoe = new McCafePushOrderDto.OrderFoe();
@@ -2878,4 +2878,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
     }
 
+    public static void main(String[] args) {
+        System.out.println(DateUtil.convert2String(new Date(1631519403066l), "yyyy-MM-dd HH:mm:ss"));
+    }
 }