Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Evan Liu
hms
提交
13e46ea1
H
hms
项目概览
Evan Liu
/
hms
通知
10
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
H
hms
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
13e46ea1
编写于
8月 17, 2021
作者:
N
nrd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改了fee_info的数据类型
上级
b0a85ed2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
34 deletion
+33
-34
HMS/src/main/java/com/hqyj/seven/controller/AlipayCallbackController.java
...a/com/hqyj/seven/controller/AlipayCallbackController.java
+0
-2
HMS/src/main/java/com/hqyj/seven/pojo/Enter.java
HMS/src/main/java/com/hqyj/seven/pojo/Enter.java
+27
-28
HMS/src/main/java/com/hqyj/seven/service/impl/HouseServiceImpl.java
...in/java/com/hqyj/seven/service/impl/HouseServiceImpl.java
+6
-4
未找到文件。
HMS/src/main/java/com/hqyj/seven/controller/AlipayCallbackController.java
浏览文件 @
13e46ea1
...
...
@@ -96,9 +96,7 @@ public class AlipayCallbackController {
//注意:
//付款完成后,支付宝系统发送该交易状态通知
}
out
.
println
(
"success"
);
}
else
{
//验证失败
out
.
println
(
"fail"
);
...
...
HMS/src/main/java/com/hqyj/seven/pojo/Enter.java
浏览文件 @
13e46ea1
...
...
@@ -12,7 +12,7 @@ public class Enter {
private
Date
end_time_estimate
;
private
Date
end_time_actual
;
private
double
fee_total
;
private
int
fee_info
;
private
String
fee_info
;
private
int
user_id
;
private
String
state
;
private
double
price
;
...
...
@@ -21,6 +21,20 @@ public class Enter {
private
String
end_time_estimate1
;
private
String
end_time_actual1
;
public
Enter
(
int
house_id
,
int
customer_id
,
int
customer_info
,
Date
start_time
,
Date
end_time_estimate
,
Date
end_time_actual
,
double
fee_total
,
String
fee_info
,
int
user_id
,
String
state
,
double
price
)
{
this
.
house_id
=
house_id
;
this
.
customer_id
=
customer_id
;
this
.
customer_info
=
customer_info
;
this
.
start_time
=
start_time
;
this
.
end_time_estimate
=
end_time_estimate
;
this
.
end_time_actual
=
end_time_actual
;
this
.
fee_total
=
fee_total
;
this
.
fee_info
=
fee_info
;
this
.
user_id
=
user_id
;
this
.
state
=
state
;
this
.
price
=
price
;
}
public
String
getStart_time1
()
{
return
start_time1
;
}
...
...
@@ -135,13 +149,7 @@ public class Enter {
this
.
fee_total
=
fee_total
;
}
public
int
getFee_info
()
{
return
fee_info
;
}
public
void
setFee_info
(
int
fee_info
)
{
this
.
fee_info
=
fee_info
;
}
public
int
getUser_id
()
{
return
user_id
;
...
...
@@ -159,14 +167,20 @@ public class Enter {
this
.
state
=
state
;
}
public
String
getFee_info
()
{
return
fee_info
;
}
public
void
setFee_info
(
String
fee_info
)
{
this
.
fee_info
=
fee_info
;
}
public
void
setPrice
(
float
price
)
{
this
.
price
=
price
;
}
public
Enter
(
int
house_id
,
int
customer_id
,
int
customer_info
,
Date
start_time
,
Date
end_time_estimate
,
Date
end_time_actual
,
double
fee_total
,
int
fee_info
,
int
user_id
,
String
state
,
double
price
)
{
public
Enter
(
int
house_id
,
int
customer_id
,
int
customer_info
,
Date
start_time
,
Date
end_time_estimate
,
Date
end_time_actual
,
double
fee_total
,
String
fee_info
,
int
user_id
,
String
state
,
double
price
,
String
start_time1
,
String
end_time_estimate1
,
String
end_time_actual1
,
List
<
Customer
>
customers
)
{
this
.
enter_id
=
enter_id
;
this
.
house_id
=
house_id
;
this
.
customer_id
=
customer_id
;
this
.
customer_info
=
customer_info
;
...
...
@@ -178,27 +192,12 @@ public class Enter {
this
.
user_id
=
user_id
;
this
.
state
=
state
;
this
.
price
=
price
;
this
.
start_time1
=
start_time1
;
this
.
end_time_estimate1
=
end_time_estimate1
;
this
.
end_time_actual1
=
end_time_actual1
;
this
.
customers
=
customers
;
}
public
Enter
()
{
}
@Override
public
String
toString
()
{
return
"Enter{"
+
"enter_id="
+
enter_id
+
", house_id='"
+
house_id
+
'\''
+
", customer_id="
+
customer_id
+
", customer_info='"
+
customer_info
+
'\''
+
", start_time1='"
+
start_time1
+
'\''
+
", end_time_estimate1='"
+
end_time_estimate1
+
'\''
+
", end_time_actual1='"
+
end_time_actual1
+
'\''
+
", fee_total="
+
fee_total
+
", fee_info="
+
fee_info
+
", user_id="
+
user_id
+
", state='"
+
state
+
'\''
+
", price="
+
price
+
", customers="
+
customers
+
'}'
;
}
}
HMS/src/main/java/com/hqyj/seven/service/impl/HouseServiceImpl.java
浏览文件 @
13e46ea1
...
...
@@ -332,6 +332,7 @@ public class HouseServiceImpl implements HouseService {
Date
time3
=
new
Date
(
time2
);
//如果房间是空闲则之间可以入住
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
String
fee_info
=
Long
.
toString
(
System
.
currentTimeMillis
());
if
(
house
.
getState
().
equals
(
"空闲"
))
{
double
money
=
house
.
getPrice
()
*
day
;
//如果余额不足则会提示
...
...
@@ -340,7 +341,7 @@ public class HouseServiceImpl implements HouseService {
customerDao
.
updataByCustomerIdToremainder
(
0
,
customerId
);
//插入顾客表
enterDao
.
inserintoEnter
(
new
Enter
(
house
.
getHouseId
(),
customerId
,
numberOfPeople
,
time
,
time3
,
null
,
0
,
1
,
userId
,
"未结账"
,
house
.
getPrice
()));
numberOfPeople
,
time
,
time3
,
null
,
0
,
fee_info
,
userId
,
"未结账"
,
house
.
getPrice
()));
//设置时间格式为yyyy-MM-dd HH:mm:ss以便插入
//规范化插入表时的时间和获取的时间有点误差
Enter
enter
=
enterDao
.
queryByHouseIdAndLimitOne
(
house
.
getHouseId
());
...
...
@@ -354,9 +355,10 @@ public class HouseServiceImpl implements HouseService {
}
else
{
//更新顾客表余额的数据
customerDao
.
updataByCustomerIdToremainder
(
money
,
customerId
);
//插入顾客表
enterDao
.
inserintoEnter
(
new
Enter
(
house
.
getHouseId
(),
customerId
,
numberOfPeople
,
time
,
time3
,
null
,
money
,
1
,
userId
,
"已结账"
,
house
.
getPrice
()));
numberOfPeople
,
time
,
time3
,
null
,
money
,
fee_info
,
userId
,
"已结账"
,
house
.
getPrice
()));
//设置时间格式为yyyy-MM-dd HH:mm:ss以便插入
//规范化插入表时的时间和获取的时间有点误差
Enter
enter
=
enterDao
.
queryByHouseIdAndLimitOne
(
house
.
getHouseId
());
...
...
@@ -379,7 +381,7 @@ public class HouseServiceImpl implements HouseService {
customerDao
.
updataByCustomerIdToremainder
(
0
,
customerId
);
//插入顾客表
enterDao
.
inserintoEnter
(
new
Enter
(
house
.
getHouseId
(),
customerId
,
numberOfPeople
,
time
,
time3
,
null
,
0
,
1
,
userId
,
"未缴费"
,
house
.
getPrice
()));
numberOfPeople
,
time
,
time3
,
null
,
0
,
fee_info
,
userId
,
"未缴费"
,
house
.
getPrice
()));
//设置时间格式为yyyy-MM-dd HH:mm:ss以便插入
//规范化插入表时的时间和获取的时间有点误差
Enter
enter
=
enterDao
.
queryByHouseIdAndLimitOne
(
house
.
getHouseId
());
...
...
@@ -397,7 +399,7 @@ public class HouseServiceImpl implements HouseService {
customerDao
.
updataByCustomerIdToremainder
(
money
,
customerId
);
//插入顾客表
enterDao
.
inserintoEnter
(
new
Enter
(
house
.
getHouseId
(),
customerId
,
numberOfPeople
,
time
,
time3
,
null
,
money
,
1
,
userId
,
"已结账"
,
house
.
getPrice
()));
numberOfPeople
,
time
,
time3
,
null
,
money
,
fee_info
,
userId
,
"已结账"
,
house
.
getPrice
()));
//设置时间格式为yyyy-MM-dd HH:mm:ss以便插入
//规范化插入表时的时间和获取的时间有点误差
Enter
enter
=
enterDao
.
queryByHouseIdAndLimitOne
(
house
.
getHouseId
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录