fix(app):

1.下单修复

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -622,13 +622,13 @@ public class OrderServiceImpl implements IOrderService {
                         appOrder.setOrgCode(appSite.getOrgCode());
 
                         String date = list.get(i).split("\\|")[1];
-                        String startTime = DateUtil.format(priceRule.getStartTime(), "HH:mm:ss");
-                        String endTime = DateUtil.format(priceRule.getEndTime(), "HH:mm:ss");
+                        String startTime = DateUtil.format(priceRule.getStartTime(), "HH:mm");
+                        String endTime = DateUtil.format(priceRule.getEndTime(), "HH:mm");
                         String expireTime = date + " " + endTime;
 
                         AppOrderProInfo appOrderProInfo = new AppOrderProInfo();
                         appOrderProInfo.setProductId(list.get(i).split("\\|")[0]);
-                        appOrderProInfo.setProductName(date + " " + startTime + "-" + endTime + "|" + appSitePlace.getName());
+                        appOrderProInfo.setProductName(date.substring(5) + " " + startTime + "-" + endTime + "|" + appSitePlace.getName());
                         appOrderProInfo.setProductImage(appSitePlace.getCover());
                         appOrderProInfo.setExpireTime(expireTime);
                         appOrderProInfo.setAddress(appSite.getAddress());
@@ -674,9 +674,11 @@ public class OrderServiceImpl implements IOrderService {
 
                     for (int i = 1; i <= createOrderForm.getAmount(); i++) {
 
-                        String date = DateUtil.format(priceRule.getDateOfSale(), "yyyy-MM-dd");
-                        String startTime = DateUtil.format(priceRule.getStartTime(), "HH:mm:ss");
-                        String endTime = DateUtil.format(priceRule.getEndTime(), "HH:mm:ss");
+                        //门店的营业时间
+                        Integer indate = appSitePlace.getIndate();
+                        String date = DateUtil.format(Date.from(LocalDate.now().plusDays(indate).atStartOfDay(ZoneId.systemDefault()).toInstant()), "yyyy-MM-dd");
+                        String startTime = DateUtil.format(appSite.getStartTime(), "HH:mm");
+                        String endTime = DateUtil.format(appSite.getEndTime(), "HH:mm");
                         String expireTime = date + " " + endTime;
 
                         AppOrderProInfo appOrderProInfo = new AppOrderProInfo();