From 1c54eaff29286f42dcc175f4e6ea6488b908cdbe Mon Sep 17 00:00:00 2001
From: EhusoeAsom <3252074067@qq.com>
Date: Mon, 22 Apr 2024 19:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B6=E8=97=8F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect.sql                                   |  31 +
 elmclient/src/router/index.js                 |   6 +
 elmclient/src/views/BusinessInfo.vue          |  63 +-
 elmclient/src/views/CollectList.vue           | 189 +++++
 elmclient/src/views/My.vue                    | 646 +++++++++---------
 springcloud_elm/.idea/compiler.xml            |   5 +-
 springcloud_elm/.idea/encodings.xml           |   2 +
 .../collect_server_10800.xml                  |  16 +
 springcloud_elm/.idea/sqldialects.xml         |   1 -
 springcloud_elm/collect_server_10800/pom.xml  |  69 ++
 .../main/java/com/neusoft/MyApplication.java  |  15 +
 .../neusoft/controller/CollectController.java |  59 ++
 .../com/neusoft/mapper/CollectMapper.java     |  28 +
 .../main/java/com/neusoft/po/Business.java    |  96 +++
 .../src/main/java/com/neusoft/po/Collect.java |  46 ++
 .../java/com/neusoft/po/CommonResult.java     |  45 ++
 .../com/neusoft/service/CollectService.java   |  22 +
 .../service/impl/CollectServiceImpl.java      |  39 ++
 .../src/main/resources/bootstrap.yml          |  19 +
 .../main/resources/mapper/CollectMapper.xml   |  18 +
 .../target/classes/bootstrap.yml              |  19 +
 .../target/classes/mapper/CollectMapper.xml   |  18 +
 .../src/main/resources/application.yml        |   6 +
 .../target/classes/application.yml            |   6 +
 .../orders_server_10600/.classpath            |  57 ++
 springcloud_elm/orders_server_10600/.project  |  28 +
 .../org.eclipse.core.resources.prefs          |   4 +
 .../.settings/org.eclipse.jdt.apt.core.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      |   9 +
 .../org.springframework.ide.eclipse.prefs     |   2 +
 .../neusoft/controller/OrdersController.java  |   6 +-
 .../orders_server_10601/.classpath            |  57 ++
 springcloud_elm/orders_server_10601/.project  |  28 +
 .../org.eclipse.core.resources.prefs          |   4 +
 .../.settings/org.eclipse.jdt.apt.core.prefs  |   2 +
 .../.settings/org.eclipse.jdt.core.prefs      |   9 +
 .../org.springframework.ide.eclipse.prefs     |   2 +
 springcloud_elm/pom.xml                       |   1 +
 .../service/impl/SearchServiceImpl.java       |   4 +-
 39 files changed, 1351 insertions(+), 328 deletions(-)
 create mode 100644 collect.sql
 create mode 100644 elmclient/src/views/CollectList.vue
 create mode 100644 springcloud_elm/.idea/runConfigurations/collect_server_10800.xml
 create mode 100644 springcloud_elm/collect_server_10800/pom.xml
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java
 create mode 100644 springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml
 create mode 100644 springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml
 create mode 100644 springcloud_elm/collect_server_10800/target/classes/bootstrap.yml
 create mode 100644 springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml
 create mode 100644 springcloud_elm/orders_server_10600/.classpath
 create mode 100644 springcloud_elm/orders_server_10600/.project
 create mode 100644 springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs
 create mode 100644 springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs
 create mode 100644 springcloud_elm/orders_server_10601/.classpath
 create mode 100644 springcloud_elm/orders_server_10601/.project
 create mode 100644 springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs
 create mode 100644 springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs
 create mode 100644 springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs

diff --git a/collect.sql b/collect.sql
new file mode 100644
index 0000000..f505284
--- /dev/null
+++ b/collect.sql
@@ -0,0 +1,31 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 本机MySQL
+ Source Server Type    : MySQL
+ Source Server Version : 80034 (8.0.34)
+ Source Host           : localhost:3306
+ Source Schema         : elm
+
+ Target Server Type    : MySQL
+ Target Server Version : 80034 (8.0.34)
+ File Encoding         : 65001
+
+ Date: 22/04/2024 14:40:21
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for collect
+-- ----------------------------
+DROP TABLE IF EXISTS `collect`;
+CREATE TABLE `collect`  (
+  `collectId` int NOT NULL AUTO_INCREMENT,
+  `businessId` int NULL DEFAULT NULL,
+  `userId` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
+  PRIMARY KEY (`collectId`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb3 COLLATE = utf8mb3_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/elmclient/src/router/index.js b/elmclient/src/router/index.js
index 2451912..5c3b54a 100644
--- a/elmclient/src/router/index.js
+++ b/elmclient/src/router/index.js
@@ -21,6 +21,7 @@ import SearchResults from "../views/SearchResults";
 import PointStore from '../views/PointStore.vue';
 import CouponDetails from '../views/CouponDetails.vue';
 import CouponSelect from '../views/CouponSelect.vue';
+import CollectList from '../views/CollectList.vue'
 
 
 const routes = [{
@@ -104,6 +105,11 @@ const routes = [{
 		path: '/CouponSelect',
 		name: 'CouponSelect',
 		component: CouponSelect
+	},
+	{
+		path: '/collectList',
+		name: 'CollectList',
+		component: CollectList
 	}
 ];
 
diff --git a/elmclient/src/views/BusinessInfo.vue b/elmclient/src/views/BusinessInfo.vue
index 860ab0e..60ea72f 100644
--- a/elmclient/src/views/BusinessInfo.vue
+++ b/elmclient/src/views/BusinessInfo.vue
@@ -17,6 +17,13 @@
 			<p>&#165;{{business.starPrice}}起送 &#165;{{business.deliveryPrice}}配送</p>
 			<p>{{business.businessExplain}}</p>
 		</div>
+    <!-- 添加收藏按钮 -->
+    <div v-if="this.isCollected" @click="toggleCollect(business)" class="collect-button0">
+      取消收藏
+    </div>
+    <div v-if="!this.isCollected" @click="toggleCollect(business)" class="collect-button1">
+      收藏
+    </div>
 
 		<!-- 食品列表部分 -->
 		<ul class="food">
@@ -84,7 +91,8 @@
 				longPress: false,
 				pressTimer: null,
 				interval: 200,
-				clickTimeouts: [] // 用于存储每个按钮的定时器
+				clickTimeouts: [], // 用于存储每个按钮的定时器
+        isCollected: false
 			}
 		},
 		created() {
@@ -104,11 +112,26 @@
 			}).catch(error => {
 				console.error(error);
 			});
+      this.listCollect()
 		},
 		methods: {
 			back() {
 				this.$router.go(-1);
 			},
+      async listCollect() {
+        let url = `CollectController/listCollect/${this.user.userId}`
+        await this.$axios.get(url).then(response => {
+          this.collectList = response.data.result;
+        }).catch(error => {
+          console.error(error);
+        });
+        for(let i of this.collectList){
+          if(`${i.businessId}`===this.businessId){
+            this.isCollected=true
+            break
+          }
+        }
+      },
 			listCart() {
         let url=`CartController/listCart/${this.user.userId}/${this.businessId}`
 				this.$axios.get(url).then(response => {
@@ -214,7 +237,18 @@
 						businessId: this.business.businessId
 					}
 				});
-			}
+			},
+      toggleCollect(business) {
+        this.isCollected = !this.isCollected; // 切换收藏状态
+        let method = this.isCollected ? 'post' : 'delete';
+        let url = `CollectController/${method === 'post' ? 'add' : 'delete'}Collect/${this.user.userId}/${this.businessId}`;
+        this.$axios({
+          method: method,
+          url: url
+        }).then().catch(error => {
+          console.error(error);
+        });
+      }
 		},
 		computed: {
 			//食品总价格
@@ -317,6 +351,31 @@
 		margin-top: 1.2vw;
 	}
 
