旅游下单时间修改

component_utils/src/main/java/com/rv/component/utils/DateUtils.java

@@ -931,4 +931,27 @@ public class DateUtils {
     }
 
 
+    /**
+     * 秒转时分
+     * 28800 ->  08:00
+     * @param time
+     * @return
+     */
+    public static String secToTime(long time) {
+        StringBuilder stringBuilder = new StringBuilder();
+        long hour = time / 3600;
+        long minute = time / 60 % 60;
+//        Integer second = time % 60;
+        if(hour<10){
+            stringBuilder.append("0");
+        }
+        stringBuilder.append(hour);
+        stringBuilder.append(":");
+        if(minute < 10){
+            stringBuilder.append("0");
+        }
+        stringBuilder.append(minute);
+        return stringBuilder.toString();
+    }
+
 }

module_tourism/src/main/java/com/rv/tourism/bean/BeanTourDetailData.java

@@ -235,7 +235,7 @@ public class BeanTourDetailData extends BaseBean {
             private String provinceName;//": "广东省",
             private String city;//": 441900,
             private String cityName;//": "东莞市",
-            private String departTime;//": 30600,
+            private long departTime;//": 30600,
             private String longitude;//": 113.9069685,
             private String latitude;//": 23.0056826,
             private String type;//": 0,
@@ -313,11 +313,11 @@ public class BeanTourDetailData extends BaseBean {
                 this.cityName = cityName;
             }
 
-            public String getDepartTime() {
+            public long getDepartTime() {
                 return departTime;
             }
 
-            public void setDepartTime(String departTime) {
+            public void setDepartTime(long departTime) {
                 this.departTime = departTime;
             }
 

module_tourism/src/main/java/com/rv/tourism/dialog/TravelBookingDialog.java

@@ -14,6 +14,7 @@ import android.widget.Toast;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ruiwenliu.wrapper.dialog.BaseDialog;
 import com.ruiwenliu.wrapper.util.ViewHolder;
+import com.rv.component.utils.DateUtils;
 import com.rv.component.utils.DisplayUtil;
 import com.rv.tourism.R;
 import com.rv.tourism.adapter.TravelBookingDepartureAdapter;
@@ -130,7 +131,7 @@ public class TravelBookingDialog extends BaseDialog {
                     List<BeanTourDetailData.DataBeanX.TourDepartVo> endDeparture = bean.getEndDeparture();
                     if (listener != null && bean != null && endDeparture != null && tourDepartTimeVo != null && tourDepartVo != null) {
                         BeanOrderParam beanOrderParam = new BeanOrderParam();
-                        beanOrderParam.setEndTime(tourDepartTimeVo.getEndTime());
+                        beanOrderParam.setEndTime(tourDepartTimeVo.getEndTime() + " " + DateUtils.secToTime(tourDepartVo.getDepartTime()));
                         beanOrderParam.setGoodId(bean.getId());
                         beanOrderParam.setPrice(bean.getPrice());
                         beanOrderParam.setChildPrice(bean.getChildPrice());
@@ -142,7 +143,7 @@ public class TravelBookingDialog extends BaseDialog {
 
                         beanOrderParam.setEndAddr(endDeparture.get(0).getAddress());
                         beanOrderParam.setStartAddr(tourDepartVo.getProvinceName() + tourDepartVo.getCityName() + tourDepartVo.getAddress());
-                        beanOrderParam.setStartTime(tourDepartTimeVo.getStartTime());
+                        beanOrderParam.setStartTime(tourDepartTimeVo.getStartTime() + " " + DateUtils.secToTime(tourDepartVo.getDepartTime()));
                         beanOrderParam.setStartCompanyId(tourDepartVo.getCompanyId());
                         beanOrderParam.setStartCompanyName(tourDepartVo.getName());
                         beanOrderParam.setSiteId(tourDepartVo.getId());

module_tourism/src/main/java/com/rv/tourism/other/TravelerConfirmOrderActivity.java

@@ -366,7 +366,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
 
 
         if (isInsuranceType == 1) {
-            long day = DateUtils.compareDateDay(dataBean.getEndTime(), dataBean.getStartTime());
+            long day = DateUtils.compareDateDay(DateUtils.formatDate16(dataBean.getEndTime()), DateUtils.formatDate16(dataBean.getStartTime()));
             OrderPriceDetailBean.ChildrenBean childrenBean3 = new OrderPriceDetailBean.ChildrenBean();
             childrenBean3.setKey("保险费用");
             childrenBean3.setDetail("¥" + info.getData().getInsurePrice() + "/人 *" + (adultNum + childNum) + "人 *" + day + "天");
@@ -545,8 +545,8 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             idList.add(bean.getId());
         }
         String ids = idList.toString().replace("[", "").replace("]", "");
-        String endTime = "" + DateUtil.getDateByYYYYMMDD_java(dataBean.getEndTime());
-        String startTime = "" + DateUtil.getDateByYYYYMMDD_java(dataBean.getStartTime());
+        String endTime = "" + DateUtils.StringToTimeMillis2(dataBean.getEndTime());
+        String startTime = "" + DateUtils.StringToTimeMillis2(dataBean.getStartTime());
         String couponIds = couponIdList.toString().replace("[", "").replace("]", "").replaceAll(" ", "");
 
         Map<String, Object> headMap = new LinkedHashMap<>();