Merge remote-tracking branch 'remotes/origin/feature/20210927-v2048-拒绝退款文案展示' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1799,6 +1799,10 @@ public class OrderAdapter {
                 if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setAgreeRefundDesc(orderViewStatusDto, orderBean);
                 }
+                //拒绝退款
+                if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                    orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
+                }
             }
             if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
@@ -1823,6 +1827,10 @@ public class OrderAdapter {
                 if (refundBean != null && RefundStatus.ALREADY_REFUND.getCode().equals(refundBean.getStatus())) {
                     setAgreeRefundDesc(orderViewStatusDto, orderBean);
                 }
+                //拒绝退款
+                if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                    orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
+                }
             }
             if (OrderStatus.COMPLETE_MAKE.getCode().equals(orderBean.getStatus())) {
                 if (refundBean == null) {
@@ -1846,6 +1854,10 @@ public class OrderAdapter {
                 if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
                     setAgreeRefundDesc(orderViewStatusDto, orderBean);
                 }
+                //拒绝退款
+                if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                    orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
+                }
             }
         }
         if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
@@ -1929,6 +1941,10 @@ public class OrderAdapter {
                     if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
                         setAgreeRefundDesc(orderViewStatusDto, orderBean);
                     }
+                    //拒绝退款
+                    if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                        orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
+                    }
                 }
                 if (OrderStatus.RECEIPT.getCode().equals(orderBean.getStatus())) {
                     if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
@@ -1960,6 +1976,10 @@ public class OrderAdapter {
                     if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
                         setAgreeRefundDesc(orderViewStatusDto, orderBean);
                     }
+                    //拒绝退款
+                    if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                        orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
+                    }
                 }
                 if (OrderStatus.COMPLETE_MAKE.getCode().equals(orderBean.getStatus())) {
                     if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
@@ -1988,6 +2008,10 @@ public class OrderAdapter {
                     if (refundBean != null && RefundStatus.AGREE_REFUND.getCode().equals(refundBean.getStatus())) {
                         setAgreeRefundDesc(orderViewStatusDto, orderBean);
                     }
+                    //拒绝退款
+                    if (refundBean != null && RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
+                        orderViewStatusDto.setRefundStatusText("如有疑问可致电商家沟通确认");
+                    }
                 }
                 //TODO 判断配送中的逻辑 如果是有第三方配送，要查询第三方配送信息，显示骑手信息 如果有骑手信息 显示 联系骑手
                 if (OrderStatus.DISTRIBUTION.getCode().equals(orderBean.getStatus())) {

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

@@ -2647,6 +2647,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();
             for(int i=1;;i++) {
                 OrderConditionsReq orderConditionsReq = new OrderConditionsReq();
                 orderConditionsReq.setPartnerId(mcCafePartnerId);
@@ -2663,12 +2664,26 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 }
                 BaseDownLoadResponse<List<OrderInfoReqs>> response = orderDownLoadSdkService.queryOrderByConditions(orderConditionsReq, LogThreadLocal.getTrackingNo());
                 AppLogUtil.infoLog("queryOrderByConditions："+ JSON.toJSONString(response),null,null);
-                if(CollectionUtils.isEmpty(response.getResult())) {
+                if("50002".equals(response.getCode())) {
+                    AppLogUtil.infoLog("麦咖啡重置退单查询:  重置前：  "+i+"   "+JSON.toJSONString(queryOrderVo),null,null);
+                    i=1;
+                    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);
+                    break;
+                }
+                if(ResponseConstant.SUCCESS_RESPONSE_CODE_STR.equals(response.getCode()) && CollectionUtils.isEmpty(response.getResult())) {
+                    AppLogUtil.infoLog("麦咖啡历史订单查询结束: "+JSON.toJSONString(queryOrderVo),null,null);
                     break;
                 }
                 RestTemplate client = new RestTemplate();
                 for(OrderInfoReqs orderInfoReqs : response.getResult()) {
                     try {
+                        if(Long.valueOf(orderInfoReqs.getCreateTime()) > lastCreateTime) {
+                            lastCreateTime = Long.valueOf(orderInfoReqs.getCreateTime());
+                        }
                         McCafePushOrderDto mcCafePushOrderDto = convert2McCafePushOrderInfo(orderInfoReqs);
                         AppLogUtil.infoLog("订单推送入参: "+JSON.toJSONString(mcCafePushOrderDto),null,null);
 
@@ -2730,6 +2745,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
                 }
             }
+
+            AppLogUtil.infoLog("麦咖啡历史订单推送完成: "+JSON.toJSONString(queryOrderVo),null,null);
+
         });
 
         BaseResponse baseResponse = new BaseResponse();