+  /****************收藏按钮***************/
+  .wrapper .collect-button0 {
+    position: fixed;
+    font-size: 3vw;
+    color: white;
+    background-color: gray;
+    align-items: center;
+    justify-content: center;
+    padding: 1vw;
+    right: 0;
+    top: 13vw;
+  }
+
+  .wrapper .collect-button1 {
+    position: fixed;
+    font-size: 3vw;
+    color: white;
+    background-color: #01B0F2;
+    align-items: center;
+    justify-content: center;
+    padding: 1vw;
+    right: 0;
+    top: 13vw;
+  }
+
 	/****************食品信息部分***************/
 	.wrapper .food {
 		width: 100%;
diff --git a/elmclient/src/views/CollectList.vue b/elmclient/src/views/CollectList.vue
new file mode 100644
index 0000000..949840e
--- /dev/null
+++ b/elmclient/src/views/CollectList.vue
@@ -0,0 +1,189 @@
+<template>
+  <div class="wrapper">
+
+    <!-- header部分 -->
+    <header>
+      <i class="fa fa-angle-left" @click="back"></i>
+      <p>我的收藏</p>
+
+    </header>
+    <!-- 收藏列表 -->
+    <ul class="business">
+      <li v-for="item in businessArr" @click="toBusinessInfo(item.businessId)">
+        <div class="border">
+          <div class="business-img">
+            <img :src="item.businessImg">
+          </div>
+          <div class="business-info">
+            <h3>{{item.businessName}}</h3>
+            <p>&#165;{{item.starPrice}}起送 | &#165;{{item.deliveryPrice}}配送</p>
+            <p>{{item.businessExplain}}</p>
+          </div>
+        </div>
+      </li>
+
+    </ul>
+    <Footer></Footer>
+  </div>
+</template>
+
+<script>
+import Footer from "../components/Footer.vue";
+export default {
+  name: 'CollectList',
+  data() {
+    return {
+      collectList: [],
+      businessArr: [],
+      user: {}
+    }
+  },
+  created() {
+    this.user = this.$getSessionStorage('user');
+
+    this.listCollect();
+  },
+  components: {
+    Footer
+  },
+  methods: {
+    back() {
+      this.$router.go(-1);
+    },
+    async listCollect() {
+      let url = `CollectController/listCollect/${this.user.userId}`
+      await this.$axios.get(url).then(response => {
+        this.collectList = response.data.result;
+      }).catch(error => {
+        console.error(error);
+      });
+      this.listBusinesses()
+    },
+    listBusinesses(){
+      for(let collect of this.collectList){
+        let url=`BusinessController/getBusinessById/${collect.businessId}`
+        this.$axios.get(url).then(response => {
+          this.businessArr.push(response.data.result);
+        }).catch(error => {
+          console.error(error);
+        });
+      }
+    },
+    toBusinessInfo(businessId) {
+      this.$router.push({
+        path: '/businessInfo',
+        query: {
+          businessId: businessId
+        }
+      });
+    }
+  }
+}
+</script>
+
+<style scoped>
+/****************总容器***************/
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
+
+/****************header部分***************/
+.wrapper header {
+  width: 100%;
+  height: 12vw;
+  background-color: #01B0F2;
+  font-size: 4.8vw;
+  color: #fff;
+
+  z-index: 10;
+
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+
+  position: fixed;
+  left: 0;
+  top: 0;
+}
+
+.wrapper header i {
+  margin: 0vw 0vw 0vw 3vw;
+  font-size: 6vw;
+  user-select: none;
+  cursor: pointer;
+}
+
+.wrapper header p {
+  margin: 0vw 0vw 0vw 33.5vw;
+}
+
+/****************商家列表部分***************/
+.wrapper .business {
+  width: 100%;
+  margin-top: 12vw;
+  padding-bottom: 14vw;
+}
+
+.wrapper .business li {
+  width: 100%;
+  padding: 2vw 2vw 0vw 2vw;
+  background-color: #F4F8Fb;
+  box-sizing: border-box;
+}
+
+.wrapper .business li .border {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 2vw;
+  user-select: none;
+  background-color: #fff;
+  cursor: pointer;
+  border-radius: 2vw;
+
+  display: flex;
+  align-items: center;
+}
+
+.wrapper .business li .border .business-img {
+  position: relative;
+}
+
+.wrapper .business li .border .business-img img {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 2vw;
+}
+
+.wrapper .business li .border .business-img .business-img-quantity {
+  width: 5vw;
+  height: 5vw;
+  background-color: red;
+  color: #fff;
+  font-size: 3.6vw;
+  border-radius: 2.5vw;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  position: absolute;
+  right: -1.5vw;
+  top: -1.5vw;
+}
+
+.wrapper .business li .border .business-info {
+  margin-left: 3vw;
+}
+
+.wrapper .business li .border .business-info h3 {
+  font-size: 3.8vw;
+  color: #555;
+}
+
+.wrapper .business li .border .business-info p {
+  font-size: 3vw;
+  color: #888;
+  margin-top: 2vw;
+}
+</style>
\ No newline at end of file
diff --git a/elmclient/src/views/My.vue b/elmclient/src/views/My.vue
index 10bc7a5..c46bf7a 100644
--- a/elmclient/src/views/My.vue
+++ b/elmclient/src/views/My.vue
@@ -1,72 +1,72 @@
 <template>
-	<div class="wrapper">
+  <div class="wrapper">
 
-		<!------header部分------>
-		<div class="header">
-			<img src="../assets/img/头像.png" v-show="!islogin">
-			<div v-show="islogin">
-				<div v-if="user">
-					<!-- 在这里使用 user 对象的属性 -->
-					<img :src="this.user.userImg" />
-				</div>
+    <!------header部分------>
+    <div class="header">
+      <img src="../assets/img/头像.png" v-show="!islogin">
+      <div v-show="islogin">
+        <div v-if="user">
+          <!-- 在这里使用 user 对象的属性 -->
+          <img :src="this.user.userImg"/>
+        </div>
 
-			</div>
-			<div class="login">
-				<div class="box" v-show="!islogin">
-					<div class="line">
-						<h2 @click="tologin">登录</h2>
-						<h2>/</h2>
-						<h2 @click="toregister">注册</h2>
-					</div>
-				</div>
-				<div class="box" v-show="islogin">
-					<div v-if="user">
-						<!-- 在这里使用 user 对象的属性 -->
-						<h2 style="font-size: 4.5vw;">{{this.user.userName}}</h2>
-					</div>
-					<div class="line">
-						<p>我的关注</p>
-						<p @click="toaddress()">收货地址</p>
-					</div>
-				</div>
-			</div>
+      </div>
+      <div class="login">
+        <div class="box" v-show="!islogin">
+          <div class="line">
+            <h2 @click="tologin">登录</h2>
+            <h2>/</h2>
+            <h2 @click="toregister">注册</h2>
+          </div>
+        </div>
+        <div class="box" v-show="islogin">
+          <div v-if="user">
+            <!-- 在这里使用 user 对象的属性 -->
+            <h2 style="font-size: 4.5vw;">{{ this.user.userName }}</h2>
+          </div>
+          <div class="line">
+            <p>我的关注</p>
+            <p @click="toaddress()">收货地址</p>
+          </div>
+        </div>
+      </div>
 
-			<div class="reset">
-				<img src="../assets/img/设置.png" />
-			</div>
-		</div>
+      <div class="reset">
+        <img src="../assets/img/设置.png"/>
+      </div>
+    </div>
 
-		<!------吃货豆部分------>
-		<div class="bean">
-			<img src="../assets/img/皇冠.png" />
-			<div class="info">
-				<h2>白银会员</h2>
-				<p></p>
-			</div>
-			<div class="raise">
-				<button>立即升级 &#62;</button>
-			</div>
-		</div>
+    <!------吃货豆部分------>
+    <div class="bean">
+      <img src="../assets/img/皇冠.png"/>
+      <div class="info">
+        <h2>白银会员</h2>
+        <p></p>
+      </div>
+      <div class="raise">
+        <button>立即升级 &#62;</button>
+      </div>
+    </div>
 
-		<!------详细列表部分------>
-		<ul class="information">
+    <!------详细列表部分------>
+    <ul class="information">
 
-			<div class="money">
-				<li>
-					<div class="savemoney" @click="toPointsdetails">
-						<img src="../assets/img/积分商城.png">
-						<p>积分明细</p>
-						<span>&#62;</span>
-					</div>
-				</li>
+      <div class="money">
+        <li>
+          <div class="savemoney" @click="toPointsdetails">
+            <img src="../assets/img/积分商城.png">
+            <p>积分明细</p>
+            <span>&#62;</span>
+          </div>
+        </li>
 
-				<li>
-					<div class="red" @click="toWallet">
-						<img src="../assets/img/红包.png">
-						<p>我的钱包</p>
-						<span>&#62;</span>
-					</div>
-				</li>
+        <li>
+          <div class="red" @click="toWallet">
+            <img src="../assets/img/红包.png">
+            <p>我的钱包</p>
+            <span>&#62;</span>
+          </div>
+        </li>
         <!-- 积分商城，积分系统新增部分 -->
         <li>
           <div class="red" @click="toPointStore">
@@ -83,309 +83,315 @@
             <span>&#62;</span>
           </div>
         </li>
-			</div>
+      </div>
 
-			<li @click="toaddress()">
-				<div class="address">
-					<img src="../assets/img/收货地址.png">
-					<p>收货地址</p>
-					<span>&#62;</span>
-				</div>
-			</li>
+      <li @click="toaddress()">
+        <div class="address">
+          <img src="../assets/img/收货地址.png">
+          <p>收货地址</p>
+          <span>&#62;</span>
+        </div>
+      </li>
 
-			<li>
-				<div class="favourite">
-					<img src="../assets/img/爱心.png">
-					<p>我的收藏</p>
-					<span>&#62;</span>
-				</div>
-			</li>
+      <li @click="toCollect()">
+        <div class="favourite">
+          <img src="../assets/img/爱心.png">
+          <p>我的收藏</p>
+          <span>&#62;</span>
+        </div>
+      </li>
 
-			<div class="cooperate">
-				<li>
-					<div class="judgement">
-						<img src="../assets/img/点赞.png">
-						<p>欢迎评分</p>
-						<span>&#62;</span>
-					</div>
-				</li>
+      <div class="cooperate">
+        <li>
+          <div class="judgement">
+            <img src="../assets/img/点赞.png">
+            <p>欢迎评分</p>
+            <span>&#62;</span>
+          </div>
+        </li>
 
-				<li>
-					<div class="onlinehelp">
-						<img src="../assets/img/客服.png">
-						<p>线上客服</p>
-						<span>&#62;</span>
-					</div>
-				</li>
+        <li>
+          <div class="onlinehelp">
+            <img src="../assets/img/客服.png">
+            <p>线上客服</p>
+            <span>&#62;</span>
+          </div>
+        </li>
 
-				<li>
-					<div class="onlinehelp">
-						<img src="../assets/img/握手.png">
-						<p>加盟合作</p>
-						<span>&#62;</span>
-					</div>
-				</li>
+        <li>
+          <div class="onlinehelp">
+            <img src="../assets/img/握手.png">
+            <p>加盟合作</p>
+            <span>&#62;</span>
+          </div>
+        </li>
 
-			</div>
+      </div>
 
-		</ul>
+    </ul>
 
-		<div class="quit">
-			<p @click="toquit()">退出当前账号</p>
-		</div>
+    <div class="quit">
+      <p @click="toquit()">退出当前账号</p>
+    </div>
 
-		<Footer></Footer>
-	</div>
+    <Footer></Footer>
+  </div>
 </template>
 
 <script>
-	import Footer from '../components/Footer.vue';
-	export default {
-		name: 'My',
-		data() {
-			return {
-				user: {},
-				islogin: false
-			}
-		},
-		components: {
-			Footer
-		},
-		created() {
-			this.user = this.$getSessionStorage('user');
-			if (this.user != null) {
-				this.islogin = true;
-			}
-		},
-		methods: {
-			tologin() {
-				this.$router.push({
-					path: '/login'
-				});
-			},
-			toregister() {
-				this.$router.push({
-					path: '/register'
-				});
-			},
-			toPointsdetails() {
-				this.$router.push({
-					path: '/pointsDetails'
-				});
-			},
-			toWallet() {
-				this.$router.push({
-					path: '/wallet'
-				});
-			},
-			toquit() {
-				this.$removeSessionStorage('user');
-				this.user = null;
-				this.islogin = false;
-				window.location.reload();
-				// 可以添加其他清理逻辑或导航到适当的位置
-			},
-			toaddress() {
-				this.$router.push({
-					path: '/userAddress'
-				});
-			},
-      // 积分系统新增部分
-      toPointStore(){
-        console.log("to Point Store");
-        this.$router.push({
-          path: '/PointStore'
-        });
-      },
-      toCouponDetails()
-      {
-        this.$router.push(
-            {
-              path:'/CouponDetails'
-            }
-        );
-      }
-		}
-	};
+import Footer from '../components/Footer.vue';
+
+export default {
+  name: 'My',
+  data() {
+    return {
+      user: {},
+      islogin: false
+    }
+  },
+  components: {
+    Footer
+  },
+  created() {
+    this.user = this.$getSessionStorage('user');
+    if (this.user != null) {
+      this.islogin = true;
+    }
+  },
+  methods: {
+    tologin() {
+      this.$router.push({
+        path: '/login'
+      });
+    },
+    toregister() {
+      this.$router.push({
+        path: '/register'
+      });
+    },
+    toPointsdetails() {
+      this.$router.push({
+        path: '/pointsDetails'
+      });
+    },
+    toWallet() {
+      this.$router.push({
+        path: '/wallet'
+      });
+    },
+    toquit() {
+      this.$removeSessionStorage('user');
+      this.user = null;
+      this.islogin = false;
+      window.location.reload();
+      // 可以添加其他清理逻辑或导航到适当的位置
+    },
+    toaddress() {
+      this.$router.push({
+        path: '/userAddress'
+      });
+    },
+    // 积分系统新增部分
+    toPointStore() {
+      console.log("to Point Store");
+      this.$router.push({
+        path: '/PointStore'
+      });
+    },
+    toCouponDetails() {
+      this.$router.push(
+          {
+            path: '/CouponDetails'
+          }
+      );
+    },
+    //收藏部分
+    toCollect() {
+      this.$router.push({
+        path: '/CollectList'
+      });
+    }
+  }
+};
 </script>
 
 <style scoped>
-	/****************** 总容器 ******************/
-	.wrapper {
-		width: 100%;
-		height: 100%;
-	}
+/****************** 总容器 ******************/
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
 
-	/******************头部******************/
-	.wrapper .header {
-		width: 100%;
-		height: 25vw;
-		background-color: #01B0F2;
+/******************头部******************/
+.wrapper .header {
+  width: 100%;
+  height: 25vw;
+  background-color: #01B0F2;
 
-		display: flex;
-		align-items: center;
+  display: flex;
+  align-items: center;
 
-		border-radius: 0 0 3vw 3vw;
-	}
+  border-radius: 0 0 3vw 3vw;
+}
 
-	.wrapper .header img {
-		width: 15vw;
-		height: 15vw;
-		border-radius: 50%;
-		margin-left: 8vw;
-	}
+.wrapper .header img {
+  width: 15vw;
+  height: 15vw;
+  border-radius: 50%;
+  margin-left: 8vw;
+}
 
-	.wrapper .header .login {
-		display: flex;
-		margin-bottom: 2vw;
+.wrapper .header .login {
+  display: flex;
+  margin-bottom: 2vw;
 
-		flex-direction: column;
-	}
+  flex-direction: column;
+}
 
-	.wrapper .header .login .box {
-		display: flex;
-		flex-direction: column;
-	}
+.wrapper .header .login .box {
+  display: flex;
+  flex-direction: column;
+}
 
-	.wrapper .header .login .box .line {
-		display: flex;
-	}
+.wrapper .header .login .box .line {
+  display: flex;
+}
 
 
-	.wrapper .header .login h2 {
-		color: whitesmoke;
-		margin-left: 4vw;
-		margin-top: 3.5vw;
-		user-select: none;
-		cursor: pointer;
-	}
+.wrapper .header .login h2 {
+  color: whitesmoke;
+  margin-left: 4vw;
+  margin-top: 3.5vw;
+  user-select: none;
+  cursor: pointer;
+}
 
-	.wrapper .header .login p {
-		font-size: 2.8vw;
-		color: whitesmoke;
-		margin-left: 4vw;
-		margin-top: 1vw;
-		user-select: none;
-		cursor: pointer;
-	}
+.wrapper .header .login p {
+  font-size: 2.8vw;
+  color: whitesmoke;
+  margin-left: 4vw;
+  margin-top: 1vw;
+  user-select: none;
+  cursor: pointer;
+}
 
-	.wrapper .header .reset img {
-		width: 8vw;
-		height: 8vw;
-		margin-left: 30vw;
-	}
+.wrapper .header .reset img {
+  width: 8vw;
+  height: 8vw;
+  margin-left: 30vw;
+}
 
-	/******************吃货豆部分******************/
-	.wrapper .bean {
-		width: 100%;
-		height: 20vw;
-		background-color: midnightblue;
+/******************吃货豆部分******************/
+.wrapper .bean {
+  width: 100%;
+  height: 20vw;
+  background-color: midnightblue;
 
-		border-radius: 4vw 4vw 0 0;
-		margin-top: 2vw;
-		display: flex;
-	}
+  border-radius: 4vw 4vw 0 0;
+  margin-top: 2vw;
+  display: flex;
+}
 
-	.wrapper .bean img {
-		width: 6vw;
-		height: 6vw;
-		margin-top: 4vw;
-		margin-left: 10vw;
-	}
+.wrapper .bean img {
+  width: 6vw;
+  height: 6vw;
+  margin-top: 4vw;
+  margin-left: 10vw;
+}
 
-	.wrapper .bean .info {
-		display: flex;
-		flex-direction: column;
-	}
+.wrapper .bean .info {
+  display: flex;
+  flex-direction: column;
+}
 
-	.wrapper .bean .info h2 {
-		color: silver;
-		font-weight: 350;
-		margin-left: 2vw;
-		margin-top: 4vw;
-	}
+.wrapper .bean .info h2 {
+  color: silver;
+  font-weight: 350;
+  margin-left: 2vw;
+  margin-top: 4vw;
+}
 
-	.wrapper .bean .info p {
-		font-size: 3vw;
-		color: silver;
-		font-weight: 800;
+.wrapper .bean .info p {
+  font-size: 3vw;
+  color: silver;
+  font-weight: 800;
 
-		margin-top: 2vw;
-	}
+  margin-top: 2vw;
+}
 
-	.wrapper .bean .raise button {
-		background-color: midnightblue;
-		font-size: 4vw;
-		margin-top: 6.5vw;
-		margin-left: 35vw;
-		color: bisque;
-		border: none;
-	}
+.wrapper .bean .raise button {
+  background-color: midnightblue;
+  font-size: 4vw;
+  margin-top: 6.5vw;
+  margin-left: 35vw;
+  color: bisque;
+  border: none;
+}
 
-	/******************详细信息部分******************/
-	.wrapper .information {
-		width: 100%;
+/******************详细信息部分******************/
+.wrapper .information {
+  width: 100%;
 
-	}
+}
 
-	.wrapper .information .money {
-		border-bottom: solid 15px #e7e7e8;
-	}
+.wrapper .information .money {
+  border-bottom: solid 15px #e7e7e8;
+}
 
-	.wrapper .information .cooperate {
-		border-top: solid 15px #e7e7e8;
-	}
+.wrapper .information .cooperate {
+  border-top: solid 15px #e7e7e8;
+}
 
-	.wrapper .information li {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 2.5vw;
-		user-select: none;
-		border-bottom: solid 3px #e7e7e8;
-		padding-top: 2vw;
-		display: flex;
-		align-items: center;
-	}
+.wrapper .information li {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 2.5vw;
+  user-select: none;
+  border-bottom: solid 3px #e7e7e8;
+  padding-top: 2vw;
+  display: flex;
+  align-items: center;
+}
 
-	.wrapper .information li img {
-		width: 6vw;
-		height: 6vw;
-		margin-left: 5vw;
-	}
+.wrapper .information li img {
+  width: 6vw;
+  height: 6vw;
+  margin-left: 5vw;
+}
 
-	.wrapper .information li p {
-		font-size: 4vw;
-		margin-left: 5vw;
-	}
+.wrapper .information li p {
+  font-size: 4vw;
+  margin-left: 5vw;
+}
 
-	.wrapper .information li span {
-		font-size: 30px;
-		margin-left: 50vw;
-		color: darkgrey;
-	}
+.wrapper .information li span {
+  font-size: 30px;
+  margin-left: 50vw;
+  color: darkgrey;
+}
 
-	.wrapper .information li div {
-		display: flex;
-		align-items: center;
-	}
+.wrapper .information li div {
+  display: flex;
+  align-items: center;
+}
 
-	.wrapper .quit {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 6vw 0vw 20vw 0vw;
-	}
+.wrapper .quit {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 6vw 0vw 20vw 0vw;
+}
 
-	.wrapper .quit p {
-		padding: 1.5vw;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 5vw;
-		color: black;
-		border-radius: 1vw;
-		user-select: none;
-		cursor: pointer;
-		border: solid 2px #000000;
-	}
+.wrapper .quit p {
+  padding: 1.5vw;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 5vw;
+  color: black;
+  border-radius: 1vw;
+  user-select: none;
+  cursor: pointer;
+  border: solid 2px #000000;
+}
 </style>
\ No newline at end of file
diff --git a/springcloud_elm/.idea/compiler.xml b/springcloud_elm/.idea/compiler.xml
index e7e0cbf..3860b73 100644
--- a/springcloud_elm/.idea/compiler.xml
+++ b/springcloud_elm/.idea/compiler.xml
@@ -11,12 +11,13 @@
         <module name="food_server_10201" />
         <module name="eureka_server_13001" />
         <module name="eureka_server_13000" />
-        <module name="orders_server_10601" />
         <module name="config_server_15001" />
+        <module name="orders_server_10601" />
+        <module name="collect_server_10800" />
         <module name="cart_server_10401" />
         <module name="cart_server_10400" />
-        <module name="orders_server_10600" />
         <module name="config_server_15000" />
+        <module name="orders_server_10600" />
         <module name="user_server_10100" />
         <module name="gateway_server_14000" />
         <module name="business_server_10301" />
diff --git a/springcloud_elm/.idea/encodings.xml b/springcloud_elm/.idea/encodings.xml
index 95f9a58..2b605fe 100644
--- a/springcloud_elm/.idea/encodings.xml
+++ b/springcloud_elm/.idea/encodings.xml
@@ -9,6 +9,8 @@
     <file url="file://$PROJECT_DIR$/cart_server_10400/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cart_server_10401/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/cart_server_10401/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/collect_server_10800/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/collect_server_10800/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/config_server_15000/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/config_server_15000/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/config_server_15001/src/main/java" charset="UTF-8" />
diff --git a/springcloud_elm/.idea/runConfigurations/collect_server_10800.xml b/springcloud_elm/.idea/runConfigurations/collect_server_10800.xml
new file mode 100644
index 0000000..9e47b06
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/collect_server_10800.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="collect_server_10800" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="collect_server_10800" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.neusoft.MyApplication" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="com.neusoft.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/springcloud_elm/.idea/sqldialects.xml b/springcloud_elm/.idea/sqldialects.xml
index c724144..56782ca 100644
--- a/springcloud_elm/.idea/sqldialects.xml
+++ b/springcloud_elm/.idea/sqldialects.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/orders_server_10600/src/main/resources/mapper/OrdersDetailetMapper.xml" dialect="GenericSQL" />
     <file url="PROJECT" dialect="MySQL" />
   </component>
 </project>
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/pom.xml b/springcloud_elm/collect_server_10800/pom.xml
new file mode 100644
index 0000000..b3a7d0b
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.neusoft</groupId>
+        <artifactId>springcloud_elm</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>collect_server_10800</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-bus</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-stream-binder-rabbit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.20</version>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- 热部署 gav  -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.neusoft</groupId>
+            <artifactId>business_server_10300</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java
new file mode 100644
index 0000000..a57a16e
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/MyApplication.java
@@ -0,0 +1,15 @@
+package com.neusoft;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@SpringBootApplication
+public class MyApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MyApplication.class, args);
+    }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java
new file mode 100644
index 0000000..98f75c1
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/controller/CollectController.java
@@ -0,0 +1,59 @@
+package com.neusoft.controller;
+
+import com.neusoft.po.Collect;
+import com.neusoft.po.CommonResult;
+import com.neusoft.service.CollectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@RefreshScope
+@RestController
+@RequestMapping("/CollectController")
+public class CollectController {
+    @Autowired
+    private CollectService collectService;
+
+    @GetMapping("/listCollect/{userId}")
+    public CommonResult<List<Collect>> listCollect(@PathVariable("userId") String userId) throws Exception {
+        Collect param = new Collect();
+        param.setUserId(userId);
+        List<Collect> list = collectService.getCollectList(param);
+        return new CommonResult<>(200, "success", list);
+    }
+    @PostMapping("/addCollect/{userId}/{businessId}")
+    public CommonResult<Integer> addCollect(
+            @PathVariable("userId") String userId,
+            @PathVariable("businessId") Integer businessId) throws Exception {
+        Collect param = new Collect();
+        param.setUserId(userId);
+        param.setBusinessId(businessId);
+        Integer result = collectService.addCollect(param);
+        return new CommonResult<>(200,"success", result);
+    }
+    @DeleteMapping("/deleteCollect/{userId}/{businessId}")
+    public CommonResult<Integer> deleteCollect(@PathVariable("userId") String userId,
+                                               @PathVariable("businessId") Integer businessId) throws Exception {
+        Collect param = new Collect();
+        param.setUserId(userId);
+        param.setBusinessId(businessId);
+        Integer result = collectService.deleteCollect(param);
+        return new CommonResult<>(200, "success", result);
+    }
+    @PostMapping("/updateCollect/{userId}/{foodId}")
+    public CommonResult<Integer> updateCollectFood(@PathVariable("userId") String userId,
+                                                   @PathVariable("businessId") Integer businessId) throws Exception {
+        Collect param = new Collect();
+        param.setUserId(userId);
+        param.setBusinessId(businessId);
+        Integer result = collectService.updateCollect(param);
+        return new CommonResult<>(200, "success", result);
+    }
+
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java
new file mode 100644
index 0000000..828af87
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/mapper/CollectMapper.java
@@ -0,0 +1,28 @@
+package com.neusoft.mapper;
+
+import com.neusoft.po.Business;
+import com.neusoft.po.Collect;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@Mapper
+public interface CollectMapper {
+    //public List<Collect> listCollect(Collect collect);
+
+    //@Select("select * from collect where userId=#{userId}")
+    public List<Collect> listCollect(Collect collect);
+    //@Delete("delete from collect where collectId=#{collectId}")
+    public Integer deleteCollectById(Collect collect);
+    @Select("insert into collect(userId,businessId) values(#{userId},#{businessId})")
+    public Integer insertCollect(Collect collect);
+    @Update("update collect set businessId=#{businessId} where collectId={collectId}")
+    public Integer updateCollectById(Collect collect);
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java
new file mode 100644
index 0000000..410bdf7
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Business.java
@@ -0,0 +1,96 @@
+package com.neusoft.po;
+
+import java.util.List;
+
+public class Business {
+    private Integer businessId;
+    private String businessName;
+    private String businessAddress;
+    private String businessExplain;
+    private String businessImg;
+    private Integer orderTypeId;
+    private double starPrice;
+    private double deliveryPrice;
+    private String remarks;
+    private List<Food> foodList;
+
+    public Integer getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(Integer businessId) {
+        this.businessId = businessId;
+    }
+
+    public String getBusinessName() {
+        return businessName;
+    }
+
+    public void setBusinessName(String businessName) {
+        this.businessName = businessName;
+    }
+
+    public String getBusinessAddress() {
+        return businessAddress;
+    }
+
+    public void setBusinessAddress(String businessAddress) {
+        this.businessAddress = businessAddress;
+    }
+
+    public String getBusinessExplain() {
+        return businessExplain;
+    }
+
+    public void setBusinessExplain(String businessExplain) {
+        this.businessExplain = businessExplain;
+    }
+
+    public String getBusinessImg() {
+        return businessImg;
+    }
+
+    public void setBusinessImg(String businessImg) {
+        this.businessImg = businessImg;
+    }
+
+    public Integer getOrderTypeId() {
+        return orderTypeId;
+    }
+
+    public void setOrderTypeId(Integer orderTypeId) {
+        this.orderTypeId = orderTypeId;
+    }
+
+    public double getStarPrice() {
+        return starPrice;
+    }
+
+    public void setStarPrice(double starPrice) {
+        this.starPrice = starPrice;
+    }
+
+    public double getDeliveryPrice() {
+        return deliveryPrice;
+    }
+
+    public void setDeliveryPrice(double deliveryPrice) {
+        this.deliveryPrice = deliveryPrice;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public List<Food> getFoodList() {
+        return foodList;
+    }
+
+    public void setFoodList(List<Food> foodList) {
+        this.foodList = foodList;
+    }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java
new file mode 100644
index 0000000..9021e44
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/Collect.java
@@ -0,0 +1,46 @@
+package com.neusoft.po;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+public class Collect {
+    private Integer collectId;
+    private Integer businessId;
+    private String userId;
+
+
+    private Business business;
+
+    public Integer getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(Integer collectId) {
+        this.collectId = collectId;
+    }
+
+    public Integer getBusinessId() {
+        return businessId;
+    }
+
+    public void setBusinessId(Integer businessId) {
+        this.businessId = businessId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Business getBusiness() {
+        return business;
+    }
+
+    public void setBusiness(Business business) {
+        this.business = business;
+    }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java
new file mode 100644
index 0000000..f80f8ec
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/po/CommonResult.java
@@ -0,0 +1,45 @@
+package com.neusoft.po;
+
+import java.io.Serializable;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+public class CommonResult<T> implements Serializable {
+    private Integer code;
+    private String message;
+    private T result;
+
+    public CommonResult() {}
+
+    public CommonResult(Integer code, String message, T result) {
+        this.code = code;
+        this.message = message;
+        this.result = result;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getResult() {
+        return result;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
+    }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java
new file mode 100644
index 0000000..9e085f1
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/CollectService.java
@@ -0,0 +1,22 @@
+package com.neusoft.service;
+
+import com.neusoft.po.Business;
+import com.neusoft.po.Collect;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+public interface CollectService {
+    public List<Collect> getCollectList(Collect collect);
+
+    public Integer addCollect(Collect collect);
+
+    public Integer deleteCollect(Collect collect);
+
+    public Integer updateCollect(Collect collect);
+
+
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java
new file mode 100644
index 0000000..bef811a
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/java/com/neusoft/service/impl/CollectServiceImpl.java
@@ -0,0 +1,39 @@
+package com.neusoft.service.impl;
+
+import com.neusoft.mapper.CollectMapper;
+import com.neusoft.po.Collect;
+import com.neusoft.service.CollectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author qq
+ * @version 1.0
+ */
+@Service
+public class CollectServiceImpl implements CollectService {
+    @Autowired
+    private CollectMapper collectMapper;
+
+    @Override
+    public List<Collect> getCollectList(Collect collect) {
+        return collectMapper.listCollect(collect);
+    }
+
+    @Override
+    public Integer addCollect(Collect collect) {
+        return collectMapper.insertCollect(collect);
+    }
+
+    @Override
+    public Integer deleteCollect(Collect collect) {
+        return collectMapper.deleteCollectById(collect);
+    }
+
+    @Override
+    public Integer updateCollect(Collect collect) {
+        return collectMapper.updateCollectById(collect);
+    }
+}
diff --git a/springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml b/springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..2849943
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/resources/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  cloud:
+    config:
+      name: collect_server_10800
+      profile: dev
+      label: master
+      discovery:
+        enabled: true
+        service-id: config-server
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://eurekaServer13000:13000/eureka/,http://eurekaServer13001:13001/eureka/
+  instance:
+    prefer-ip-address: true #使用ip地址向eureka server进行注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} #设置eureka控制台中显示的注册信息
+    lease-renewal-interval-in-seconds: 5
+    lease-expiration-duration-in-seconds: 15
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml b/springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml
new file mode 100644
index 0000000..799cb58
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/src/main/resources/mapper/CollectMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.neusoft.mapper.CollectMapper">
+    <select id="listCollect" resultType="Collect">
+        select * from collect
+        <where>
+            userId=#{userId}
+        </where>
+    </select>
+
+    <delete id="deleteCollectById">
+        delete from collect
+        <where>
+            userId=#{userId} and businessId=#{businessId}
+        </where>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/target/classes/bootstrap.yml b/springcloud_elm/collect_server_10800/target/classes/bootstrap.yml
new file mode 100644
index 0000000..2849943
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/target/classes/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  cloud:
+    config:
+      name: collect_server_10800
+      profile: dev
+      label: master
+      discovery:
+        enabled: true
+        service-id: config-server
+
+eureka:
+  client:
+    service-url:
+      defaultZone: http://eurekaServer13000:13000/eureka/,http://eurekaServer13001:13001/eureka/
+  instance:
+    prefer-ip-address: true #使用ip地址向eureka server进行注册
+    instance-id: ${spring.cloud.client.ip-address}:${server.port} #设置eureka控制台中显示的注册信息
+    lease-renewal-interval-in-seconds: 5
+    lease-expiration-duration-in-seconds: 15
\ No newline at end of file
diff --git a/springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml b/springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml
new file mode 100644
index 0000000..799cb58
--- /dev/null
+++ b/springcloud_elm/collect_server_10800/target/classes/mapper/CollectMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.neusoft.mapper.CollectMapper">
+    <select id="listCollect" resultType="Collect">
+        select * from collect
+        <where>
+            userId=#{userId}
+        </where>
+    </select>
+
+    <delete id="deleteCollectById">
+        delete from collect
+        <where>
+            userId=#{userId} and businessId=#{businessId}
+        </where>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/springcloud_elm/gateway_server_14000/src/main/resources/application.yml b/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
index 0b72282..5627e5c 100644
--- a/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
+++ b/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
@@ -16,6 +16,7 @@ spring:
               - POST
               - PUT
               - DELETE
+              - PATCH
       default-filters:
         - name: Hystrix
           args:
@@ -67,6 +68,11 @@ spring:
           predicates:
             - Path=/CouponController/*/**
 
+        - id: collectServer
+          uri: lb://collect-server
+          predicates:
+            - Path=/CollectController/*/**
+
 eureka:
   client:
     service-url:
diff --git a/springcloud_elm/gateway_server_14000/target/classes/application.yml b/springcloud_elm/gateway_server_14000/target/classes/application.yml
index 0b72282..5627e5c 100644
--- a/springcloud_elm/gateway_server_14000/target/classes/application.yml
+++ b/springcloud_elm/gateway_server_14000/target/classes/application.yml
@@ -16,6 +16,7 @@ spring:
               - POST
               - PUT
               - DELETE
+              - PATCH
       default-filters:
         - name: Hystrix
           args:
@@ -67,6 +68,11 @@ spring:
           predicates:
             - Path=/CouponController/*/**
 
+        - id: collectServer
+          uri: lb://collect-server
+          predicates:
+            - Path=/CollectController/*/**
+
 eureka:
   client:
     service-url:
diff --git a/springcloud_elm/orders_server_10600/.classpath b/springcloud_elm/orders_server_10600/.classpath
new file mode 100644
index 0000000..653dfd7
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.classpath
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/springcloud_elm/orders_server_10600/.project b/springcloud_elm/orders_server_10600/.project
new file mode 100644
index 0000000..dd1e5bd
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>orders_server_10600</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs b/springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..abdea9a
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..1b6e1ef
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs b/springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 0000000..a12794d
--- /dev/null
+++ b/springcloud_elm/orders_server_10600/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java b/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java
index 8563cae..a77cf6f 100644
--- a/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java
+++ b/springcloud_elm/orders_server_10600/src/main/java/com/neusoft/controller/OrdersController.java
@@ -47,9 +47,11 @@ public class OrdersController {
     @PutMapping("/Orders/{orderId}")
     public CommonResult<Integer>payOrdersById(@PathVariable("orderId") Integer orderId)throws Exception
     {
-        int result=ordersService.payOrdersById(orderId, null, null, null);
-        return new CommonResult<>(200,"success",result);
+    	int result=ordersService.payOrdersById(orderId, null, null, null);
+    	return new CommonResult<>(200,"success",result);
     }
+    
+    
 //    @PutMapping("/Orders")
 //    public int payOrdersById(OrderState orderState, @RequestHeader("Authorization") String token) throws Exception {
 //        return ordersService.payOrdersById(orderState.getOrderId(), orderState.getUserId(), orderState.getOrderTotal(), orderState.getReduction(),token);
diff --git a/springcloud_elm/orders_server_10601/.classpath b/springcloud_elm/orders_server_10601/.classpath
new file mode 100644
index 0000000..653dfd7
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.classpath
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/springcloud_elm/orders_server_10601/.project b/springcloud_elm/orders_server_10601/.project
new file mode 100644
index 0000000..0d3f6a0
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>orders_server_10601</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs b/springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..abdea9a
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 0000000..d4313d4
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=false
diff --git a/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..1b6e1ef
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs b/springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 0000000..a12794d
--- /dev/null
+++ b/springcloud_elm/orders_server_10601/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/springcloud_elm/pom.xml b/springcloud_elm/pom.xml
index 87def86..9e966c8 100644
--- a/springcloud_elm/pom.xml
+++ b/springcloud_elm/pom.xml
@@ -26,6 +26,7 @@
         <module>search_server_11600</module>
         <module>point_server_10900</module>
         <module>coupon_server_10950</module>
+        <module>collect_server_10800</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java b/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java
index 76d51bd..b612ead 100644
--- a/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java
+++ b/springcloud_elm/search_server_11600/src/main/java/com/neusoft/service/impl/SearchServiceImpl.java
@@ -38,7 +38,9 @@ public class SearchServiceImpl implements SearchService {
         Result res = ToAnalysis.parse(query);
         List<String> keywords=new ArrayList<>();
         for(Term term:res){
-            keywords.add(term.getName());
+            if(!term.getName().matches("^\\s+$")){
+                keywords.add(term.getName());
+            }
         }
         return businessMapper.listBusinessByKeyword(keywords);
     }