有售后单子不展示进度条

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

@@ -926,7 +926,8 @@ public class OrderServiceImpl implements Orderservice {
                     Long pickUpTime = 0L; //预计
                     Integer totalSumTime = 0;
                     String progress = "0" ; //进度
-                    if(OrderStatus.RECEIPT.getCode() == orderBean.getStatus()) {
+                    //订单状态为已接单并且无售后单展示进度条
+                    if(OrderStatus.RECEIPT.getCode() == orderBean.getStatus() && null != orderBean.getAfterSalesOrderResp()) {
                         try {
                             // 查询订单的排队人数
                             QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
@@ -943,11 +944,11 @@ public class OrderServiceImpl implements Orderservice {
                                 } else {
                                     List<String> orderCodeList = response.getOrderCodes();
                                     if (null != orderCodeList && orderCodeList.size() > 0) {
-                                        //开启制作时间 1 ：是 ， 2 ：否"
                                         JSONObject jsonObject = JSONObject.parseObject(storeResponseDto.getConfiguration());
                                         StoreResponse.Configuration configuration = jsonObject.toJavaObject(StoreResponse.Configuration.class);
                                         Integer goodsAvgTimeOfMaking = 0 == configuration.getGoodsAvgTimeOfMaking() ? 15 : configuration.getGoodsAvgTimeOfMaking();
                                         returnWords += "前方还有 " + orderCodeList.size() + " 单";
+                                        //开启制作时间 1 ：是 ， 2 ：否"
                                         if (1 != configuration.getTurnOnTimeOfMaking()) {
                                             totalSumTime = orderCodeList.size() * AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime()); //分钟
                                         } else {
@@ -957,7 +958,7 @@ public class OrderServiceImpl implements Orderservice {
                                         }
                                         pickUpTime = DateUtil.addMinutes(new Date(orderBean.getGmtAccept()), totalSumTime).getTime();
                                         Date date = new Date(pickUpTime);
-                                        returnWords += "，预计 " + date.getHours() + ":" + (String.valueOf(date.getMinutes()).length()==1 ? "0"+(String.valueOf(date.getMinutes())) : date.getMinutes()) + " 可取餐";
+                                        returnWords += "，预计 " + (String.valueOf( date.getHours()).length()==1 ? "0"+(String.valueOf( date.getHours())) :  date.getHours()) + ":" + (String.valueOf(date.getMinutes()).length()==1 ? "0"+(String.valueOf(date.getMinutes())) : date.getMinutes()) + " 可取餐";
                                         //制餐进度（当前时间-接单时间）/总时长（制餐时长）x100%
                                         BigDecimal progressB = new BigDecimal(DateUtil.diffMinute(new Date(orderBean.getGmtAccept()), new Date())).divide(new BigDecimal(totalSumTime), 2, BigDecimal.ROUND_HALF_UP);
                                         progress = progressB.compareTo(new BigDecimal(1)) == 1 ? "100" : progressB.multiply(new BigDecimal(100)).toString();