1.修改下单30天

2.//TODO 设备三个子菜单,坩埚下单，下单30天验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreOrderSuccessActivity.java

@@ -63,6 +63,7 @@ public class StoreOrderSuccessActivity extends WorkToolBarActivity {
         switch (item.getItemId()) {
             case android.R.id.home:
                 startActivity(MainActivity.class);
+                finish();
                 return true;
         }
         return super.onOptionsItemSelected(item);

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java

@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 import com.tbruyelle.rxpermissions2.RxPermissions;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
@@ -266,6 +267,28 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
                 expandInfo.put("demond5", etInput1.getText().toString());
                 expandInfo.put("comments", etInput5.getText().toString());
                 orderItems = coverProInfo(proList);
+                String stringByNow = TimeUtils.getFitTimeSpanByNow(tvTime.getText().toString(), new SimpleDateFormat("yyyy-MM-dd"), 1);
+                if (stringByNow.endsWith("天")) {
+                    String day = stringByNow.substring(0, stringByNow.length() - 1);
+                    if (Integer.valueOf(day) < 30) {
+                        QMUIDialog.MessageDialogBuilder builder = DialogUtils.okAndCancelDialog(this);
+                        builder.setTitle("提示").setMessage("交付日期小于30天，订单价格会增加").
+                                addAction("取消", new QMUIDialogAction.ActionListener() {
+                                    @Override
+                                    public void onClick(QMUIDialog dialog, int index) {
+                                        dialog.dismiss();
+                                    }
+                                })
+                                .addAction("确定", new QMUIDialogAction.ActionListener() {
+                                    @Override
+                                    public void onClick(QMUIDialog dialog, int index) {
+                                        submitOrder();
+                                        dialog.dismiss();
+                                    }
+                                }).show();
+                        return;
+                    }
+                }
                 submitOrder();
                 break;
             case R.id.rl_set: