From 20fa736d26647b08d28c9a9670c6bc0feb7ac010 Mon Sep 17 00:00:00 2001
From: EhusoeAsom <3252074067@qq.com>
Date: Fri, 5 Apr 2024 21:21:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6qyy=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon.sql                                    |   9 +
 elmclient/src/router/index.js                 |  16 +
 elmclient/src/views/CouponDetails.vue         | 298 ++++++++
 elmclient/src/views/CouponSelect.vue          | 271 +++++++
 elmclient/src/views/Index.vue                 |   3 +-
 elmclient/src/views/My.vue                    |  35 +-
 elmclient/src/views/Orders.vue                | 668 +++++++++---------
 elmclient/src/views/Payment.vue               | 490 +++++++------
 elmclient/src/views/Point.vue                 | 191 -----
 elmclient/src/views/PointStore.vue            | 308 ++++++++
 elmclient/src/views/PointsDetails.vue         | 501 ++++++-------
 elmclient/src/views/SearchResults.vue         |   2 +-
 point.sql                                     |   7 +
 springcloud_elm/.idea/compiler.xml            |   2 +
 springcloud_elm/.idea/encodings.xml           |   4 +
 springcloud_elm/.idea/misc.xml                |   5 -
 .../business_server_10300.xml                 |  16 +
 .../business_server_10301.xml                 |  16 +
 .../runConfigurations/cart_server_10400.xml   |  16 +
 .../runConfigurations/cart_server_10401.xml   |  16 +
 .../runConfigurations/config_server_15000.xml |  16 +
 .../runConfigurations/config_server_15001.xml |  16 +
 .../runConfigurations/coupon_server_10950.xml |  16 +
 .../deliveryaddress_server_10500.xml          |  16 +
 .../runConfigurations/eureka_server_13000.xml |  16 +
 .../runConfigurations/eureka_server_13001.xml |  16 +
 .../runConfigurations/food_server_10200.xml   |  16 +
 .../runConfigurations/food_server_10201.xml   |  16 +
 .../gateway_server_14000.xml                  |  16 +
 .../runConfigurations/orders_server_10600.xml |  16 +
 .../runConfigurations/orders_server_10601.xml |  16 +
 .../runConfigurations/point_server_10900.xml  |  16 +
 .../runConfigurations/search_server_11600.xml |  16 +
 .../runConfigurations/user_server_10100.xml   |  16 +
 springcloud_elm/.idea/sqldialects.xml         |   7 +
 springcloud_elm/coupon_server_10950/pom.xml   |  65 ++
 .../main/java/com/neusoft/MyApplication.java  |  11 +
 .../neusoft/controller/CouponController.java  |  52 ++
 .../java/com/neusoft/mapper/CouponMapper.java |  31 +
 .../src/main/java/com/neusoft/po/Coupon.java  |  83 +++
 .../com/neusoft/service/CouponService.java    |  20 +
 .../service/impl/CouponServiceImpl.java       |  61 ++
 .../src/main/resources/bootstrap.yml          |  19 +
 .../target/classes/bootstrap.yml              |  19 +
 .../src/main/resources/application.yml        |  20 +-
 .../target/classes/application.yml            |  20 +-
 .../neusoft/controller/OrdersController.java  |   6 +
 springcloud_elm/point_server_10900/pom.xml    |  64 ++
 .../main/java/com/neusoft/MyApplication.java  |  11 +
 .../neusoft/controller/PointController.java   |  48 ++
 .../java/com/neusoft/mapper/PointMapper.java  |  31 +
 .../java/com/neusoft/mapper/UserMapper.java   |  18 +
 .../java/com/neusoft/po/CommonResult.java     |  41 ++
 .../src/main/java/com/neusoft/po/Point.java   |  63 ++
 .../src/main/java/com/neusoft/po/User.java    |  59 ++
 .../com/neusoft/service/PointService.java     |  21 +
 .../service/impl/PointServiceImpl.java        | 109 +++
 .../src/main/resources/bootstrap.yml          |  19 +
 .../target/classes/bootstrap.yml              |  19 +
 springcloud_elm/pom.xml                       |   4 +-
 .../main/java/com/neusoft/MyApplication.java  |   2 -
 .../service/impl/SearchServiceImpl.java       |   4 +-
 62 files changed, 3008 insertions(+), 1017 deletions(-)
 create mode 100644 coupon.sql
 create mode 100644 elmclient/src/views/CouponDetails.vue
 create mode 100644 elmclient/src/views/CouponSelect.vue
 delete mode 100644 elmclient/src/views/Point.vue
 create mode 100644 elmclient/src/views/PointStore.vue
 create mode 100644 point.sql
 create mode 100644 springcloud_elm/.idea/runConfigurations/business_server_10300.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/business_server_10301.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/cart_server_10400.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/cart_server_10401.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/config_server_15000.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/config_server_15001.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/coupon_server_10950.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/deliveryaddress_server_10500.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/eureka_server_13000.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/eureka_server_13001.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/food_server_10200.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/food_server_10201.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/gateway_server_14000.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/orders_server_10600.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/orders_server_10601.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/point_server_10900.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/search_server_11600.xml
 create mode 100644 springcloud_elm/.idea/runConfigurations/user_server_10100.xml
 create mode 100644 springcloud_elm/.idea/sqldialects.xml
 create mode 100644 springcloud_elm/coupon_server_10950/pom.xml
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/MyApplication.java
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/controller/CouponController.java
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/mapper/CouponMapper.java
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/po/Coupon.java
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/CouponService.java
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/impl/CouponServiceImpl.java
 create mode 100644 springcloud_elm/coupon_server_10950/src/main/resources/bootstrap.yml
 create mode 100644 springcloud_elm/coupon_server_10950/target/classes/bootstrap.yml
 create mode 100644 springcloud_elm/point_server_10900/pom.xml
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/MyApplication.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/controller/PointController.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/PointMapper.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/UserMapper.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/CommonResult.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/Point.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/User.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/PointService.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/impl/PointServiceImpl.java
 create mode 100644 springcloud_elm/point_server_10900/src/main/resources/bootstrap.yml
 create mode 100644 springcloud_elm/point_server_10900/target/classes/bootstrap.yml

diff --git a/coupon.sql b/coupon.sql
new file mode 100644
index 0000000..35ca89a
--- /dev/null
+++ b/coupon.sql
@@ -0,0 +1,9 @@
+drop table if exists `coupon`;
+Create table coupon(
+    couponId INT AUTO_INCREMENT PRIMARY KEY,
+    userId VARCHAR(20),
+    limitNum int,
+    minusNum int,
+    couponDate Varchar(50),
+    outDate Varchar(50)
+);
\ No newline at end of file
diff --git a/elmclient/src/router/index.js b/elmclient/src/router/index.js
index eeee01c..2451912 100644
--- a/elmclient/src/router/index.js
+++ b/elmclient/src/router/index.js
@@ -18,6 +18,9 @@ import PointsDetails from '../views/PointsDetails.vue';
 import Wallet from '../views/Wallet.vue';
 import Error403 from '../components/Error403';
 import SearchResults from "../views/SearchResults";
+import PointStore from '../views/PointStore.vue';
+import CouponDetails from '../views/CouponDetails.vue';
+import CouponSelect from '../views/CouponSelect.vue';
 
 
 const routes = [{
@@ -88,6 +91,19 @@ const routes = [{
 		path: '/searchResults',
 		name: 'SearchResults',
 		component: SearchResults
+	},{
+		path: '/PointStore',
+		name: 'PointStore',
+		component: PointStore
+	}, {
+		path: '/CouponDetails',
+		name: 'CouponDetails',
+		component: CouponDetails
+	},
+	{
+		path: '/CouponSelect',
+		name: 'CouponSelect',
+		component: CouponSelect
 	}
 ];
 
diff --git a/elmclient/src/views/CouponDetails.vue b/elmclient/src/views/CouponDetails.vue
new file mode 100644
index 0000000..085cbd6
--- /dev/null
+++ b/elmclient/src/views/CouponDetails.vue
@@ -0,0 +1,298 @@
+<template>
+	<div class="wrapper">
+		<!-- header部分 -->
+		<header>
+			<i class="fa fa-angle-left" @click="back"></i>
+			<p>我的券包</p>
+		</header>
+
+		<div class="points-total">
+			<div class="num">
+				<!-- <img src="../assets/吃货豆.png">
+				<p style="color: goldenrod;">{{ sum }}</p> -->
+			</div>
+			<div class="text">
+				<p>券包有效期三天，记得使用哦~</p>
+			</div>
+		</div>
+
+		<div class="points-detail">
+			<div class="top">
+				<p :class="{ active: isShouzhi }" @click="toggleTab('shouzhi')">可用积分</p>
+				<p :class="{ active: !isShouzhi }" @click="toggleTab('duihuan')">已过期积分</p>
+			</div>
+			<div class="border">
+				<ul class="get-pay" v-show="isShouzhi">
+					<li class="li1">
+						<ul class="details">
+							<li>
+								<h4>获取时间</h4>
+							</li>
+							<li>
+								<h4>券名</h4>
+							</li>
+							<li>
+								<h4>过期时间</h4>
+							</li>
+						</ul>
+					</li>
+					<li class="li1">
+						<ul class="details"  v-for="item in availablePointArr">
+							<li>
+								<h4>{{item.couponDate}}</h4>
+							</li>
+							<li>
+								<p>满{{ item.limitNum }}减{{item.minusNum}}券</p>
+							</li>
+							<li>
+								<p style="color: green;">{{ item.outDate }}</p>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<ul class="duihuan" v-show="!isShouzhi">
+					<li class="li1">
+						<ul class="details">
+							<li>
+								<h4>获取时间</h4>
+							</li>
+							<li>
+								<h4>过期数量</h4>
+							</li>
+							<li>
+								<h4>过期时间</h4>
+							</li>
+						</ul>
+					</li>
+					<li class="li1">
+						<ul class="details"  v-for="item in outDatePointArr">
+							<li>
+								<h4>{{item.pointDate}}</h4>
+							</li>
+							<li>
+								<p>{{ item.pointNum }}</p>
+							</li>
+							<li>
+								<p style="color: red;">{{ item.outDate }}</p>
+							</li>
+						</ul>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		name: 'PointsDetails',
+		data() {
+			return {
+				isShouzhi: true,
+				availablePointArr: [],
+				outDatePointArr: [],
+				user: {}
+			};
+		},
+		computed: {
+			sum() {
+				return this.availablePointArr.reduce((accumulator, currentValue) => accumulator + currentValue.pointNum,
+				0);
+			}
+		},
+		created() {
+			console.log("PointsDetail, Here");
+			this.user = this.$getSessionStorage('user');
+
+			// this.$axios.get('PointController/AvailablePoints',{
+			// 	params:{
+			// 		userId: this.user.userId
+			// 	},
+			// 	headers: {
+			// 		Authorization:this.user.password
+			// 	}
+			// }).then(response => {
+			// 	// 积分系统新增的改动
+			// 	let result = response.data.result;
+			// 	this.availablePointArr = result;
+			// 	console.log(response);
+			// 	 // console.log(this.user.userId+" "+this.user.password);
+			// }).catch(error => {
+			// 	console.error(error);
+			// });
+			
+			this.$axios.get(`CouponController/getCouponByUserId/${this.user.userId}`)
+			.then(response=>{
+				let result = response.data.result;
+				this.availablePointArr = result;
+				
+			}).catch(error => {
+				console.error(error);
+			});
+
+			this.$axios.get('PointController/OutofDatePoints',{
+				params:{
+					userId: this.user.userId
+				},
+				headers: {
+					Authorization:this.user.password
+				}
+			}).then(response => {
+				let result = response.data.result;
+				this.outDatePointArr = result;
+				console.log("outDatePoint:\n"+result)
+			}).catch(error => {
+				console.error(error);
+			});
+		},
+		methods: {
+			back() {
+				this.$router.go(-1);
+			},
+			toggleTab(tab) {
+				this.isShouzhi = tab === 'shouzhi';
+			},
+		},
+	};
+</script>
+
+<style scoped>
+	.wrapper {
+		width: 100%;
+		height: 100%;
+		background-color: #F4F8Fb;
+	}
+
+	/****************** 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 32vw;
+	}
+
+	.wrapper .points-total {
+		padding-top: 20vw;
+	}
+
+	.wrapper .points-total .num {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 1vw;
+	}
+
+	.wrapper .points-total .num p {
+		font-size: 6vw;
+	}
+
+	.wrapper .points-total .num img {
+		width: 8vw;
+		height: 8vw;
+	}
+
+	.wrapper .points-total .text {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 2.8vw;
+	}
+
+	.wrapper .points-detail {
+		padding-top: 6vw;
+	}
+
+	.wrapper .points-detail .top {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		font-size: 3.5vw;
+		padding-bottom: 2vw;
+	}
+
+	.wrapper .points-detail .top p {
+		font-weight: normal;
+		user-select: none;
+		cursor: pointer;
+	}
+
+	.wrapper .points-detail .top p.active {
+		font-weight: bold;
+		user-select: none;
+		cursor: pointer;
+	}
+
+	.wrapper .points-detail .border {
+		width: 100%;
+		padding: 2vw 2vw 0vw 2vw;
+		box-sizing: border-box;
+	}
+
+	.wrapper .points-detail .border .get-pay {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 2vw;
+	}
+
+	.wrapper .points-detail .border .get-pay .li1 {
+		padding: 2vw 0vw;
+	}
+
+	.wrapper .points-detail .border .get-pay .details {
+		display: flex;
+		margin: 0vw 2vw;
+	}
+
+	.wrapper .points-detail .border .get-pay .details li {
+		width: 34%;
+		font-size: 2.8vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.wrapper .points-detail .border .duihuan {
+		width: 100%;
+		background-color: #fff;
+		border-radius: 2vw;
+	}
+
+	.wrapper .points-detail .border .duihuan .li1 {
+		padding: 2vw 0vw;
+	}
+
+	.wrapper .points-detail .border .duihuan .details {
+		display: flex;
+		margin: 0vw 2vw;
+	}
+
+	.wrapper .points-detail .border .duihuan .details li {
+		width: 34%;
+		font-size: 2.8vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+</style>
\ No newline at end of file
diff --git a/elmclient/src/views/CouponSelect.vue b/elmclient/src/views/CouponSelect.vue
new file mode 100644
index 0000000..22d014e
--- /dev/null
+++ b/elmclient/src/views/CouponSelect.vue
@@ -0,0 +1,271 @@
+<template>
+	<div class="wrapper">
+		<!-- header部分 -->
+		<header>
+			<i class="fa fa-angle-left" @click="back"></i>
+			<p>消费券选择</p>
+		</header>
+		<!-- 地址列表部分 -->
+		<ul class="addresslist">
+			<li v-for="item in CouponList">
+<!-- 				<div class="addresslist-left" @click="setDeliveryAddress(item)">
+					<h3>{{item.contactName}}{{getSexText(item.contactSex)}} {{item.contactTel}}
+					</h3>
+					<p>{{item.address}}</p>
+				</div>
+				<div class="addresslist-right">
+					<i class="fa fa-edit" @click="editUserAddress(item.daId)"></i>
+					<i class="fa fa-remove" @click="removeUserAddress(item.daId)"></i>
+				</div> -->
+				<div class="Coupon-Intro" @click="useThisCoupon(item)">
+					<p class="Coupon-Name">满{{item.limitNum}}减{{item.minusNum}}优惠券</p>
+					<p class="Coupon-Outdate">有效日期：{{item.outDate}}</p>
+				</div>
+			</li>
+			
+			<li>
+				<div class="Coupon-Intro" @click="notUseCoupon()">
+					<p class="Coupon-Name">不使用消费券</p>
+					<p class="Coupon-Outdate">-</p>
+				</div>
+			</li>
+		</ul>
+		<!-- 新增地址部分 -->
+		<!-- <div class="addbtn" @click="toAddUserAddress">
+			<i class="fa fa-plus-circle"></i>
+			<p>新增收货地址</p>
+		</div> -->
+		<!-- 底部菜单部分 -->
+		<Footer></Footer>
+	</div>
+</template>
+<script>
+	import Footer from '../components/Footer.vue';
+
+	export default {
+		name: 'UserAddress',
+		data() {
+			return {
+				businessId: this.$route.query.businessId,
+				user: {},
+				deliveryAddressArr: [],
+				CouponList:[],
+			}
+		},
+		created() {
+			this.user = this.$getSessionStorage('user');
+
+			this.listDeliveryAddressByUserId();
+			this.getCouponByUserId(this.user.userId);
+		},
+		components: {
+			Footer
+		},
+		methods: {
+			back() {
+				this.$router.go(-1);
+			},
+			getSexText(sex) {
+				return sex === 1 ? '先生' : '女士';
+			},
+			listDeliveryAddressByUserId() {
+				//查询送货地址
+        let url=`DeliveryAddressController/listDeliveryAddressByUserId/${this.user.userId}`
+				this.$axios.get(url).then(response => {
+					this.deliveryAddressArr = response.data.result;
+				}).catch(error => {
+					console.error(error);
+				});
+			},
+			setDeliveryAddress(deliveryAddress) {
+				//把用户选择的默认送货地址存储到localStorage中
+				this.$setLocalStorage(this.user.userId, deliveryAddress);
+				this.$router.push({
+					path: '/orders',
+					query: {
+						businessId: this.businessId
+					}
+				});
+			},
+			toAddUserAddress() {
+				this.$router.push({
+					path: '/addUserAddress',
+					query: {
+						businessId: this.businessId
+					}
+				});
+			},
+			editUserAddress(daId) {
+				this.$router.push({
+					path: '/editUserAddress',
+					query: {
+						businessId: this.businessId,
+						daId: daId
+					}
+				});
+			},
+			removeUserAddress(daId) {
+				if (!confirm('确认要删除此送货地址吗？')) {
+					return;
+				}
+        let url=`DeliveryAddressController/removeDeliveryAddress/${daId}`
+				this.$axios.delete(url).then(response => {
+					if (response.data.result > 0) {
+						let deliveryAddress = this.$getLocalStorage(this.user.userId);
+						if (deliveryAddress != null && deliveryAddress.daId == daId) {
+							this.$removeLocalStorage(this.user.userId);
+						}
+						this.listDeliveryAddressByUserId();
+					} else {
+						alert('删除地址失败！');
+					}
+				}).catch(error => {
+					console.error(error);
+				});
+			},
+			getCouponByUserId(userId)
+			{
+				this.$axios.get(`CouponController/getCouponByUserId/${userId}`).then(response =>{
+					this.CouponList=response.data.result;
+				})
+			},
+			useThisCoupon(Coupon)
+			{
+				this.$setLocalStorage(this.$route.query.businessId,Coupon);
+				this.$router.push({
+					path: '/orders',
+					query: {
+						businessId: this.businessId
+					}
+				});
+			},
+			notUseCoupon()
+			{
+				
+				this.$setLocalStorage(this.$route.query.businessId,null)
+				this.$router.push({
+					path: '/orders',
+					query: {
+						businessId: this.businessId
+					}
+				});
+			}
+		}
+	}
+</script>
+<style scoped>
+	/*************** 总容器 ***************/
+	.wrapper {
+		width: 100%;
+		height: 100%;
+		background-color: #F5F5F5;
+	}
+
+	/*************** 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;
+	}
+
+
+	/*************** addresslist ***************/
+	.wrapper .addresslist {
+		width: 100%;
+		padding-top: 12vw;
+		background-color: #fff;
+	}
+
+	.wrapper .addresslist li {
+		width: 100%;
+		box-sizing: border-box;
+		border-bottom: solid 1px #DDD;
+		padding: 3vw;
+		display: flex;
+	}
+
+	.wrapper .addresslist li .addresslist-left {
+		flex: 5;
+		/*左边这块区域是可以点击的*/
+		user-select: none;
+		cursor: pointer;
+	}
+
+	.wrapper .addresslist li .addresslist-left h3 {
+		font-size: 4.6vw;
+		font-weight: 300;
+		color: #666;
+	}
+
+	.wrapper .addresslist li .addresslist-left p {
+		font-size: 4vw;
+		color: #666;
+	}
+
+	.wrapper .addresslist li .addresslist-right {
+		flex: 1;
+		font-size: 5.6vw;
+		color: #999;
+		cursor: pointer;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	/*************** 新增地址部分 ***************/
+	.wrapper .addbtn {
+		width: 100%;
+		height: 14vw;
+		border-top: solid 1px #DDD;
+		border-bottom: solid 1px #DDD;
+		background-color: #fff;
+		margin-top: 4vw;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 4.5vw;
+		color: #01B0F2;
+		user-select: none;
+		cursor: pointer;
+	}
+
+	p {
+		margin-left: 2vw;
+	}
+	
+	.wrapper .Coupon-Intro{
+		cursor: pointer;
+		width: 100%;
+		height: 16vw;
+		box-sizing: border-box;
+		padding: 3vw;
+		color: #666;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 3.5vw;
+	}
+</style>
\ No newline at end of file
diff --git a/elmclient/src/views/Index.vue b/elmclient/src/views/Index.vue
index d0e60c6..81c52f3 100644
--- a/elmclient/src/views/Index.vue
+++ b/elmclient/src/views/Index.vue
@@ -17,7 +17,8 @@
       <div class="search-fixed-top" ref="fixedBox">
         <!-- 搜索框部分中间的白框 -->
         <div class="search-box">
-          <i @click="toSearch()" :class="{'fa fa-search': true, 'blue-icon': keyword!==''}"></i><input type="text" v-model="keyword" placeholder="搜索饿了么商家、商品名称">
+          <i @click="toSearch()" :class="{'fa fa-search': true, 'blue-icon': keyword!==''}"></i>
+          <input type="text" v-model="keyword" placeholder="搜索饿了么商家、商品名称" @keydown.enter="toSearch()" >
         </div>
       </div>
     </div>
diff --git a/elmclient/src/views/My.vue b/elmclient/src/views/My.vue
index 201d644..10bc7a5 100644
--- a/elmclient/src/views/My.vue
+++ b/elmclient/src/views/My.vue
@@ -67,6 +67,22 @@
 						<span>&#62;</span>
 					</div>
 				</li>
+        <!-- 积分商城，积分系统新增部分 -->
+        <li>
+          <div class="red" @click="toPointStore">
+            <img src="../assets/img/红包.png">
+            <p>积分商城</p>
+            <span>&#62;</span>
+          </div>
+        </li>
+
+        <li>
+          <div class="red" @click="toCouponDetails">
+            <img src="../assets/img/红包.png">
+            <p>我的券包</p>
+            <span>&#62;</span>
+          </div>
+        </li>
 			</div>
 
 			<li @click="toaddress()">
@@ -154,7 +170,7 @@
 			},
 			toPointsdetails() {
 				this.$router.push({
-					path: '/pointsdetails'
+					path: '/pointsDetails'
 				});
 			},
 			toWallet() {
@@ -173,7 +189,22 @@
 				this.$router.push({
 					path: '/userAddress'
 				});
-			}
+			},
+      // 积分系统新增部分
+      toPointStore(){
+        console.log("to Point Store");
+        this.$router.push({
+          path: '/PointStore'
+        });
+      },
+      toCouponDetails()
+      {
+        this.$router.push(
+            {
+              path:'/CouponDetails'
+            }
+        );
+      }
 		}
 	};
 </script>
diff --git a/elmclient/src/views/Orders.vue b/elmclient/src/views/Orders.vue
index 5cca0d3..5ce7816 100644
--- a/elmclient/src/views/Orders.vue
+++ b/elmclient/src/views/Orders.vue
@@ -1,362 +1,380 @@
 <template>
