wuheng 2 gadi atpakaļ
vecāks
revīzija
81524920a4

+ 25 - 0
travel/admin/src/main/java/com/lc/admin/controller/AddressController.java

@@ -0,0 +1,25 @@
+package com.lc.admin.controller;
+
+import com.cl.mbg.mapper.TAddressMapper;
+import com.cl.mbg.model.TAddress;
+import com.lc.common.utils.Result;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/address")
+public class AddressController {
+
+    @Resource
+    TAddressMapper addressMapper;
+
+    @RequestMapping("/findAllMaps.do")
+    public Result findAllMaps(){
+        List<TAddress> tAddresses = addressMapper.selectByExample(null);
+        return Result.data(tAddresses);
+    }
+
+}

+ 9 - 3
travel/admin/src/main/java/com/lc/admin/controller/OrdersettingController.java

@@ -1,11 +1,10 @@
 package com.lc.admin.controller;
 
 import com.cl.mbg.model.TOrdersetting;
+import com.lc.common.pojo.OrderSettingParams;
 import com.lc.common.utils.Result;
 import com.lc.service.OrderSettingService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -37,4 +36,11 @@ public class OrdersettingController {
         return Result.data(orderSettingByMonth);
     }
 
+    @PostMapping("/setOrderSettingByDate.do")
+    public Result setOrderSettingByDate(@RequestBody OrderSettingParams orderSettingParams){
+
+        int i = orderSettingService.setOrderSettingByDate(orderSettingParams);
+        return Result.ok();
+    }
+
 }

+ 10 - 0
travel/admin/src/main/java/com/lc/admin/controller/StaticController.java

@@ -30,4 +30,14 @@ public class StaticController {
     public String ordersetting(){
         return "ordersetting";
     }
+
+    @RequestMapping("/address.html")
+    public String address(){
+        return "address";
+    }
+
+    @RequestMapping("/map.html")
+    public String map(){
+        return "map";
+    }
 }

+ 1 - 1
travel/admin/src/main/resources/templates/address.html

@@ -17,7 +17,7 @@
     <script src="/static/js/vue.js"></script>
     <script src="/static/plugins/elementui/index.js"></script>
     <script src="/static/js/axios-0.18.0.js"></script>
-		http://api.map.baidu.com/api?v=3.0&ak=GHbWVzGt3og7kLSYybjhQcI2Q2pyvuml"></script>
+	<script	src="http://api.map.baidu.com/api?v=3.0&ak=GHbWVzGt3og7kLSYybjhQcI2Q2pyvuml"></script>
     
     <style>
         .datatable {

+ 2 - 1
travel/admin/src/main/resources/templates/ordersetting.html

@@ -86,7 +86,7 @@
                                             <span class="datenumber">{{ dayobject.day.getDate()}}</span>
 																						<template>
                                                 <template v-for="obj in leftobj">
-                                                    <template v-if="obj.date == dayobject.day.getDate()">
+                                                    <template v-if="obj.orderdate == dayobject.day.getDate()">
                                                         <template v-if="obj.number > obj.reservations">
                                                             <div class="usual">
                                                                 <p>可预约{{obj.number}}人</p>
@@ -218,6 +218,7 @@
 										if(res.data.flag){
 											//赋值
 											this.leftobj = res.data.data
+                                            console.log(this.leftobj )
 											//提示
 											this.$message.success(res.data.message)
 										}

+ 11 - 0
travel/common/src/main/java/com/lc/common/pojo/OrderSettingParams.java

@@ -0,0 +1,11 @@
+package com.lc.common.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OrderSettingParams {
+    private int number;
+    private Date orderDate;
+}

+ 3 - 0
travel/mbg/src/main/java/com/cl/mbg/model/TOrdersetting.java

@@ -1,5 +1,7 @@
 package com.cl.mbg.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -11,6 +13,7 @@ public class TOrdersetting implements Serializable {
      *
      * @mbg.generated
      */
+    @JsonFormat(pattern = "dd", timezone="GMT+8")
     private Date orderdate;
 
     /**

+ 3 - 0
travel/service/src/main/java/com/lc/service/OrderSettingService.java

@@ -1,6 +1,7 @@
 package com.lc.service;
 
 import com.cl.mbg.model.TOrdersetting;
+import com.lc.common.pojo.OrderSettingParams;
 
 import java.io.InputStream;
 import java.util.Date;
@@ -11,4 +12,6 @@ public interface OrderSettingService {
     Boolean importExcelOrderSetting(InputStream inputStream);
 
     List<TOrdersetting> getOrderSettingByMonth(Date parse);
+
+    int setOrderSettingByDate(OrderSettingParams orderSettingParams);
 }

+ 28 - 0
travel/service/src/main/java/com/lc/service/impl/OrderSettingServiceImpl.java

@@ -3,7 +3,9 @@ package com.lc.service.impl;
 import com.cl.mbg.mapper.TOrdersettingMapper;
 import com.cl.mbg.model.TOrdersetting;
 import com.cl.mbg.model.TOrdersettingExample;
+import com.lc.common.pojo.OrderSettingParams;
 import com.lc.service.OrderSettingService;
+import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -80,6 +82,10 @@ public class OrderSettingServiceImpl implements OrderSettingService {
                             break;
                     }
                 }
+                TOrdersettingExample tOrdersettingExample = new TOrdersettingExample();
+                TOrdersettingExample.Criteria criteria = tOrdersettingExample.createCriteria();
+                criteria.andOrderdateEqualTo( tOrdersetting.getOrderdate() );
+                ordersettingMapper.deleteByExample(tOrdersettingExample);
                 ordersettingMapper.insert(tOrdersetting);
             }
         } catch (IOException e) {
@@ -99,4 +105,26 @@ public class OrderSettingServiceImpl implements OrderSettingService {
         List<TOrdersetting> tOrdersettings = ordersettingMapper.selectByExample(tOrdersettingExample);
         return tOrdersettings;
     }
+
+    @Override
+    public int setOrderSettingByDate(OrderSettingParams orderSettingParams) {
+        TOrdersetting tOrdersetting = new TOrdersetting();
+        tOrdersetting.setOrderdate( orderSettingParams.getOrderDate() );
+        tOrdersetting.setNumber( orderSettingParams.getNumber() );
+        TOrdersettingExample tOrdersettingExample = new TOrdersettingExample();
+        TOrdersettingExample.Criteria criteria = tOrdersettingExample.createCriteria();
+        criteria.andOrderdateEqualTo(orderSettingParams.getOrderDate());
+        int i = 0;
+        long l = ordersettingMapper.countByExample(tOrdersettingExample);
+        if ( l > 0 ) {
+            i = ordersettingMapper.updateByExampleSelective(
+                    tOrdersetting,
+                    tOrdersettingExample
+            );
+        } else {
+            tOrdersetting.setReservations(0);
+            i  = ordersettingMapper.insert(tOrdersetting);
+        }
+        return i;
+    }
 }