Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
Z
zion
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
1
合并请求
1
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
zhengfg
zion
Commits
1fa418e2
提交
1fa418e2
authored
12月 09, 2019
作者:
luojie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复测试版邮箱不能发送邮件问题
上级
7b0083fe
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
22 行增加
和
4 行删除
+22
-4
StripePay.java
.../java/com/diaoyun/zion/chinafrica/bis/impl/StripePay.java
+1
-0
TbCfOrderController.java
...aoyun/zion/chinafrica/controller/TbCfOrderController.java
+1
-3
TbCfOrderDao.java
...in/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java
+2
-0
TbCfOrderService.java
...com/diaoyun/zion/chinafrica/service/TbCfOrderService.java
+1
-0
TbCfOrderServiceImpl.java
...un/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
+2
-1
EmailHelper.java
src/main/java/com/diaoyun/zion/master/util/EmailHelper.java
+2
-0
TbCfOrderDao.xml
src/main/resources/mapper/TbCfOrderDao.xml
+13
-0
没有找到文件。
src/main/java/com/diaoyun/zion/chinafrica/bis/impl/StripePay.java
浏览文件 @
1fa418e2
...
@@ -29,4 +29,5 @@ public class StripePay {
...
@@ -29,4 +29,5 @@ public class StripePay {
chargeParams
.
put
(
"source"
,
token
);
chargeParams
.
put
(
"source"
,
token
);
return
Charge
.
create
(
chargeParams
);
return
Charge
.
create
(
chargeParams
);
}
}
}
}
src/main/java/com/diaoyun/zion/chinafrica/controller/TbCfOrderController.java
浏览文件 @
1fa418e2
...
@@ -37,7 +37,6 @@ public class TbCfOrderController {
...
@@ -37,7 +37,6 @@ public class TbCfOrderController {
@ApiOperation
(
"用户确定下单"
)
@ApiOperation
(
"用户确定下单"
)
@PostMapping
(
"/place"
)
@PostMapping
(
"/place"
)
public
Result
placeOrder
(
@ApiParam
(
"订单详情"
)
@RequestBody
TbCfOrderVo
tbCfOrderVo
,
@ApiParam
(
"发放ID"
)
@RequestParam
(
value
=
"toitableId"
,
required
=
false
)
String
toitableId
)
throws
IOException
,
URISyntaxException
,
ExecutionException
,
InterruptedException
,
TimeoutException
{
public
Result
placeOrder
(
@ApiParam
(
"订单详情"
)
@RequestBody
TbCfOrderVo
tbCfOrderVo
,
@ApiParam
(
"发放ID"
)
@RequestParam
(
value
=
"toitableId"
,
required
=
false
)
String
toitableId
)
throws
IOException
,
URISyntaxException
,
ExecutionException
,
InterruptedException
,
TimeoutException
{
System
.
out
.
println
(
"发放Id"
+
toitableId
);
return
tbCfOrderService
.
placeOrder
(
tbCfOrderVo
,
toitableId
);
return
tbCfOrderService
.
placeOrder
(
tbCfOrderVo
,
toitableId
);
}
}
/**
/**
...
@@ -64,7 +63,6 @@ public class TbCfOrderController {
...
@@ -64,7 +63,6 @@ public class TbCfOrderController {
public
Result
payForOrder
(
@ApiParam
(
"订单id"
)
@PathVariable
(
"orderId"
)
String
orderId
,
@ApiParam
(
"支付token"
)
@PathVariable
(
"token"
)
String
token
)
{
public
Result
payForOrder
(
@ApiParam
(
"订单id"
)
@PathVariable
(
"orderId"
)
String
orderId
,
@ApiParam
(
"支付token"
)
@PathVariable
(
"token"
)
String
token
)
{
return
tbCfOrderService
.
payForOrder
(
orderId
,
token
);
return
tbCfOrderService
.
payForOrder
(
orderId
,
token
);
}
}
@ApiOperation
(
"根据订单id,查询物流详情"
)
@ApiOperation
(
"根据订单id,查询物流详情"
)
@GetMapping
(
"/express/{orderId}"
)
@GetMapping
(
"/express/{orderId}"
)
public
Result
queryOrderExpressInfo
(
@ApiParam
(
"订单id"
)
@PathVariable
String
orderId
)
throws
IOException
{
public
Result
queryOrderExpressInfo
(
@ApiParam
(
"订单id"
)
@PathVariable
String
orderId
)
throws
IOException
{
...
...
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java
浏览文件 @
1fa418e2
package
com
.
diaoyun
.
zion
.
chinafrica
.
dao
;
package
com
.
diaoyun
.
zion
.
chinafrica
.
dao
;
import
com.diaoyun.zion.chinafrica.entity.*
;
import
com.diaoyun.zion.chinafrica.entity.*
;
import
com.diaoyun.zion.chinafrica.vo.TbCfOrderVo
;
import
com.diaoyun.zion.master.dao.BaseDao
;
import
com.diaoyun.zion.master.dao.BaseDao
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -67,4 +68,5 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
...
@@ -67,4 +68,5 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
*/
*/
String
getOrdersId
(
String
orderId
,
String
itemId
);
String
getOrdersId
(
String
orderId
,
String
itemId
);
TbCfOrderVo
getOrders
(
String
orderId
);
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/TbCfOrderService.java
浏览文件 @
1fa418e2
...
@@ -171,4 +171,5 @@ public interface TbCfOrderService {
...
@@ -171,4 +171,5 @@ public interface TbCfOrderService {
Result
getDescriptionById
(
String
descriptionId
);
Result
getDescriptionById
(
String
descriptionId
);
}
}
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
浏览文件 @
1fa418e2
...
@@ -173,7 +173,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
...
@@ -173,7 +173,6 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
@Override
@Override
public
Result
placeOrder
(
TbCfOrderVo
pageOrder
,
String
toitableId
)
throws
IOException
,
URISyntaxException
,
ExecutionException
,
InterruptedException
,
TimeoutException
{
public
Result
placeOrder
(
TbCfOrderVo
pageOrder
,
String
toitableId
)
throws
IOException
,
URISyntaxException
,
ExecutionException
,
InterruptedException
,
TimeoutException
{
System
.
out
.
println
(
toitableId
+
"发放ID"
);
Result
<
TbCfOrderVo
>
result
=
new
Result
<>();
Result
<
TbCfOrderVo
>
result
=
new
Result
<>();
//获取用户
//获取用户
String
token
=
jwtTokenProvider
.
resolveToken
(
request
);
String
token
=
jwtTokenProvider
.
resolveToken
(
request
);
...
@@ -326,6 +325,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
...
@@ -326,6 +325,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
return
result
;
return
result
;
}
}
/**
/**
* 查询物流信息
* 查询物流信息
*
*
...
@@ -479,6 +479,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
...
@@ -479,6 +479,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
}
}
/**
/**
* 记录财务流水
* 记录财务流水
*
*
...
...
src/main/java/com/diaoyun/zion/master/util/EmailHelper.java
浏览文件 @
1fa418e2
...
@@ -40,6 +40,8 @@ public class EmailHelper {
...
@@ -40,6 +40,8 @@ public class EmailHelper {
String
html
=
FreeMarkerTemplateUtils
.
processTemplateIntoString
(
t
,
model
);
String
html
=
FreeMarkerTemplateUtils
.
processTemplateIntoString
(
t
,
model
);
HtmlEmail
email
=
new
HtmlEmail
();
//创建一个HtmlEmail实例对象
HtmlEmail
email
=
new
HtmlEmail
();
//创建一个HtmlEmail实例对象
email
.
setHostName
(
domainProperties
.
getProperty
(
"email.hostName"
));
//邮箱的SMTP服务器,一般123邮箱的是smtp.123.com,qq邮箱为smtp.qq.com
email
.
setHostName
(
domainProperties
.
getProperty
(
"email.hostName"
));
//邮箱的SMTP服务器,一般123邮箱的是smtp.123.com,qq邮箱为smtp.qq.com
email
.
setSslSmtpPort
(
"465"
);
email
.
setSSLOnConnect
(
true
);
email
.
setCharset
(
Consts
.
UTF_8
.
name
());
//设置发送的字符类型
email
.
setCharset
(
Consts
.
UTF_8
.
name
());
//设置发送的字符类型
//email.addTo("zhengfanguang@163.com");//设置收件人
//email.addTo("zhengfanguang@163.com");//设置收件人
email
.
addTo
(
toEmail
);
//设置收件人
email
.
addTo
(
toEmail
);
//设置收件人
...
...
src/main/resources/mapper/TbCfOrderDao.xml
浏览文件 @
1fa418e2
...
@@ -80,6 +80,19 @@
...
@@ -80,6 +80,19 @@
from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id
from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id
where r.order_item_id = #{id}
where r.order_item_id = #{id}
</select>
</select>
<select
id=
"getOrders"
resultType=
"com.diaoyun.zion.chinafrica.entity.OrderEntity"
>
select
r.order_item_id order_id,
o.order_no,
o.user_name,
o.delivery_address,
o.delivery_name,
o.delivery_phone
from tb_cf_order o left join tb_cf_item_order_r r on r.order_id=o.order_id
where r.order_item_id = #{id}
</select>
<select
id=
"queryList"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"
>
<select
id=
"queryList"
resultType=
"com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity"
>
select
select
`order_id`,
`order_id`,
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论