-	<div class="wrapper">
-		<!-- header部分 -->
-		<header>
-			<i class="fa fa-angle-left" @click="back"></i>
-			<p>确认订单</p>
-		</header>
-		<!-- 订单信息部分 -->
-		<div class="order-info">
-			<div class="box">
-				<h5>订单配送至：</h5>
-				<div class="order-info-address" @click="toUserAddress">
-					<p>{{deliveryaddress!=null?deliveryaddress.address:'请选择收货地址'}}</p>
-					<i class="fa fa-angle-right"></i>
-				</div>
-				<p>{{deliveryaddress!=null?deliveryaddress.contactName:''}}
-					{{deliveryaddress!=null?getSexText(deliveryaddress.contactSex):''}}
-					{{deliveryaddress!=null?deliveryaddress.contactTel:''}}
-				</p>
-			</div>
-		</div>
-		<h3>{{business.businessName}}</h3>
-		<!-- 订单明细部分 -->
-		<div class="detail">
-			<ul class="order-detailed">
-				<li v-for="item in cartArr">
-					<div class="order-detailed-left">
-						<img :src="item.food.foodImg">
-						<p>{{item.food.foodName}} x {{item.quantity}}</p>
-					</div>
-					<p>&#165;{{item.food.foodPrice*item.quantity}}</p>
-				</li>
-			</ul>
-			<div class="order-deliveryfee">
-				<p>配送费</p>
-				<p>&#165;{{business.deliveryPrice}}</p>
-			</div>
-<!--			<div class="order-deliveryfee">-->
-<!--				<p>{{ totalPoint }}积分(每100积分抵扣&#165;1.00)</p>-->
-<!--				<p>-&#165;{{del.toFixed(2)}}</p>-->
-<!--			</div>-->
-		</div>
-		<!-- 合计部分 -->
-		<div class="total">
-			<div class="total-left">
-				&#165;{{totalPrice}}
-			</div>
-			<div class="box">
-				<div class="total-right" @click="toPayment">
-					提交订单
-				</div>
-			</div>
-		</div>
-	</div>
+  <div class="wrapper">
+    <!-- header部分 -->
+    <header>
+      <i class="fa fa-angle-left" @click="back"></i>
+      <p>确认订单</p>
+    </header>
+    <!-- 订单信息部分 -->
+    <div class="order-info">
+      <div class="box">
+        <h5>订单配送至：</h5>
+        <div class="order-info-address" @click="toUserAddress">
+          <p>{{ deliveryaddress != null ? deliveryaddress.address : '请选择收货地址' }}</p>
+          <i class="fa fa-angle-right"></i>
+        </div>
+        <p>{{ deliveryaddress != null ? deliveryaddress.contactName : '' }}
+          {{ deliveryaddress != null ? getSexText(deliveryaddress.contactSex) : '' }}
+          {{ deliveryaddress != null ? deliveryaddress.contactTel : '' }}
+        </p>
+      </div>
+    </div>
+    <h3>{{ business.businessName }}</h3>
+    <!-- 订单明细部分 -->
+    <div class="detail">
+      <ul class="order-detailed">
+        <li v-for="item in cartArr">
+          <div class="order-detailed-left">
+            <img :src="item.food.foodImg">
+            <p>{{ item.food.foodName }} x {{ item.quantity }}</p>
+          </div>
+          <p>&#165;{{ item.food.foodPrice * item.quantity }}</p>
+        </li>
+      </ul>
+      <div class="order-deliveryfee">
+        <p>配送费</p>
+        <p>&#165;{{ business.deliveryPrice }}</p>
+      </div>
+
+      <div class="coupon-select" @click="toCouponSelect">
+        <p>选择消费券</p>
+        <p>{{ getCouponName() }}</p>
+      </div>
+    </div>
+    <!-- 合计部分 -->
+    <div class="total">
+      <div class="total-left">
+        &#165;{{ totalPrice }}
+      </div>
+      <div class="box">
+        <div class="total-right" @click="toPayment">
+          提交订单
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-	export default {
-		name: 'Orders',
-		data() {
-			return {
-				businessId: this.$route.query.businessId,
-				business: {},
-				user: {},
-				cartArr: [],
-				deliveryaddress: {},
-				availablePointArr: []
-			}
-		},
-		created() {
-			this.user = this.$getSessionStorage('user');
-			this.deliveryaddress = this.$getLocalStorage(this.user.userId);
+export default {
+  name: 'Orders',
+  data() {
+    return {
+      businessId: this.$route.query.businessId,
+      business: {},
+      user: {},
+      cartArr: [],
+      deliveryaddress: {},
+      availablePointArr: [],
+      couponUsed: {}
+    }
+  },
+  created() {
+    this.user = this.$getSessionStorage('user');
+    this.deliveryaddress = this.$getLocalStorage(this.user.userId);
+    this.couponUsed = this.$getLocalStorage(this.businessId);
+    //查询当前商家
+    let businessUrl = `BusinessController/getBusinessById/${this.businessId}`
+    this.$axios.get(businessUrl).then(response => {
+      this.business = response.data.result;
+    }).catch(error => {
+      console.error(error);
+    });
 
-			//查询当前商家
-      let businessUrl=`BusinessController/getBusinessById/${this.businessId}`
-			this.$axios.get(businessUrl).then(response => {
-				this.business = response.data.result;
-			}).catch(error => {
-				console.error(error);
-			});
+    //查询当前用户在购物车中的当前商家食品列表
+    let cartUrl = `CartController/listCart/${this.user.userId}/${this.businessId}`
+    this.$axios.get(cartUrl).then(response => {
+      this.cartArr = response.data.result;
+    }).catch(error => {
+      console.error(error);
+    });
+  },
+  computed: {
+    totalPrice() {
+      let totalPrice = 0;
+      for (let cartItem of this.cartArr) {
+        totalPrice += cartItem.food.foodPrice * cartItem.quantity;
+      }
+      totalPrice += this.business.deliveryPrice;
 
-			//查询当前用户在购物车中的当前商家食品列表
-      let cartUrl=`CartController/listCart/${this.user.userId}/${this.businessId}`
-			this.$axios.get(cartUrl).then(response => {
-				this.cartArr = response.data.result;
-			}).catch(error => {
-				console.error(error);
-			});
+      //积分券包界面新增
+      if (this.couponUsed != null) {
+        totalPrice -= this.couponUsed.minusNum;
+      }
+      return totalPrice;
+    }
+  },
+  methods: {
+    back() {
+      this.$router.go(-1);
+    },
+    getSexText(sex) {
+      return sex === 1 ? '先生' : '女士';
+    },
+    toUserAddress() {
+      this.$router.push({
+        path: '/userAddress',
+        query: {
+          businessId: this.businessId
+        }
+      });
+    },
+    toPayment() {
+      if (this.deliveryaddress == null) {
+        alert('请选择送货地址！');
+        return;
+      }
 
-			// this.$axios.get('PointController/AvailablePoints',{
-			// 	params:{
-			// 		userId: this.user.userId
-			// 	},
-			// 	headers: {
-			// 		Authorization:this.user.password
-			// 	}
-			// }).then(response => {
-			// 	let result = response.data;
-			// 	this.availablePointArr = result;
-			// }).catch(error => {
-			// 	console.error(error);
-			// });
-		},
-		computed: {
-			// totalPoint() {
-			// 	let totalPoint = 0;
-			// 	for (let item of this.availablePointArr) {
-			// 		totalPoint += item.pointNum;
-			// 	}
-			// 	return totalPoint;
-			// },
-			// del() {
-			// 	return Math.floor(this.totalPoint/100);
-			// },
-			totalPrice() {
-				let totalPrice = 0;
-				for (let cartItem of this.cartArr) {
-					totalPrice += cartItem.food.foodPrice * cartItem.quantity;
-				}
-				totalPrice += this.business.deliveryPrice;
-				// totalPrice -= this.del;
-				return totalPrice;
-			}
-		},
-		methods: {
-			back() {
-				this.$router.go(-1);
-			},
-			getSexText(sex) {
-				return sex === 1 ? '先生' : '女士';
-			},
-			toUserAddress() {
-				this.$router.push({
-					path: '/userAddress',
-					query: {
-						businessId: this.businessId
-					}
-				});
-			},
-			toPayment() {
-				if (this.deliveryaddress == null) {
-					alert('请选择送货地址！');
-					return;
-				}
+      //创建订单
 
-				//创建订单
-        let url=`OrdersController/createOrders/${this.user.userId}/${this.businessId}/${this.deliveryaddress.daId}/${this.totalPrice}`
-				this.$axios.post(url).then(response => {
-					let orderId = response.data.result;
-					if (orderId > 0) {
-						this.$router.push({
-							path: '/payment',
-							query: {
-								orderId: orderId,
-								userId: this.user.userId,
-								reduction: this.del
-							}
-						});
-					} else {
-						alert('创建订单失败！');
-					}
-				}).catch(error => {
-					console.error(error);
-				});
-			}
-		}
-	}
+      let url = `OrdersController/createOrders/${this.user.userId}/${this.businessId}/${this.deliveryaddress.daId}/${this.totalPrice}`
+      this.$axios.post(url).then(response => {
+        let orderId = response.data.result;
+        if (orderId > 0) {
+          //积分系统新增代码
+          if (this.couponUsed != null) {
+            this.$axios.delete(`CouponController/deleteCouponByCouponId/${this.couponUsed.couponId}`);
+          }
+          this.$router.push({
+            path: '/payment',
+            query: {
+              orderId: orderId,
+              userId: this.user.userId,
+              reduction: this.couponUsed===null?0:this.couponUsed.minusNum
+            }
+          });
+          this.$removeSessionStorage(this.businessId);
+
+        } else {
+          alert('创建订单失败！');
+        }
+      }).catch(error => {
+        console.error(error);
+      });
+    },
+    toCouponSelect() {
+      this.$router.push(
+          {
+            path: '/CouponSelect',
+            query: {
+              businessId: this.businessId
+            }
+          });
+    },
+    getCouponName() {
+      if (this.couponUsed == null) {
+        return "不使用优惠券";
+      } else {
+        return "满" + this.couponUsed.limitNum + "减" + this.couponUsed.minusNum + "优惠券";
+      }
+    }
+  }
+}
 </script>
 
 <style scoped>
-	/****************** 总容器 ******************/
-	.wrapper {
-		width: 100%;
-		height: 100%;
-	}
+/****************** 总容器 ******************/
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
 
-	/****************** header部分 ******************/
-	.wrapper header {
-		width: 100%;
-		height: 12vw;
-		background-color: #01B0F2;
-		font-size: 4.8vw;
-		color: #fff;
+/****************** header部分 ******************/
+.wrapper header {
+  width: 100%;
+  height: 12vw;
+  background-color: #01B0F2;
+  font-size: 4.8vw;
+  color: #fff;
 
-		z-index: 10;
+  z-index: 10;
 
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
 
-		position: fixed;
-		left: 0;
-		top: 0;
-	}
+  position: fixed;
+  left: 0;
+  top: 0;
+}
 
-	.wrapper header i {
-		margin: 0vw 0vw 0vw 3vw;
-		font-size: 6vw;
-		user-select: none;
-		cursor: pointer;
-	}
+.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 header p {
+  margin: 0vw 0vw 0vw 33.5vw;
+}
 
-	/****************** 订单信息部分 ******************/
-	.wrapper .order-info {
-		/*注意这里，不设置高，靠内容撑开。因为地址有可能折行*/
-		width: 100%;
-		background-color: #01B0F2;
-		box-sizing: border-box;
-		padding: 2vw 2vw;
-		color: #fff;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
+/****************** 订单信息部分 ******************/
+.wrapper .order-info {
+  /*注意这里，不设置高，靠内容撑开。因为地址有可能折行*/
+  width: 100%;
+  background-color: #01B0F2;
+  box-sizing: border-box;
+  padding: 2vw 2vw;
+  color: #fff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
-	.wrapper .order-info .box {
-		/*注意这里，不设置高，靠内容撑开。因为地址有可能折行*/
-		width: 100%;
-		margin-top: 12vw;
-		background-color: #fff;
-		box-sizing: border-box;
-		padding: 2vw;
-		color: black;
-		border-radius: 2vw;
-	}
+.wrapper .order-info .box {
+  /*注意这里，不设置高，靠内容撑开。因为地址有可能折行*/
+  width: 100%;
+  margin-top: 12vw;
+  background-color: #fff;
+  box-sizing: border-box;
+  padding: 2vw;
+  color: black;
+  border-radius: 2vw;
+}
 
-	.wrapper .order-info h5 {
-		font-size: 3vw;
-		font-weight: 300;
-	}
+.wrapper .order-info h5 {
+  font-size: 3vw;
+  font-weight: 300;
+}
 
-	.wrapper .order-info .order-info-address {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-weight: 700;
-		user-select: none;
-		cursor: pointer;
-		margin: 1vw 0;
-	}
+.wrapper .order-info .order-info-address {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 700;
+  user-select: none;
+  cursor: pointer;
+  margin: 1vw 0;
+}
 
-	.wrapper .order-info .order-info-address p {
-		width: 90%;
-		font-size: 5vw;
-	}
+.wrapper .order-info .order-info-address p {
+  width: 90%;
+  font-size: 5vw;
+}
 
-	.wrapper .order-info .order-info-address i {
-		font-size: 6vw;
-	}
+.wrapper .order-info .order-info-address i {
+  font-size: 6vw;
+}
 
-	.wrapper .order-info p {
-		font-size: 3.5vw;
-	}
+.wrapper .order-info p {
+  font-size: 3.5vw;
+}
 
-	.wrapper h3 {
-		box-sizing: border-box;
-		padding: 3vw;
-		font-size: 4vw;
-		color: #666;
-		border-bottom: solid 1px #DDD;
-	}
+.wrapper h3 {
+  box-sizing: border-box;
+  padding: 3vw;
+  font-size: 4vw;
+  color: #666;
+  border-bottom: solid 1px #DDD;
+}
 
-	/****************** 订单明细部分 ******************/
-	.wrapper .detail {
-		width: 100%;
-		padding-bottom: 14vw;
-	}
+/****************** 订单明细部分 ******************/
+.wrapper .detail {
+  width: 100%;
+  padding-bottom: 14vw;
+}
 
-	.wrapper .order-detailed {
-		width: 100%;
-	}
-	
-	.wrapper .order-detailed li {
-		width: 100%;
-		height: 16vw;
-		box-sizing: border-box;
-		padding: 3vw;
-		color: #666;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
+.wrapper .order-detailed {
+  width: 100%;
+}
 
-	.wrapper .order-detailed li .order-detailed-left {
-		display: flex;
-		align-items: center;
-	}
+.wrapper .order-detailed li {
+  width: 100%;
+  height: 16vw;
+  box-sizing: border-box;
+  padding: 3vw;
+  color: #666;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
-	.wrapper .order-detailed li .order-detailed-left img {
-		width: 10vw;
-		height: 10vw;
-	}
+.wrapper .order-detailed li .order-detailed-left {
+  display: flex;
+  align-items: center;
+}
 
-	.wrapper .order-detailed li .order-detailed-left p {
-		font-size: 3.5vw;
-		margin-left: 3vw;
-	}
+.wrapper .order-detailed li .order-detailed-left img {
+  width: 10vw;
+  height: 10vw;
+}
 
-	.wrapper .order-detailed li p {
-		font-size: 3.5vw;
-	}
+.wrapper .order-detailed li .order-detailed-left p {
+  font-size: 3.5vw;
+  margin-left: 3vw;
+}
 
-	.wrapper .order-deliveryfee {
-		width: 100%;
-		height: 16vw;
-		box-sizing: border-box;
-		padding: 3vw;
-		color: #666;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 3.5vw;
-	}
+.wrapper .order-detailed li p {
+  font-size: 3.5vw;
+}
 
-	/****************** 订单合计部分 ******************/
-	.wrapper .total {
-		width: 100%;
-		height: 14vw;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-	}
+.wrapper .order-deliveryfee {
+  width: 100%;
+  height: 16vw;
+  box-sizing: border-box;
+  padding: 3vw;
+  color: #666;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 3.5vw;
+}
 
-	.wrapper .total .total-left {
-		flex: 2;
-		background-color: #505051;
-		color: #fff;
-		font-size: 4.5vw;
-		font-weight: 700;
-		user-select: none;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+.wrapper .coupon-select {
+  width: 100%;
+  height: 16vw;
+  box-sizing: border-box;
+  padding: 3vw;
+  color: #666;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 3.5vw;
+  cursor: pointer;
+}
 
-	.wrapper .total .box {
-		flex: 1;
-		background-color: #505051;
-		padding: 2vw 2vw;
-	}
+/****************** 订单合计部分 ******************/
+.wrapper .total {
+  width: 100%;
+  height: 14vw;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  display: flex;
+}
 
-	.wrapper .total .box .total-right {
-		width: 100%;
-		height: 100%;
-		background-color: #01B0F2;
-		color: #fff;
-		font-size: 4.5vw;
-		font-weight: 700;
-		user-select: none;
-		cursor: pointer;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border-radius: 8vw;
-	}
+.wrapper .total .total-left {
+  flex: 2;
+  background-color: #505051;
+  color: #fff;
+  font-size: 4.5vw;
+  font-weight: 700;
+  user-select: none;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.wrapper .total .box {
+  flex: 1;
+  background-color: #505051;
+  padding: 2vw 2vw;
+}
+
+.wrapper .total .box .total-right {
+  width: 100%;
+  height: 100%;
+  background-color: #01B0F2;
+  color: #fff;
+  font-size: 4.5vw;
+  font-weight: 700;
+  user-select: none;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 8vw;
+}
 </style>
\ No newline at end of file
diff --git a/elmclient/src/views/Payment.vue b/elmclient/src/views/Payment.vue
index 7b00e01..75cb726 100644
--- a/elmclient/src/views/Payment.vue
+++ b/elmclient/src/views/Payment.vue
@@ -1,254 +1,284 @@
 <template>
-	<div class="wrapper">
-		<!-- header部分 -->
-		<header>
-			<i class="fa fa-angle-left" @click="back"></i>
-			<p>在线支付</p>
-		</header>
-		<!-- 订单信息部分 -->
-		<h3>订单信息：</h3>
-		<div class="order-info">
-			<p>
-				{{orders.business.businessName}}
-				<i class="fa fa-caret-down" @click="detailetShow"></i>
-			</p>
-			<p>&#165;{{orders.orderTotal}}</p>
-		</div>
-		<!-- 订单明细部分 -->
-		<ul class="order-detailet" v-show="isShowDetailet">
-			<li v-for="item in orders.list">
-				<p>{{item.food.foodName}} x {{item.quantity}}</p>
-				<p>&#165;{{item.food.foodPrice*item.quantity}}</p>
-			</li>
-			<li>
-				<p>配送费</p>
-				<p>&#165;{{orders.business.deliveryPrice}}</p>
-			</li>
-			<li>
-				<p>积分</p>
-				<p>-&#165;{{reduction}}</p>
-			</li>
-		</ul>
-		<!-- 支付方式部分 -->
-		<ul class="payment-type">
-			<li>
-				<img src="../assets/img/alipay.png">
-				<i class="fa fa-check-circle"></i>
-			</li>
-			<li>
-				<img src="../assets/img/wechat.png">
-			</li>
-		</ul>
-		<div class="payment-button">
-			<button  :style="{ backgroundColor: isPayed ? 'gray' :  '#38CA73'}" @click="pay">确认支付</button>
-		</div>
-		<h2 v-show="paySuccess" style="color: #0097FF;text-align: center;">
-			支付成功！
-		</h2>
-		<!-- 底部菜单部分 -->
-		<Footer></Footer>
-	</div>
+  <div class="wrapper">
+    <!-- header部分 -->
+    <header>
+      <i class="fa fa-angle-left" @click="back"></i>
+      <p>在线支付</p>
+    </header>
+    <!-- 订单信息部分 -->
+    <h3>订单信息：</h3>
+    <div class="order-info">
+      <p>
+        {{orders.business.businessName}}
+        <i class="fa fa-caret-down" @click="detailetShow"></i>
+      </p>
+      <p>&#165;{{orders.orderTotal}}</p>
+    </div>
+    <!-- 订单明细部分 -->
+    <ul class="order-detailet" v-show="isShowDetailet">
+      <li v-for="item in orders.list">
+        <p>{{item.food.foodName}} x {{item.quantity}}</p>
+        <p>&#165;{{item.food.foodPrice*item.quantity}}</p>
+      </li>
+      <li>
+        <p>配送费</p>
+        <p>&#165;{{orders.business.deliveryPrice}}</p>
+      </li>
+      <li>
+        <p>消费券减免</p>
+        <p>-&#165;{{reduction}}</p>
+      </li>
+      <!-- 积分系统新增显示 -->
+      <li>
+        <p>获得积分</p>
+        <p>{{orders.orderTotal*10}}</p>
+      </li>
+    </ul>
+    <!-- 支付方式部分 -->
+    <ul class="payment-type">
+      <li>
+        <img src="../assets/img/alipay.png">
+        <i class="fa fa-check-circle"></i>
+      </li>
+      <li>
+        <img src="../assets/img/wechat.png">
+      </li>
+    </ul>
+    <div class="payment-button">
+      <button  :style="{ backgroundColor: isPayed ? 'gray' :  '#38CA73'}" @click="pay">确认支付</button>
+    </div>
+    <h2 v-show="paySuccess" style="color: #0097FF;text-align: center;">
+      支付成功！
+    </h2>
+    <!-- 底部菜单部分 -->
+    <Footer></Footer>
+  </div>
 </template>
 <script>
-	import Footer from '../components/Footer.vue';
-	export default {
-		name: 'Payment',
-		data() {
-			return {
-				orderId: this.$route.query.orderId,
-				userId: this.$route.query.userId,
-				reduction: this.$route.query.reduction,
-				orders: {
-					business: {}
-				},
-				isShowDetailet: false,
-				paySuccess: false,
-				isPayed: false
-			}
-		},
-		created() {
-      let url=`OrdersController/getOrdersById/${this.orderId}`
-			this.$axios.get(url).then(response => {
-				this.orders = response.data.result;
-			}).catch(error => {
-				console.error(error);
-			});
-		},
-		mounted() {
-			//这里的代码是实现：一旦路由到在线支付组件，就不能回到订单确认组件。
-			//先将当前url添加到history对象中
-			history.pushState(null, null, document.URL);
-			//popstate事件能够监听history对象的变化
-			window.onpopstate = () => {
-				this.$router.push({
-					path: '/index'
-				});
-			}
-		},
-		destroyed() {
-			window.onpopstate = null;
-		},
-		computed: {
-			pointGot(){
-				let res=this.orders.orderTotal+this.reduction;
-				return Math.floor(res);
-			}
-		},
-		methods: {
-			detailetShow() {
-				this.isShowDetailet = !this.isShowDetailet;
-			},
-			pay() {
-				this.$axios.put('OrdersController/Orders', this.$qs.stringify({
-					orderId: this.orderId,
-					userId: this.userId,
-					orderTotal: this.orders.orderTotal,
-					reduction: this.reduction
-				}),{
-					headers: {
-						Authorization:this.$getSessionStorage('user').password
-					}
-				}).then(response => {
-					let orderId = response.data;
-					if (orderId > 0) {
-						this.paySuccess=true;
-						this.isPayed=true;
-						setTimeout(() => {
-							this.$router.push({
-							path: '/orderList'
-						});
-						}, 500);
-					} else {
-						alert('支付失败！');
-					}
-				}).catch(error => {
-					console.error(error);
-				});
-			}
-		},
-		components: {
-			Footer
-		}
-	}
+import Footer from '../components/Footer.vue';
+export default {
+  name: 'Payment',
+  data() {
+    return {
+      orderId: this.$route.query.orderId,
+      userId: this.$route.query.userId,
+      reduction: this.$route.query.reduction,
+      orders: {
+        business: {}
+      },
+      isShowDetailet: false,
+      paySuccess: false,
+      isPayed: false
+    }
+  },
+  created() {
+    let url=`OrdersController/getOrdersById/${this.orderId}`
+    this.$axios.get(url).then(response => {
+      this.orders = response.data.result;
+    }).catch(error => {
+      console.error(error);
+    });
+  },
+  mounted() {
+    //这里的代码是实现：一旦路由到在线支付组件，就不能回到订单确认组件。
+    //先将当前url添加到history对象中
+    history.pushState(null, null, document.URL);
+    //popstate事件能够监听history对象的变化
+    window.onpopstate = () => {
+      this.$router.push({
+        path: '/index'
+      });
+    }
+  },
+  destroyed() {
+    window.onpopstate = null;
+  },
+  computed: {
+    pointGot(){
+      let res=this.orders.orderTotal+this.reduction;
+      return Math.floor(res);
+    }
+  },
+  methods: {
+    detailetShow() {
+      this.isShowDetailet = !this.isShowDetailet;
+    },
+    pay() {
+      // this.$axios.put('OrdersController/Orders', this.$qs.stringify({
+      // 	orderId: this.orderId,
+      // 	userId: this.userId,
+      // 	orderTotal: this.orders.orderTotal,
+      // 	reduction: this.reduction
+      // }),{
+      // 	headers: {
+      // 		Authorization:this.$getSessionStorage('user').password
+      // 	}
+      // }).then(response => {
+      // 	let orderId = response.data;
+      // 	if (orderId > 0) {
+      // 		this.paySuccess=true;
+      // 		this.isPayed=true;
+      // 		setTimeout(() => {
+      // 			this.$router.push({
+      // 			path: '/orderList'
+      // 		});
+      // 		}, 500);
+      // 	} else {
+      // 		alert('支付失败！');
+      // 	}
+      // }).catch(error => {
+      // 	console.error(error);
+      // });
+
+      console.log("Kicked");
+      let url=`OrdersController/Orders/${this.orderId}`
+      this.$axios.put(url)
+          .then(
+              response =>
+              {
+                console.log(response);
+                console.log("支付成功");
+                let url=`PointController/addPointByPointId/${this.userId}/${this.orders.orderDate}/${this.orders.orderTotal*10}`
+                console.log(url);
+                this.$axios.post(url).then(response =>
+                {
+                  console.log(response.data);
+                });
+                this.$router.push({path:'/orderList'});
+              }
+          )
+          .catch(error =>
+              {
+                console.error(error);
+              }
+          );
+
+
+    }
+  },
+  components: {
+    Footer
+  }
+}
 </script>
 <style scoped>
-	/****************** 总容器 ******************/
-	.wrapper {
-		width: 100%;
-		height: 100%;
-	}
+/****************** 总容器 ******************/
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
 
-	/****************** header部分 ******************/
-	.wrapper header {
-		width: 100%;
-		height: 12vw;
-		background-color: #01B0F2;
-		font-size: 4.8vw;
-		color: #fff;
+/****************** header部分 ******************/
+.wrapper header {
+  width: 100%;
+  height: 12vw;
+  background-color: #01B0F2;
+  font-size: 4.8vw;
+  color: #fff;
 
-		z-index: 10;
+  z-index: 10;
 
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
 
-		position: fixed;
-		left: 0;
-		top: 0;
-	}
+  position: fixed;
+  left: 0;
+  top: 0;
+}
 
-	.wrapper header i {
-		margin: 0vw 0vw 0vw 3vw;
-		font-size: 6vw;
-		user-select: none;
-		cursor: pointer;
-	}
+.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 header p {
+  margin: 0vw 0vw 0vw 33.5vw;
+}
 
-	/****************** 订单信息部分 ******************/
-	.wrapper h3 {
-		margin-top: 12vw;
-		box-sizing: border-box;
-		padding: 4vw 4vw 0;
-		font-size: 4vw;
-		font-weight: 300;
-		color: #999;
-	}
+/****************** 订单信息部分 ******************/
+.wrapper h3 {
+  margin-top: 12vw;
+  box-sizing: border-box;
+  padding: 4vw 4vw 0;
+  font-size: 4vw;
+  font-weight: 300;
+  color: #999;
+}
 
-	.wrapper .order-info {
-		box-sizing: border-box;
-		padding: 4vw;
-		font-size: 4vw;
-		color: #666;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
+.wrapper .order-info {
+  box-sizing: border-box;
+  padding: 4vw;
+  font-size: 4vw;
+  color: #666;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
-	.wrapper .order-info p:last-child {
-		color: orangered;
-	}
+.wrapper .order-info p:last-child {
+  color: orangered;
+}
 
-	/****************** 订单明细部分 ******************/
-	.wrapper .order-detailet {
-		width: 100%;
-	}
+/****************** 订单明细部分 ******************/
+.wrapper .order-detailet {
+  width: 100%;
+}
 
-	.wrapper .order-detailet li {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 1vw 4vw;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
+.wrapper .order-detailet li {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 1vw 4vw;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
-	.wrapper .order-detailet li p {
-		font-size: 3vw;
-		color: #666;
-	}
+.wrapper .order-detailet li p {
+  font-size: 3vw;
+  color: #666;
+}
 
-	/****************** 支付方式部分 ******************/
-	.wrapper .payment-type {
-		width: 100%;
-	}
+/****************** 支付方式部分 ******************/
+.wrapper .payment-type {
+  width: 100%;
+}
 
-	.wrapper .payment-type li {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 4vw;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
+.wrapper .payment-type li {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 4vw;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 
-	.wrapper .payment-type li img {
-		width: 33vw;
-		height: 8.9vw;
-	}
+.wrapper .payment-type li img {
+  width: 33vw;
+  height: 8.9vw;
+}
 
-	.wrapper .payment-type li .fa-check-circle {
-		font-size: 5vw;
-		color: #38CA73;
-	}
+.wrapper .payment-type li .fa-check-circle {
+  font-size: 5vw;
+  color: #38CA73;
+}
 
-	.wrapper .payment-button {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 4vw;
-	}
+.wrapper .payment-button {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 4vw;
+}
 
-	.wrapper .payment-button button {
-		width: 100%;
-		height: 10vw;
-		border: none;
-		font-size: 3vw;
-		/*去掉外轮廓线*/
-		outline: none;
-		border-radius: 4px;
-		color: #fff;
-	}
+.wrapper .payment-button button {
+  width: 100%;
+  height: 10vw;
+  border: none;
+  font-size: 3vw;
+  /*去掉外轮廓线*/
+  outline: none;
+  border-radius: 4px;
+  color: #fff;
+}
 </style>
\ No newline at end of file
diff --git a/elmclient/src/views/Point.vue b/elmclient/src/views/Point.vue
deleted file mode 100644
index 1d97870..0000000
--- a/elmclient/src/views/Point.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<template>
-	<div class="wrapper">
-		<!-- header部分 -->
-		<header>
-			<p>积分明细</p>
-		</header>
-		<!-- 订单列表部分 -->
-		<h3>可用积分({{ sum }})</h3>
-		<p style="color: gray;">每批积分将在获得后180天过期</p>
-		<ul class="order">
-			<table>
-				<thead>
-					<tr style="background-color: #0097FF;color: aliceblue;">
-						<th>积分</th>
-						<th>获得时间</th>
-						<th>过期时间</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="item in availablePointArr" style="background-color: whitesmoke;">
-						<td>{{ item.pointNum }}</td>
-						<td>{{ item.pointDate }}</td>
-						<td style="color: green">{{ item.outDate }}</td>
-					</tr>
-				</tbody>
-			</table>
-		</ul>
-		<h3>过期积分<i class="fa fa-caret-down" @click="detailetShow()"></i></h3>
-		<ul class="order" v-show="isShowDetailet">
-			<table>
-				<thead>
-					<tr style="background-color: gray;color: aliceblue;">
-						<th>积分</th>
-						<th>获得时间</th>
-						<th>过期时间</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr v-for="item in outDatePointArr" style="background-color: whitesmoke;">
-						<td>{{ item.pointNum }}</td>
-						<td>{{ item.pointDate }}</td>
-						<td style="color: red">{{ item.outDate }}</td>
-					</tr>
-				</tbody>
-			</table>
-		</ul>
-		<!-- 底部菜单部分 -->
-		<Footer></Footer>
-	</div>
-</template>
-<script>
-	import Footer from '../components/Footer.vue';
-
-	export default {
-		name: 'Point',
-		data() {
-			return {
-				availablePointArr: [],
-				outDatePointArr: [],
-				user: {},
-				isShowDetailet: 0
-			}
-		},
-		computed: {
-			sum() {
-				return this.availablePointArr.reduce((accumulator, currentValue) => accumulator + currentValue.pointNum, 0);
-			}
-		},
-		created() {
-			this.user = this.$getSessionStorage('user');
-
-			this.$axios.get('PointController/AvailablePoints',{
-				params:{
-					userId: this.user.userId
-				},
-				headers: {
-					Authorization:this.user.password
-				}
-			}).then(response => {
-				let result = response.data;
-				this.availablePointArr = result;
-			}).catch(error => {
-				console.error(error);
-			});
-			
-			this.$axios.get('PointController/OutofDatePoints',{
-				params:{
-					userId: this.user.userId
-				},
-				headers: {
-					Authorization:this.user.password
-				}
-			}).then(response => {
-				let result = response.data;
-				this.outDatePointArr = result;
-			}).catch(error => {
-				console.error(error);
-			});
-		},
-		methods: {
-			detailetShow(){
-				this.isShowDetailet=!this.isShowDetailet;
-			}
-		},
-		components: {
-			Footer
-		}
-	}
-</script>
-<style scoped>
-	/****************** 总容器 ******************/
-	.wrapper {
-		width: 100%;
-		height: 100%;
-	}
-
-	/****************** header部分 ******************/
-	.wrapper header {
-		width: 100%;
-		height: 12vw;
-		background-color: #0097FF;
-		color: #fff;
-		font-size: 4.8vw;
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 1000;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	/****************** 历史订单列表部分 ******************/
-	.wrapper h3 {
-		margin-top: 12vw;
-		box-sizing: border-box;
-		padding: 4vw;
-		font-size: 5vw;
-		font-weight: 300;
-	}
-
-	.wrapper .order {
-		width: 100%;
-	}
-
-	.wrapper .order li {
-		width: 100%;
-	}
-
-	.wrapper .order li .order-info {
-		box-sizing: border-box;
-		padding: 2vw 4vw;
-		font-size: 4vw;
-		color: #666;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.wrapper .order li .order-info .order-info-right {
-		display: flex;
-	}
-
-	.wrapper .order li .order-info .order-info-right .order-info-right-icon {
-		background-color: #f90;
-		color: #fff;
-		border-radius: 3px;
-		margin-left: 2vw;
-		user-select: none;
-		cursor: pointer;
-	}
-
-	.wrapper .order li .order-detailet {
-		width: 100%;
-	}
-
-	.wrapper .order li .order-detailet li {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 1vw 4vw;
-		color: #666;
-		font-size: 3vw;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	.wrapper .order table {
-		width: 100%;
-	}
-</style>
\ No newline at end of file
diff --git a/elmclient/src/views/PointStore.vue b/elmclient/src/views/PointStore.vue
new file mode 100644
index 0000000..0e9dfab
--- /dev/null
+++ b/elmclient/src/views/PointStore.vue
@@ -0,0 +1,308 @@
+
+<!-- 积分商城，整个篇的代码全部由积分系统0更新 -->
+<template>
+	<div class ="wrapper">
+		<header>
+			<i class="fa fa-angle-left" @click="back"></i>
+			<p>积分商城</p>
+		</header>
+		<!-- 用来容纳剩余积分的盒子 -->
+		<div class="rest-box">
+			<p class="rest-point">剩余积分</p>
+			<p class="rest-num">{{sum}}</p>
+		</div>
+		<ul class="coupon-list">
+			<li class="coupon-unit">
+				<div class ="coupon-card">
+					<p class="coupon-title">满50减40购物券</p>
+					<div class ="devide-line"></div>
+					<p class="coupon-intro">结算时如果总额满50元，可以优惠40元。</p>
+			
+					<!-- 这个地方多套一层保证右对齐 -->
+					<div class="purchase-area">
+						<div class="purchase-button" @click="buy50coupon">
+						<p class="purchase-button-word">立即购买（1000）</p>
+						</div>
+					</div>
+				</div>
+			</li>
+			
+			<li class="coupon-unit">
+				<div class ="coupon-card">
+					<p class="coupon-title">满20减15购物券</p>
+					<div class ="devide-line"></div>
+					<p class="coupon-intro">结算时如果总额满20元，可以优惠15元。</p>
+			
+					<!-- 这个地方多套一层保证右对齐 -->
+					<div class="purchase-area">
+						<div class="purchase-button" @click="buy20coupon">
+						<p class="purchase-button-word">立即购买（800）</p>
+						</div>
+					</div>
+				</div>
+			</li>
+			
+			<li class="coupon-unit">
+				<div class ="coupon-card">
+					<p class="coupon-title">满10减8购物券</p>
+					<div class ="devide-line"></div>
+					<p class="coupon-intro">结算时如果总额10元，可以优惠8元。</p>
+			
+					<!-- 这个地方多套一层保证右对齐 -->
+					<div class="purchase-area">
+						<div class="purchase-button" @click="buy10coupon">
+						<p class="purchase-button-word">立即购买（600）</p>
+						</div>
+					</div>
+				</div>
+			</li>
+		</ul>
+		
+			
+		
+		
+		
+		
+	</div>
+</template>
+
+<script>
+export default {
+		name: 'PointsDetails',
+		data() {
+			return {
+				isShouzhi: true,
+				availablePointArr: [],
+				outDatePointArr: [],
+				user: {}
+			};
+		},
+		computed: {
+			sum() {
+				return this.availablePointArr.reduce((accumulator, currentValue) => accumulator + currentValue.pointNum,
+				0);
+			}
+		},
+		created() {
+			console.log("PointsDetail, Here");
+			this.user = this.$getSessionStorage('user');
+
+			this.$axios.get('PointController/AvailablePoints',{
+				params:{
+					userId: this.user.userId
+				},
+				headers: {
+					Authorization:this.user.password
+				}
+			}).then(response => {
+				// 积分系统新增的改动
+				let result = response.data.result;
+				this.availablePointArr = result;
+				console.log(response);
+				 // console.log(this.user.userId+" "+this.user.password);
+			}).catch(error => {
+				console.error(error);
+			});
+
+			this.$axios.get('PointController/OutofDatePoints',{
+				params:{
+					userId: this.user.userId
+				},
+				headers: {
+					Authorization:this.user.password
+				}
+			}).then(response => {
+				let result = response.data.result;
+				this.outDatePointArr = result;
+				console.log("outDatePoint:\n"+result)
+			}).catch(error => {
+				console.error(error);
+			});
+		},
+		methods: {
+			back() {
+				this.$router.go(-1);
+			},
+			toggleTab(tab) {
+				this.isShouzhi = tab === 'shouzhi';
+			},
+			buy50coupon(){
+				console.log("buy50coupon");
+				console.log(this.sum);
+				if(this.sum>1000)
+				{
+					console.log("50点券购买成功");
+					this.substractPoint(1000);
+					this.$axios.post(`/CouponController/saveCoupon/${this.user.userId}/50/40`)
+				}
+				
+			},
+			buy20coupon()
+			{
+				console.log("buy20coupon");
+				if(this.sum>800)
+				{
+					console.log("20点券购买成功");
+					this.substractPoint(800);
+					this.$axios.post(`/CouponController/saveCoupon/${this.user.userId}/20/15`)
+				}
+				
+
+			},
+			buy10coupon()
+			{
+				console.log("buy10coupon");
+				if(this.sum>600)
+				{
+					console.log("10点券购买成功");
+					this.$axios.post(`/CouponController/saveCoupon/${this.user.userId}/10/8`)
+					this.substractPoint(600);
+				}
+				
+
+			},
+			// 扣除积分
+			substractPoint(substractNum)
+			{
+				var subNum=substractNum;
+				
+				for(const availablePoint of this.availablePointArr)
+				{
+					console.log("subnum="+subNum+"pointNum="+availablePoint.pointNum)
+					if(subNum===0)
+					{
+						break;
+					}
+					
+					if(subNum<availablePoint.pointNum)
+					{
+						console.log("单条剩余积分 "+(availablePoint.pointNum-subNum));
+						this.$axios.post(`/PointController/updatePointNumById/${availablePoint.pointId}/${availablePoint.pointNum-subNum}`);
+						subNum=0;
+					}
+					
+					if(subNum>=availablePoint.pointNum)
+					{
+						subNum=subNum-availablePoint.pointNum;
+						this.$axios.delete(`/PointController/deletePointByPointId/${availablePoint.pointId}`);
+						
+					}
+				}
+				this.$router.go(0);
+				// 
+				// while(substractNum!=0)
+				// {
+					
+				// }
+			}
+			
+		},
+	};
+</script>
+
+<style scoped>
+	.wrapper {
+		width: 100%;
+		height: 100%;
+		background-color: #F4F8Fb;
+	}
+	
+	/****************** 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 32vw;
+	}
+	
+	.wrapper .rest-box{
+		width: 80vw;
+		height: 10vw;
+		margin-top: 12vw;
+		display: flex;
+		justify-content: center;
+		text-align: center;
+	}
+	.wrapper .rest-box .rest-point
+	{
+		font-size: 6vw;
+	}
+	
+	.wrapper .rest-box .rest-num
+	{
+		font-size: 6vw;
+		color: #FFAA00;
+	}
+	
+	.wrapper .coupon-card {
+		margin-top: 2vw;
+		margin-left: 5vw;
+		margin-right: 5vw;
+		background-color: #01B0F2;
+		border-radius: 10px;
+	}
+	
+	.wrapper .coupon-card .coupon-title{
+		padding:3vw 0vw 3vw 3vw;
+		font-size: 6vw;
+		color: #F4F8Fb;
+	}
+	
+	.wrapper .coupon-card .devide-line{
+		background-color: #F4F8Fb;
+		width: 80vw;
+		height: 2px;
+		
+	}
+	
+	.wrapper .coupon-card .coupon-intro{
+		padding:3vw 0vw 3vw 3vw;
+
+		font-size: 4vw;
+		color: #F4F8Fb;
+	}
+	
+	.wrapper .coupon-card  .purchase-area{
+		display: flex;
+		justify-content: flex-end;
+	}
+	.wrapper .coupon-card .purchase-button{
+		width: 40vw;
+		height: 8vw;
+		background-color: #00dd00;
+		border-radius: 10px;
+		margin-right: 3vw;
+		margin-bottom: 3vw;
+		text-align: center;
+		display: flex;
+		justify-content: center;
+		cursor: pointer;
+	}
+	.wrapper .coupon-card .purchase-button .purchase-button-word{
+		color: #F4F8Fb;
+		font-size: 4vw;
+		margin: auto;
+	}
+</style>
\ No newline at end of file
diff --git a/elmclient/src/views/PointsDetails.vue b/elmclient/src/views/PointsDetails.vue
index e843b0c..3e17271 100644
--- a/elmclient/src/views/PointsDetails.vue
+++ b/elmclient/src/views/PointsDetails.vue
@@ -1,284 +1,289 @@
 <template>
-	<div class="wrapper">
-		<!-- header部分 -->
-		<header>
-			<i class="fa fa-angle-left" @click="back"></i>
-			<p>积分记录</p>
-		</header>
+  <div class="wrapper">
+    <!-- header部分 -->
+    <header>
+      <i class="fa fa-angle-left" @click="back"></i>
+      <p>积分记录</p>
+    </header>
 
-		<div class="points-total">
-			<div class="num">
-				<img src="../assets/吃货豆.png">
-				<p style="color: goldenrod;">{{ sum }}</p>
-			</div>
-			<div class="text">
-				<p>积分有效期180天，记得使用哟</p>
-			</div>
-		</div>
+    <div class="points-total">
+      <div class="num">
+        <img src="../assets/吃货豆.png">
+        <p style="color: goldenrod;">{{ sum }}</p>
+      </div>
+      <div class="text">
+        <p>积分有效期180天，记得使用哟</p>
+      </div>
+    </div>
 
-		<div class="points-detail">
-			<div class="top">
-				<p :class="{ active: isShouzhi }" @click="toggleTab('shouzhi')">可用积分</p>
-				<p :class="{ active: !isShouzhi }" @click="toggleTab('duihuan')">已过期积分</p>
-			</div>
-			<div class="border">
-				<ul class="get-pay" v-show="isShouzhi">
-					<li class="li1">
-						<ul class="details">
-							<li>
-								<h4>获取时间</h4>
-							</li>
-							<li>
-								<h4>剩余数量</h4>
-							</li>
-							<li>
-								<h4>过期时间</h4>
-							</li>
-						</ul>
-					</li>
-					<li class="li1">
-						<ul class="details"  v-for="item in availablePointArr">
-							<li>
-								<h4>{{item.pointDate}}</h4>
-							</li>
-							<li>
-								<p>{{ item.pointNum }}</p>
-							</li>
-							<li>
-								<p style="color: green;">{{ item.outDate }}</p>
-							</li>
-						</ul>
-					</li>
-				</ul>
-				<ul class="duihuan" v-show="!isShouzhi">
-					<li class="li1">
-						<ul class="details">
-							<li>
-								<h4>获取时间</h4>
-							</li>
-							<li>
-								<h4>过期数量</h4>
-							</li>
-							<li>
-								<h4>过期时间</h4>
-							</li>
-						</ul>
-					</li>
-					<li class="li1">
-						<ul class="details"  v-for="item in outDatePointArr">
-							<li>
-								<h4>{{item.pointDate}}</h4>
-							</li>
-							<li>
-								<p>{{ item.pointNum }}</p>
-							</li>
-							<li>
-								<p style="color: red;">{{ item.outDate }}</p>
-							</li>
-						</ul>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
+    <div class="points-detail">
+      <div class="top">
+        <p :class="{ active: isShouzhi }" @click="toggleTab('shouzhi')">可用积分</p>
+        <p :class="{ active: !isShouzhi }" @click="toggleTab('duihuan')">已过期积分</p>
+      </div>
+      <div class="border">
+        <ul class="get-pay" v-show="isShouzhi">
+          <li class="li1">
+            <ul class="details">
+              <li>
+                <h4>获取时间</h4>
+              </li>
+              <li>
+                <h4>剩余数量</h4>
+              </li>
+              <li>
+                <h4>过期时间</h4>
+              </li>
+            </ul>
+          </li>
+          <li class="li1">
+            <ul class="details"  v-for="item in availablePointArr">
+              <li>
+                <h4>{{item.pointDate}}</h4>
+              </li>
+              <li>
+                <p>{{ item.pointNum }}</p>
+              </li>
+              <li>
+                <p style="color: green;">{{ item.outDate }}</p>
+              </li>
+            </ul>
+          </li>
+        </ul>
+        <ul class="duihuan" v-show="!isShouzhi">
+          <li class="li1">
+            <ul class="details">
+              <li>
+                <h4>获取时间</h4>
+              </li>
+              <li>
+                <h4>过期数量</h4>
+              </li>
+              <li>
+                <h4>过期时间</h4>
+              </li>
+            </ul>
+          </li>
+          <li class="li1">
+            <ul class="details"  v-for="item in outDatePointArr">
+              <li>
+                <h4>{{item.pointDate}}</h4>
+              </li>
+              <li>
+                <p>{{ item.pointNum }}</p>
+              </li>
+              <li>
+                <p style="color: red;">{{ item.outDate }}</p>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-	export default {
-		name: 'PointsDetails',
-		data() {
-			return {
-				isShouzhi: true,
-				availablePointArr: [],
-				outDatePointArr: [],
-				user: {}
-			};
-		},
-		computed: {
-			sum() {
-				return this.availablePointArr.reduce((accumulator, currentValue) => accumulator + currentValue.pointNum,
-				0);
-			}
-		},
-		created() {
-			this.user = this.$getSessionStorage('user');
+export default {
+  name: 'PointsDetails',
+  data() {
+    return {
+      isShouzhi: true,
+      availablePointArr: [],
+      outDatePointArr: [],
+      user: {}
+    };
+  },
+  computed: {
+    sum() {
+      return this.availablePointArr.reduce((accumulator, currentValue) => accumulator + currentValue.pointNum,
+          0);
+    }
+  },
+  created() {
+    console.log("PointsDetail, Here");
+    this.user = this.$getSessionStorage('user');
 
-			this.$axios.get('PointController/AvailablePoints',{
-				params:{
-					userId: this.user.userId
-				},
-				headers: {
-					Authorization:this.user.password
-				}
-			}).then(response => {
-				let result = response.data;
-				this.availablePointArr = result;
-			}).catch(error => {
-				console.error(error);
-			});
+    this.$axios.get('PointController/AvailablePoints',{
+      params:{
+        userId: this.user.userId
+      },
+      headers: {
+        Authorization:this.user.password
+      }
+    }).then(response => {
+      // 积分系统新增的改动
+      let result = response.data.result;
+      this.availablePointArr = result;
+      console.log(response);
+      // console.log(this.user.userId+" "+this.user.password);
+    }).catch(error => {
+      console.error(error);
+    });
 
-			this.$axios.get('PointController/OutofDatePoints',{
-				params:{
-					userId: this.user.userId
-				},
-				headers: {
-					Authorization:this.user.password
-				}
-			}).then(response => {
-				let result = response.data;
-				this.outDatePointArr = result;
-			}).catch(error => {
-				console.error(error);
-			});
-		},
-		methods: {
-			back() {
-				this.$router.go(-1);
-			},
-			toggleTab(tab) {
-				this.isShouzhi = tab === 'shouzhi';
-			},
-		},
-	};
+    this.$axios.get('PointController/OutofDatePoints',{
+      params:{
+        userId: this.user.userId
+      },
+      headers: {
+        Authorization:this.user.password
+      }
+    }).then(response => {
+      let result = response.data.result;
+      this.outDatePointArr = result;
+      console.log("outDatePoint:\n"+result)
+    }).catch(error => {
+      console.error(error);
+    });
+  },
+  methods: {
+    back() {
+      this.$router.go(-1);
+    },
+    toggleTab(tab) {
+      this.isShouzhi = tab === 'shouzhi';
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.wrapper {
-		width: 100%;
-		height: 100%;
-		background-color: #F4F8Fb;
-	}
+.wrapper {
+  width: 100%;
+  height: 100%;
+  background-color: #F4F8Fb;
+}
 
-	/****************** header ******************/
-	.wrapper header {
-		width: 100%;
-		height: 12vw;
-		background-color: #01B0F2;
-		font-size: 4.8vw;
-		color: #fff;
+/****************** header ******************/
+.wrapper header {
+  width: 100%;
+  height: 12vw;
+  background-color: #01B0F2;
+  font-size: 4.8vw;
+  color: #fff;
 
-		z-index: 10;
+  z-index: 10;
 
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
 
-		position: fixed;
-		left: 0;
-		top: 0;
-	}
+  position: fixed;
+  left: 0;
+  top: 0;
+}
 
-	.wrapper header i {
-		margin: 0vw 0vw 0vw 3vw;
-		font-size: 6vw;
-		user-select: none;
-		cursor: pointer;
-	}
+.wrapper header i {
+  margin: 0vw 0vw 0vw 3vw;
+  font-size: 6vw;
+  user-select: none;
+  cursor: pointer;
+}
 
-	.wrapper header p {
-		margin: 0vw 0vw 0vw 32vw;
-	}
+.wrapper header p {
+  margin: 0vw 0vw 0vw 32vw;
+}
 
-	.wrapper .points-total {
-		padding-top: 20vw;
-	}
+.wrapper .points-total {
+  padding-top: 20vw;
+}
 
-	.wrapper .points-total .num {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-bottom: 1vw;
-	}
+.wrapper .points-total .num {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 1vw;
+}
 
-	.wrapper .points-total .num p {
-		font-size: 6vw;
-	}
+.wrapper .points-total .num p {
+  font-size: 6vw;
+}
 
-	.wrapper .points-total .num img {
-		width: 8vw;
-		height: 8vw;
-	}
+.wrapper .points-total .num img {
+  width: 8vw;
+  height: 8vw;
+}
 
-	.wrapper .points-total .text {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 2.8vw;
-	}
+.wrapper .points-total .text {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 2.8vw;
+}
 
-	.wrapper .points-detail {
-		padding-top: 6vw;
-	}
+.wrapper .points-detail {
+  padding-top: 6vw;
+}
 
-	.wrapper .points-detail .top {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		font-size: 3.5vw;
-		padding-bottom: 2vw;
-	}
+.wrapper .points-detail .top {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  font-size: 3.5vw;
+  padding-bottom: 2vw;
+}
 
-	.wrapper .points-detail .top p {
-		font-weight: normal;
-		user-select: none;
-		cursor: pointer;
-	}
+.wrapper .points-detail .top p {
+  font-weight: normal;
+  user-select: none;
+  cursor: pointer;
+}
 
-	.wrapper .points-detail .top p.active {
-		font-weight: bold;
-		user-select: none;
-		cursor: pointer;
-	}
+.wrapper .points-detail .top p.active {
+  font-weight: bold;
+  user-select: none;
+  cursor: pointer;
+}
 
-	.wrapper .points-detail .border {
-		width: 100%;
-		padding: 2vw 2vw 0vw 2vw;
-		box-sizing: border-box;
-	}
+.wrapper .points-detail .border {
+  width: 100%;
+  padding: 2vw 2vw 0vw 2vw;
+  box-sizing: border-box;
+}
 
-	.wrapper .points-detail .border .get-pay {
-		width: 100%;
-		background-color: #fff;
-		border-radius: 2vw;
-	}
+.wrapper .points-detail .border .get-pay {
+  width: 100%;
+  background-color: #fff;
+  border-radius: 2vw;
+}
 
-	.wrapper .points-detail .border .get-pay .li1 {
-		padding: 2vw 0vw;
-	}
+.wrapper .points-detail .border .get-pay .li1 {
+  padding: 2vw 0vw;
+}
 
-	.wrapper .points-detail .border .get-pay .details {
-		display: flex;
-		margin: 0vw 2vw;
-	}
+.wrapper .points-detail .border .get-pay .details {
+  display: flex;
+  margin: 0vw 2vw;
+}
 
-	.wrapper .points-detail .border .get-pay .details li {
-		width: 34%;
-		font-size: 2.8vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+.wrapper .points-detail .border .get-pay .details li {
+  width: 34%;
+  font-size: 2.8vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 
-	.wrapper .points-detail .border .duihuan {
-		width: 100%;
-		background-color: #fff;
-		border-radius: 2vw;
-	}
+.wrapper .points-detail .border .duihuan {
+  width: 100%;
+  background-color: #fff;
+  border-radius: 2vw;
+}
 
-	.wrapper .points-detail .border .duihuan .li1 {
-		padding: 2vw 0vw;
-	}
+.wrapper .points-detail .border .duihuan .li1 {
+  padding: 2vw 0vw;
+}
 
-	.wrapper .points-detail .border .duihuan .details {
-		display: flex;
-		margin: 0vw 2vw;
-	}
+.wrapper .points-detail .border .duihuan .details {
+  display: flex;
+  margin: 0vw 2vw;
+}
 
-	.wrapper .points-detail .border .duihuan .details li {
-		width: 34%;
-		font-size: 2.8vw;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+.wrapper .points-detail .border .duihuan .details li {
+  width: 34%;
+  font-size: 2.8vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>
\ No newline at end of file
diff --git a/elmclient/src/views/SearchResults.vue b/elmclient/src/views/SearchResults.vue
index fa613fe..e1f32c8 100644
--- a/elmclient/src/views/SearchResults.vue
+++ b/elmclient/src/views/SearchResults.vue
@@ -14,7 +14,7 @@
         <!-- 搜索框部分中间的白框 -->
         <div class="search-box">
           <i @click="toSearch()" :class="{'fa fa-search': true, 'blue-icon': keyword!==''}"></i>
-          <input type="text" v-model="keyword" @input="toSearch()" placeholder="搜索饿了么商家、商品名称">
+          <input type="text" v-model="keyword" @keydown.enter="toSearch()" @input="toSearch()" placeholder="搜索饿了么商家、商品名称">
         </div>
       </div>
     </div>
diff --git a/point.sql b/point.sql
new file mode 100644
index 0000000..797adf4
--- /dev/null
+++ b/point.sql
@@ -0,0 +1,7 @@
+CREATE TABLE point (
+    pointId INT AUTO_INCREMENT PRIMARY KEY,
+    userId VARCHAR(20),
+    pointDate VARCHAR(50),
+    pointNum INT,
+    outDate VARCHAR(50)
+);
\ No newline at end of file
diff --git a/springcloud_elm/.idea/compiler.xml b/springcloud_elm/.idea/compiler.xml
index 54b6c28..e7e0cbf 100644
--- a/springcloud_elm/.idea/compiler.xml
+++ b/springcloud_elm/.idea/compiler.xml
@@ -6,6 +6,7 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
+        <module name="coupon_server_10950" />
         <module name="food_server_10200" />
         <module name="food_server_10201" />
         <module name="eureka_server_13001" />
@@ -19,6 +20,7 @@
         <module name="user_server_10100" />
         <module name="gateway_server_14000" />
         <module name="business_server_10301" />
+        <module name="point_server_10900" />
         <module name="deliveryaddress_server_10500" />
         <module name="search_server_11600" />
         <module name="business_server_10300" />
diff --git a/springcloud_elm/.idea/encodings.xml b/springcloud_elm/.idea/encodings.xml
index a983912..95f9a58 100644
--- a/springcloud_elm/.idea/encodings.xml
+++ b/springcloud_elm/.idea/encodings.xml
@@ -13,6 +13,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" />
     <file url="file://$PROJECT_DIR$/config_server_15001/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/coupon_server_10950/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/coupon_server_10950/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/deliveryaddress_server_10500/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/deliveryaddress_server_10500/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/eureka_server_13000/src/main/java" charset="UTF-8" />
@@ -29,6 +31,8 @@
     <file url="file://$PROJECT_DIR$/orders_server_10600/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/orders_server_10601/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/orders_server_10601/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/point_server_10900/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/point_server_10900/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/search_server_11600/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/search_server_11600/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
diff --git a/springcloud_elm/.idea/misc.xml b/springcloud_elm/.idea/misc.xml
index b9120de..d54e9ba 100644
--- a/springcloud_elm/.idea/misc.xml
+++ b/springcloud_elm/.idea/misc.xml
@@ -12,9 +12,4 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-  <component name="SwUserDefinedSpecifications">
-    <option name="specTypeByUrl">
-      <map />
-    </option>
-  </component>
 </project>
\ No newline at end of file
diff --git a/springcloud_elm/.idea/runConfigurations/business_server_10300.xml b/springcloud_elm/.idea/runConfigurations/business_server_10300.xml
new file mode 100644
index 0000000..42e11a0
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/business_server_10300.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="business_server_10300" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="business_server_10300" />
+    <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/runConfigurations/business_server_10301.xml b/springcloud_elm/.idea/runConfigurations/business_server_10301.xml
new file mode 100644
index 0000000..d4decbd
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/business_server_10301.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="business_server_10301" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="business_server_10301" />
+    <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/runConfigurations/cart_server_10400.xml b/springcloud_elm/.idea/runConfigurations/cart_server_10400.xml
new file mode 100644
index 0000000..7771bcf
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/cart_server_10400.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cart_server_10400" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="cart_server_10400" />
+    <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/runConfigurations/cart_server_10401.xml b/springcloud_elm/.idea/runConfigurations/cart_server_10401.xml
new file mode 100644
index 0000000..ed2ad9c
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/cart_server_10401.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="cart_server_10401" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="cart_server_10401" />
+    <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/runConfigurations/config_server_15000.xml b/springcloud_elm/.idea/runConfigurations/config_server_15000.xml
new file mode 100644
index 0000000..eb170c4
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/config_server_15000.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="config_server_15000" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="config_server_15000" />
+    <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/runConfigurations/config_server_15001.xml b/springcloud_elm/.idea/runConfigurations/config_server_15001.xml
new file mode 100644
index 0000000..bdbaf92
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/config_server_15001.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="config_server_15001" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="config_server_15001" />
+    <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/runConfigurations/coupon_server_10950.xml b/springcloud_elm/.idea/runConfigurations/coupon_server_10950.xml
new file mode 100644
index 0000000..76fd36c
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/coupon_server_10950.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="coupon_server_10950" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="coupon_server_10950" />
+    <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/runConfigurations/deliveryaddress_server_10500.xml b/springcloud_elm/.idea/runConfigurations/deliveryaddress_server_10500.xml
new file mode 100644
index 0000000..f9ce849
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/deliveryaddress_server_10500.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="deliveryaddress_server_10500" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="deliveryaddress_server_10500" />
+    <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/runConfigurations/eureka_server_13000.xml b/springcloud_elm/.idea/runConfigurations/eureka_server_13000.xml
new file mode 100644
index 0000000..4c3f588
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/eureka_server_13000.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="eureka_server_13000" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="eureka_server_13000" />
+    <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/runConfigurations/eureka_server_13001.xml b/springcloud_elm/.idea/runConfigurations/eureka_server_13001.xml
new file mode 100644
index 0000000..cfb342f
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/eureka_server_13001.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="eureka_server_13001" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="eureka_server_13001" />
+    <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/runConfigurations/food_server_10200.xml b/springcloud_elm/.idea/runConfigurations/food_server_10200.xml
new file mode 100644
index 0000000..2203500
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/food_server_10200.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="food_server_10200" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="food_server_10200" />
+    <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/runConfigurations/food_server_10201.xml b/springcloud_elm/.idea/runConfigurations/food_server_10201.xml
new file mode 100644
index 0000000..35e2ffe
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/food_server_10201.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="food_server_10201" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="food_server_10201" />
+    <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/runConfigurations/gateway_server_14000.xml b/springcloud_elm/.idea/runConfigurations/gateway_server_14000.xml
new file mode 100644
index 0000000..b2e58b9
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/gateway_server_14000.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="gateway_server_14000" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="gateway_server_14000" />
+    <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/runConfigurations/orders_server_10600.xml b/springcloud_elm/.idea/runConfigurations/orders_server_10600.xml
new file mode 100644
index 0000000..e0be16e
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/orders_server_10600.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="orders_server_10600" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="orders_server_10600" />
+    <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/runConfigurations/orders_server_10601.xml b/springcloud_elm/.idea/runConfigurations/orders_server_10601.xml
new file mode 100644
index 0000000..467a4cd
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/orders_server_10601.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="orders_server_10601" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="orders_server_10601" />
+    <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/runConfigurations/point_server_10900.xml b/springcloud_elm/.idea/runConfigurations/point_server_10900.xml
new file mode 100644
index 0000000..89a725d
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/point_server_10900.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="point_server_10900" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="point_server_10900" />
+    <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/runConfigurations/search_server_11600.xml b/springcloud_elm/.idea/runConfigurations/search_server_11600.xml
new file mode 100644
index 0000000..1897af7
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/search_server_11600.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="search_server_11600" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="search_server_11600" />
+    <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/runConfigurations/user_server_10100.xml b/springcloud_elm/.idea/runConfigurations/user_server_10100.xml
new file mode 100644
index 0000000..04ce329
--- /dev/null
+++ b/springcloud_elm/.idea/runConfigurations/user_server_10100.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="user_server_10100" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="user_server_10100" />
+    <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
new file mode 100644
index 0000000..c724144
--- /dev/null
+++ b/springcloud_elm/.idea/sqldialects.xml
@@ -0,0 +1,7 @@
+<?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/coupon_server_10950/pom.xml b/springcloud_elm/coupon_server_10950/pom.xml
new file mode 100644
index 0000000..c53ac5e
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/pom.xml
@@ -0,0 +1,65 @@
+<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 https://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>coupon_server_10950</artifactId>
+  
+  <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </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/coupon_server_10950/src/main/java/com/neusoft/MyApplication.java b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/MyApplication.java
new file mode 100644
index 0000000..fff9695
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/MyApplication.java
@@ -0,0 +1,11 @@
+package com.neusoft;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MyApplication {
+    public static void main(String[] args){
+        SpringApplication.run(MyApplication.class,args);
+    }
+}
diff --git a/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/controller/CouponController.java b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/controller/CouponController.java
new file mode 100644
index 0000000..a91e4f9
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/controller/CouponController.java
@@ -0,0 +1,52 @@
+package com.neusoft.controller;
+
+import java.text.ParseException;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.neusoft.po.CommonResult;
+import com.neusoft.po.Coupon;
+import com.neusoft.service.CouponService;
+import com.neusoft.service.impl.CouponServiceImpl;
+
+@RestController
+@RequestMapping("/CouponController")
+public class CouponController {
+
+	@Autowired
+	public CouponServiceImpl couponService;
+	
+	@PostMapping("/saveCoupon/{userId}/{limitNum}/{minusNum}")
+    public CommonResult<Integer> listOutofDatePoint(@PathVariable("userId") String userId,@PathVariable("limitNum") int limitNum,@PathVariable("minusNum") int minusNum) throws Exception {
+        
+		Coupon coupon =new Coupon();
+		coupon.setUserId(userId);
+		coupon.setLimitNum(limitNum);
+		coupon.setMinusNum(minusNum);
+		return new CommonResult<>(200,"success",couponService.saveCoupon(coupon));
+    }
+	
+	@GetMapping("/getCouponByUserId/{userId}")
+	public CommonResult<List<Coupon>> getCouponByUserId(@PathVariable String userId) throws ParseException
+	{
+		return new CommonResult<>(200,"success",couponService.ListAvailableCoupon(userId));
+	}
+	
+	@DeleteMapping("/deleteCouponByCouponId/{couponId}")
+	public CommonResult<Integer> deleteCouponByCouponId(@PathVariable("couponId") int couponId)
+	{
+		Coupon coupon =new Coupon();
+		coupon.setCouponId(couponId);
+		return new CommonResult<>(200,"success",couponService.deleteCouponByCouponId(coupon));
+	}
+	
+}
diff --git a/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/mapper/CouponMapper.java b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/mapper/CouponMapper.java
new file mode 100644
index 0000000..c741990
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/mapper/CouponMapper.java
@@ -0,0 +1,31 @@
+package com.neusoft.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import com.neusoft.po.Coupon;
+
+@Mapper
+public interface CouponMapper {
+
+	@Select("select * from coupon where couponId=#{couponId}")
+	public Coupon getCouponByCouponId(Coupon coupon);
+	
+	@Select("select * from coupon where userId=#{userId}")
+	public List<Coupon> listCouponByUserId(Coupon coupon);
+	
+	
+	@Insert("insert into coupon values(#{couponId},#{userId},#{limitNum},#{minusNum},#{couponDate},#{outDate})")
+	@Options(useGeneratedKeys=true,keyProperty="couponId",keyColumn="couponId")
+	public int saveCoupon(Coupon coupon);
+	
+	@Delete("delete from coupon where couponId=#{couponId}")
+	public int deleteCouponByCouponId(Coupon coupon);
+	
+	
+}
diff --git a/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/po/Coupon.java b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/po/Coupon.java
new file mode 100644
index 0000000..ca2cf2d
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/po/Coupon.java
@@ -0,0 +1,83 @@
+package com.neusoft.po;
+
+public class Coupon {
+
+	public int couponId;
+	public String userId;
+	public int limitNum;
+	public int minusNum;
+	public String couponDate;
+	public String outDate;
+	
+	public Coupon()
+	{
+		
+	}
+	public Coupon(int couponId,String userId,int limitNum,int minusNum,String couponDate,String outDate)
+	{
+		this.couponId=couponId;
+		this.userId=userId;
+		this.limitNum=limitNum;
+		this.minusNum=minusNum;
+		this.couponDate=couponDate;
+		this.outDate=outDate;
+	}
+	
+	
+	public int getCouponId()
+	{
+		return this.couponId;
+	}
+	public void setCouponId(int couponId)
+	{
+		this.couponId=couponId;
+	}
+	
+	public String getUserId()
+	{
+		return this.userId;
+	}
+	public void setUserId(String userId)
+	{
+		this.userId=userId;
+	}
+	
+	public int getLimitNum()
+	{
+		return this.limitNum;
+	}
+	public void setLimitNum(int limitNum)
+	{
+		this.limitNum=limitNum;
+	}
+	
+	public int getMinusNum()
+	{
+		return this.minusNum;
+	}
+	public void setMinusNum(int minusNum)
+	{
+		this.minusNum=minusNum;
+	}
+	
+	public String getCouponDate()
+	{
+		return  this.couponDate;
+	}
+	public void setCouponDate(String couponDate)
+	{
+		this.couponDate=couponDate;
+	}
+	
+	public String getOutDate()
+
+	{
+		return this.outDate;
+	}
+	
+	public void setOutDate(String outDate)
+	{
+		this.outDate=outDate;
+	}
+	
+}
diff --git a/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/CouponService.java b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/CouponService.java
new file mode 100644
index 0000000..6d502f1
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/CouponService.java
@@ -0,0 +1,20 @@
+package com.neusoft.service;
+
+import java.text.ParseException;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.neusoft.po.Coupon;
+
+
+public interface CouponService {
+
+	public List<Coupon> ListAvailableCoupon(String userId) throws ParseException;
+	
+	public List<Coupon> ListOutCoupon(int userId) throws ParseException;
+	
+	public int saveCoupon(Coupon coupon);
+	
+	public int deleteCouponByCouponId(Coupon coupon);
+}
diff --git a/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/impl/CouponServiceImpl.java b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/impl/CouponServiceImpl.java
new file mode 100644
index 0000000..914bfd9
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/java/com/neusoft/service/impl/CouponServiceImpl.java
@@ -0,0 +1,61 @@
+package com.neusoft.service.impl;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.neusoft.mapper.CouponMapper;
+import com.neusoft.po.Coupon;
+import com.neusoft.service.CouponService;
+
+
+@Service
+public class CouponServiceImpl implements CouponService {
+
+	@Autowired
+	public CouponMapper couponMapper;
+	
+public List<Coupon> ListAvailableCoupon(String userId) throws ParseException
+{
+	
+	Coupon coupon=new Coupon();
+	coupon.setUserId(userId);
+	List<Coupon> couponList =couponMapper.listCouponByUserId(coupon);
+	
+	return couponList;
+}
+	
+	public List<Coupon> ListOutCoupon(int userId) throws ParseException
+	{
+		return null;
+	}
+	
+	public int saveCoupon(Coupon coupon)
+	{
+		
+		 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		 String formattedDate = sdf.format(new Date());
+		 Date currentDate=new Date();
+		 coupon.setCouponDate(formattedDate);
+		 Calendar calendar = Calendar.getInstance();
+		 calendar.setTime(currentDate);
+		 calendar.add(Calendar.DAY_OF_MONTH, 3);
+		 Date threeDaysLater = calendar.getTime();
+		 String outDate=sdf.format(threeDaysLater);
+		 coupon.setOutDate(outDate);
+		couponMapper.saveCoupon(coupon);
+		return 1;
+	}
+	public int deleteCouponByCouponId(Coupon coupon)
+	{
+		
+		couponMapper.deleteCouponByCouponId(coupon);
+		return 1;
+	}
+	
+}
diff --git a/springcloud_elm/coupon_server_10950/src/main/resources/bootstrap.yml b/springcloud_elm/coupon_server_10950/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..1bb8aa7
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/src/main/resources/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  cloud:
+    config:
+      name: coupon_server_10950
+      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/coupon_server_10950/target/classes/bootstrap.yml b/springcloud_elm/coupon_server_10950/target/classes/bootstrap.yml
new file mode 100644
index 0000000..1bb8aa7
--- /dev/null
+++ b/springcloud_elm/coupon_server_10950/target/classes/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  cloud:
+    config:
+      name: coupon_server_10950
+      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/gateway_server_14000/src/main/resources/application.yml b/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
index a408f74..0b72282 100644
--- a/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
+++ b/springcloud_elm/gateway_server_14000/src/main/resources/application.yml
@@ -12,10 +12,10 @@ spring:
             allowedOrigins: "*"
             allowedHeaders: "*"
             allowedMethods:
-            - GET
-            - POST
-            - PUT
-            - DELETE
+              - GET
+              - POST
+              - PUT
+              - DELETE
       default-filters:
         - name: Hystrix
           args:
@@ -45,7 +45,7 @@ spring:
         - id: deliveryaddressServer
           uri: lb://deliveryaddress-server
           predicates:
-            - Path=/DeliveryaddressController/*/**
+            - Path=/DeliveryAddressController/*/**
 
         - id: ordersServer
           uri: lb://orders-server
@@ -57,6 +57,16 @@ spring:
           predicates:
             - Path=/SearchController/*/**
 
+        - id: pointServer
+          uri: lb://point-server
+          predicates:
+            - Path=/PointController/*/**
+
+        - id: couponServer
+          uri: lb://coupon-server
+          predicates:
+            - Path=/CouponController/*/**
+
 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 a408f74..0b72282 100644
--- a/springcloud_elm/gateway_server_14000/target/classes/application.yml
+++ b/springcloud_elm/gateway_server_14000/target/classes/application.yml
@@ -12,10 +12,10 @@ spring:
             allowedOrigins: "*"
             allowedHeaders: "*"
             allowedMethods:
-            - GET
-            - POST
-            - PUT
-            - DELETE
+              - GET
+              - POST
+              - PUT
+              - DELETE
       default-filters:
         - name: Hystrix
           args:
@@ -45,7 +45,7 @@ spring:
         - id: deliveryaddressServer
           uri: lb://deliveryaddress-server
           predicates:
-            - Path=/DeliveryaddressController/*/**
+            - Path=/DeliveryAddressController/*/**
 
         - id: ordersServer
           uri: lb://orders-server
@@ -57,6 +57,16 @@ spring:
           predicates:
             - Path=/SearchController/*/**
 
+        - id: pointServer
+          uri: lb://point-server
+          predicates:
+            - Path=/PointController/*/**
+
+        - id: couponServer
+          uri: lb://coupon-server
+          predicates:
+            - Path=/CouponController/*/**
+
 eureka:
   client:
     service-url:
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 bd7e68f..8563cae 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
@@ -44,6 +44,12 @@ public class OrdersController {
         return new CommonResult<>(200,"success",list);
     }
 
+    @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);
+    }
 //    @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/point_server_10900/pom.xml b/springcloud_elm/point_server_10900/pom.xml
new file mode 100644
index 0000000..f67c8f8
--- /dev/null
+++ b/springcloud_elm/point_server_10900/pom.xml
@@ -0,0 +1,64 @@
+<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 https://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>point_server_10900</artifactId>
+  
+  <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </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/point_server_10900/src/main/java/com/neusoft/MyApplication.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/MyApplication.java
new file mode 100644
index 0000000..fff9695
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/MyApplication.java
@@ -0,0 +1,11 @@
+package com.neusoft;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class MyApplication {
+    public static void main(String[] args){
+        SpringApplication.run(MyApplication.class,args);
+    }
+}
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/controller/PointController.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/controller/PointController.java
new file mode 100644
index 0000000..2ae32b8
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/controller/PointController.java
@@ -0,0 +1,48 @@
+package com.neusoft.controller;
+
+import com.neusoft.po.CommonResult;
+import com.neusoft.po.Point;
+import com.neusoft.service.PointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/PointController")
+public class PointController {
+    @Autowired
+    private PointService pointService;
+
+    @GetMapping("/OutofDatePoints")
+    public CommonResult<List<Point>> listOutofDatePoint(@RequestParam("userId") String userId, @RequestHeader("Authorization") String token) throws Exception {
+        return new CommonResult<>(200,"success",pointService.listOutofDatePoint(userId,token));
+    }
+
+    @GetMapping("/AvailablePoints")
+    public CommonResult<List<Point>> listAvailablePoint(@RequestParam("userId") String userId, @RequestHeader("Authorization") String token) throws Exception {
+        return new CommonResult<>(200,"success",pointService.listAvailablePoint(userId,token));
+//        return null;
+    }
+    
+    @PostMapping("/addPointByPointId/{userId}/{date}/{pointNum}")
+    public CommonResult<Integer> addPointByPointId(@PathVariable("userId") String userId,@PathVariable("date") String date,@PathVariable("pointNum") Integer pointNum)
+    {
+    	System.out.println("addPointById/"+userId+"/"+date+"/"+pointNum);
+    	return new CommonResult(200,"success",pointService.addPointByPointId(userId, date, pointNum));
+    }
+    
+    @PostMapping("/updatePointNumById/{pointId}/{PointNum}")
+    public CommonResult<Integer> updatePointNumById(@PathVariable String pointId,@PathVariable int PointNum)
+    {
+    	System.out.println("pointId="+pointId+"pointNum="+PointNum);
+    	return new CommonResult(200,"success",pointService.updatePointByPointId(pointId, PointNum));
+    }
+    
+    @DeleteMapping("/deletePointByPointId/{pointId}")
+    public CommonResult<Integer> deletePointByPointId(@PathVariable("pointId") String pointId)
+    {
+    	return new CommonResult(200,"success",pointService.deletePointByPointId(pointId));
+    }
+    
+}
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/PointMapper.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/PointMapper.java
new file mode 100644
index 0000000..cbe35db
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/PointMapper.java
@@ -0,0 +1,31 @@
+package com.neusoft.mapper;
+
+
+import com.neusoft.po.Point;
+
+import feign.Param;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+@Mapper
+public interface PointMapper {
+    @Select("select * from point where userId=#{userId}")
+    public List<Point> listPointsByUserId(String userId);
+
+    @Update("update point set pointNum=#{pointNum} where pointId=#{pointId}")
+    public void setPointByPointId(Point point);
+
+    @Delete("delete from point where pointId=#{pointId}")
+    public void deletePointByPointId(String pointId);
+
+    @Select("insert into point(userId,pointDate,pointNum,outDate) values(#{userId},#{pointDate},#{pointNum},#{outDate})")
+    @Options(useGeneratedKeys=true,keyProperty="pointId",keyColumn="pointId")
+    public void addPointByPointId(Point point);
+    
+}
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/UserMapper.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/UserMapper.java
new file mode 100644
index 0000000..ea585ed
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/mapper/UserMapper.java
@@ -0,0 +1,18 @@
+package com.neusoft.mapper;
+
+import com.neusoft.po.User;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface UserMapper {
+	 @Select("select * from user where userId=#{userId} and password=#{password}")
+	 public User getUserByIdByPass(User user);
+	 
+	 @Select("select count(*) from user where userId=#{userId}")
+	 public int getUserById(String userId);
+	 
+	 @Insert("insert into user values(#{userId},#{password},#{userName},#{userSex},null,1)")
+	 public int saveUser(User user);
+}
\ No newline at end of file
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/CommonResult.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/CommonResult.java
new file mode 100644
index 0000000..84f1b51
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/CommonResult.java
@@ -0,0 +1,41 @@
+package com.neusoft.po;
+
+import java.io.Serializable;
+
+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/point_server_10900/src/main/java/com/neusoft/po/Point.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/Point.java
new file mode 100644
index 0000000..cc693b4
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/Point.java
@@ -0,0 +1,63 @@
+package com.neusoft.po;
+
+public class Point {
+
+	private String pointId;
+	private String userId;
+	private String pointDate;
+	private Integer pointNum;
+	private String outDate;
+	public Point()
+	{
+		
+	}
+	
+	public Point(String pointId,String userId,String pointDate,Integer pointNum,String outDate)
+	{
+		this.pointId=pointId;
+		this.userId=userId;
+		this.pointDate=pointDate;
+		this.pointNum=pointNum;
+		this.outDate=outDate;
+	}
+	
+	public String getPointId()
+	{
+		return this.pointId;
+	}
+	public String getUserId()
+	{
+		return this.userId;
+	}
+	public String getPointDate()
+	{
+		return this.pointDate;
+	}
+	public Integer getPointNum()
+	{
+		return this.pointNum;
+	}
+	
+	public void setPointId(String pointId)
+	{
+		this.pointId=pointId;
+	}
+	public void setUserId(String userId)
+	{
+		this.userId=userId;
+	}
+	public void setPointDate(String pointDate)
+	{
+		this.pointDate=pointDate;
+	}
+	public void setPointNum(Integer pointNum)
+	{
+		this.pointNum=pointNum;
+	}
+	public String getOutDate() {
+		return outDate;
+	}
+	public void setOutDate(String outDate) {
+		this.outDate = outDate;
+	}
+}
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/User.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/User.java
new file mode 100644
index 0000000..711644a
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/po/User.java
@@ -0,0 +1,59 @@
+package com.neusoft.po;
+
+public class User {
+
+    private String userId;
+    private String password;
+    private String userName;
+    private Integer userSex;
+    private String userImg;
+    private Integer delTag;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getUserSex() {
+        return userSex;
+    }
+
+    public void setUserSex(Integer userSex) {
+        this.userSex = userSex;
+    }
+
+    public String getUserImg() {
+        return userImg;
+    }
+
+    public void setUserImg(String userImg) {
+        this.userImg = userImg;
+    }
+
+    public Integer getDelTag() {
+        return delTag;
+    }
+
+    public void setDelTag(Integer delTag) {
+        this.delTag = delTag;
+    }
+}
\ No newline at end of file
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/PointService.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/PointService.java
new file mode 100644
index 0000000..c071988
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/PointService.java
@@ -0,0 +1,21 @@
+package com.neusoft.service;
+
+import java.text.ParseException;
+import java.util.List;
+
+import com.neusoft.po.Point;
+
+public interface PointService {
+    public List<Point> listOutofDatePoint(String userId, String token) throws ParseException;
+
+    public List<Point> listAvailablePoint(String userId, String token) throws ParseException;
+    
+    
+    public int addPointByPointId(String userId,String date,Integer pointNum);
+    
+    public int updatePointByPointId(String pointId,int PointNum);
+    
+    public int deletePointByPointId(String pointId);
+    
+    
+}
diff --git a/springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/impl/PointServiceImpl.java b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/impl/PointServiceImpl.java
new file mode 100644
index 0000000..acef530
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/java/com/neusoft/service/impl/PointServiceImpl.java
@@ -0,0 +1,109 @@
+package com.neusoft.service.impl;
+
+import com.neusoft.mapper.PointMapper;
+import com.neusoft.mapper.UserMapper;
+import com.neusoft.po.Point;
+import com.neusoft.po.User;
+import com.neusoft.service.PointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class PointServiceImpl implements PointService {
+    @Autowired
+    private PointMapper pointMapper;
+
+    @Autowired
+    private UserMapper userMapper0;
+
+    @Override
+    public List<Point> listOutofDatePoint(String userId, String token) throws ParseException {
+        User user = new User();
+        user.setUserId(userId);
+        user.setPassword(token);
+        if (userMapper0.getUserByIdByPass(user) == null) return null;
+
+        List<Point> list = new ArrayList<>();
+
+        try {
+            list = pointMapper.listPointsByUserId(userId);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            for (Point i : list) {
+                i.setOutDate(sdf.format(new Date(sdf.parse(i.getPointDate()).getTime() + 15552000000L)));
+                sdf.parse(i.getPointDate());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<Point> res = new ArrayList<Point>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date now = new Date();
+        for (Point i : list) {
+            if (sdf.parse(i.getOutDate()).before(now)) {
+                res.add(i);
+            }
+        }
+        return res;
+    }
+
+    @Override
+    public List<Point> listAvailablePoint(String userId, String token) throws ParseException {
+        User user = new User();
+        user.setUserId(userId);
+        user.setPassword(token);
+
+        if(userMapper0.getUserByIdByPass(user) == null) return null;
+
+        List<Point> list = new ArrayList<>();
+
+        try {
+            list = pointMapper.listPointsByUserId(userId);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            for (Point i : list) {
+                i.setOutDate(sdf.format(new Date(sdf.parse(i.getPointDate()).getTime() + 15552000000L)));
+                sdf.parse(i.getPointDate());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        List<Point> res = new ArrayList<Point>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date now = new Date();
+        for (Point i : list) {
+            if (!sdf.parse(i.getOutDate()).before(now)) {
+                res.add(i);
+            }
+        }
+        return res;
+    }
+    
+    //积分系统新增方法
+    @Override
+    public int addPointByPointId(String userId,String date,Integer pointNum)
+    {
+    	Point point=new Point(null,userId,date,pointNum,null);
+    	pointMapper.addPointByPointId(point);
+    	return 1;
+    }
+    
+    @Override
+    public int updatePointByPointId(String PointId,int pointNum)
+    {
+    	Point point =new Point(PointId,null,null,pointNum,null);
+    	pointMapper.setPointByPointId(point);
+    	return 1;
+    }
+    
+    public int deletePointByPointId(String pointId)
+    {
+    	
+    	pointMapper.deletePointByPointId(pointId);
+    	return 1;
+    }
+}
diff --git a/springcloud_elm/point_server_10900/src/main/resources/bootstrap.yml b/springcloud_elm/point_server_10900/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..78e7b82
--- /dev/null
+++ b/springcloud_elm/point_server_10900/src/main/resources/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  cloud:
+    config:
+      name: point_server_10900
+      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/point_server_10900/target/classes/bootstrap.yml b/springcloud_elm/point_server_10900/target/classes/bootstrap.yml
new file mode 100644
index 0000000..78e7b82
--- /dev/null
+++ b/springcloud_elm/point_server_10900/target/classes/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+  cloud:
+    config:
+      name: point_server_10900
+      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/pom.xml b/springcloud_elm/pom.xml
index 54652e8..87def86 100644
--- a/springcloud_elm/pom.xml
+++ b/springcloud_elm/pom.xml
@@ -23,7 +23,9 @@
         <module>orders_server_10601</module>
         <module>config_server_15000</module>
         <module>config_server_15001</module>
-        <module>search_server_116000</module>
+        <module>search_server_11600</module>
+        <module>point_server_10900</module>
+        <module>coupon_server_10950</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/springcloud_elm/search_server_11600/src/main/java/com/neusoft/MyApplication.java b/springcloud_elm/search_server_11600/src/main/java/com/neusoft/MyApplication.java
index 556aefa..fff9695 100644
--- a/springcloud_elm/search_server_11600/src/main/java/com/neusoft/MyApplication.java
+++ b/springcloud_elm/search_server_11600/src/main/java/com/neusoft/MyApplication.java
@@ -1,7 +1,5 @@
 package com.neusoft;
 
-import org.ansj.domain.Result;
-import org.ansj.splitWord.analysis.ToAnalysis;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
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 9a6fd64..76d51bd 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
@@ -26,7 +26,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 foodMapper.listFoodByKeyWord(keywords);
     }