麦咖啡订单推送

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

@@ -2550,7 +2550,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     public BaseResponse mcCafePushOrder(McCafeQueryOrderVo queryOrderVo) {
 
         executor.submit(() -> {
-            Long lastCreateTime = DateUtil.convert2Date(queryOrderVo.getStartDate(), "yyyy-MM-dd HH:mm:ss").getTime()/1000;
+            Long lastCreateTime = DateUtil.convert2Date(queryOrderVo.getStartDate(), "yyyy-MM-dd HH:mm:ss").getTime();
             for(int i=1;;i++) {
                 OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
                 orderConditionsReq.setPartnerId(mcCafePartnerId);
@@ -2568,10 +2568,10 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq, LogThreadLocal.getTrackingNo());
                 AppLogUtil.infoLog("queryOrderByConditions："+ JSON.toJSONString(response),null,null);
                 if("50002".equals(response.getCode())) {
-                    AppLogUtil.infoLog("麦咖啡重置退单查询:  重置前：  "+i+"   "+JSON.toJSONString(orderConditionsReq),null,null);
+                    AppLogUtil.infoLog("麦咖啡重置退单查询:  重置前：  "+i+"   "+JSON.toJSONString(queryOrderVo),null,null);
                     i=1;
-                    orderConditionsReq.setStartTimestamp(lastCreateTime);
-                    AppLogUtil.infoLog("麦咖啡重置退单查询:  重置后：  "+i+"   "+JSON.toJSONString(orderConditionsReq),null,null);
+                    queryOrderVo.setStartDate(DateUtil.convert2String(new Date(lastCreateTime), "yyyy-MM-dd HH:mm:ss"));
+                    AppLogUtil.infoLog("麦咖啡重置退单查询:  重置后：  "+i+"   "+JSON.toJSONString(queryOrderVo),null,null);
                     continue;
                 } else if(!ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(response.getCode())) {
                     AppLogUtil.infoLog("麦咖啡历史订单查询异常: "+JSON.toJSONString(queryOrderVo),null,null);
@@ -2584,10 +2584,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 RestTemplate client = new RestTemplate();
                 for(OrderInfoReqs orderInfoReqs : response.getResult()) {
                     try {
-                        String createTime = DateUtil.convert2String(new Date(Long.valueOf(orderInfoReqs.getCreateTime())), "yyyy-MM-dd HH:mm:ss");
-                        Long createTimeStamp = DateUtil.convert2Date(createTime, "yyyy-MM-dd HH:mm:ss").getTime()/1000;
-                        if(createTimeStamp > lastCreateTime) {
-                            lastCreateTime = createTimeStamp;
+                        if(Long.valueOf(orderInfoReqs.getCreateTime()) > lastCreateTime) {
+                            lastCreateTime = Long.valueOf(orderInfoReqs.getCreateTime());
                         }
                         McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs);
                         AppLogUtil.infoLog("订单推送入参: "+JSON.toJSONString(mcCafePushOrderDto),null,null);