益禾堂添加排队号

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

@@ -924,7 +924,7 @@ public class OrderServiceImpl implements Orderservice {
                     Integer productSum = 0; //件数
                     Long pickUpTime = 0L; //预计
                     Integer totalSumTime = 0;
-                    String progress = "" ; //进度
+                    String progress = "0" ; //进度
                     try {
                         // 查询订单的排队人数
                         QueryLineUpOrderReq queryLineUpOrderReq = new QueryLineUpOrderReq();
@@ -946,23 +946,24 @@ public class OrderServiceImpl implements Orderservice {
                                 Integer goodsAvgTimeOfMaking = 0 == configuration.getGoodsAvgTimeOfMaking() ? 15 : configuration.getGoodsAvgTimeOfMaking();
                                 returnWords += "前方还有 " + orderCodeList.size() + " 单";
                                 if (1 != configuration.getTurnOnTimeOfMaking()) {
-                                    totalSumTime = orderCodeList.size() * Integer.valueOf(configuration.getAutoSelfmentionMakerWorkflowFinishTime()) * 60; //秒
+                                    totalSumTime = orderCodeList.size() * Integer.valueOf(configuration.getAutoSelfmentionMakerWorkflowFinishTime()); //分钟
                                 } else {
-                                    returnWords += " / " + productSum + " 件";
                                     productSum = orderCodeList.stream().mapToInt(product -> Integer.parseInt(product.split("-")[1])).sum();
-                                    totalSumTime = productSum * goodsAvgTimeOfMaking * 60; //秒
+                                    totalSumTime = productSum * goodsAvgTimeOfMaking;
+                                    returnWords += " / " + productSum + " 件";
                                 }
-                                pickUpTime = orderBean.getGmtAccept() + Long.valueOf(totalSumTime) * 1000;
+                                pickUpTime = DateUtil.addMinutes(new Date(orderBean.getGmtAccept()),totalSumTime).getTime();
                                 Date date = new Date(pickUpTime);
                                 returnWords += "，预计 " + date.getHours() + ":" + date.getMinutes() + " 可取餐";
-                                //制餐时间（当前时间-接单时间）/总时长（制餐时长）x100%
-                                progress = String.valueOf((new Date().getTime() - orderBean.getGmtAccept()) / pickUpTime + 1);
+                                //制餐进度（当前时间-接单时间）/总时长（制餐时长）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();
                             }
                         }
                     }catch (Exception e){
                         log.error("get returnWords error {}",e.getMessage());
                     }
-                    orderBean.setProgress(progress);
+                    orderBean.setProgress(String.valueOf(progress));
                     orderBean.setReturnWords(returnWords);
 
                     //以下代码为老代码，不确定还在不在用，就留着了