Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zhiliao
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zhiliao
Commits
0bd90288
提交
0bd90288
authored
5月 28, 2020
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
982a51db
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
12 行增加
和
8 行删除
+12
-8
WapOrderForm.java
...ain/java/com/zrqx/order/commons/form/fg/WapOrderForm.java
+3
-0
FgOrderController.java
.../java/com/zrqx/order/fg/controller/FgOrderController.java
+1
-1
FgOrderService.java
...c/main/java/com/zrqx/order/fg/service/FgOrderService.java
+1
-1
FgOrderServiceImpl.java
...in/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java
+2
-2
FgPayController.java
...main/java/com/zrqx/pay/fg/controller/FgPayController.java
+2
-2
FgPayService.java
...y/src/main/java/com/zrqx/pay/fg/service/FgPayService.java
+1
-1
FgPayServiceImpl.java
...c/main/java/com/zrqx/pay/fg/service/FgPayServiceImpl.java
+2
-1
没有找到文件。
app/order/src/main/java/com/zrqx/order/commons/form/fg/WapOrderForm.java
浏览文件 @
0bd90288
...
@@ -11,5 +11,8 @@ public class WapOrderForm extends FgOrderForm{
...
@@ -11,5 +11,8 @@ public class WapOrderForm extends FgOrderForm{
@ApiModelProperty
(
"订单号"
)
@ApiModelProperty
(
"订单号"
)
private
String
code
;
private
String
code
;
@ApiModelProperty
(
"trade_type=JSAPI时(即公众号支付),此参数必传,此参数为微信用户在商户对应appid下的唯一标识"
)
private
String
openid
;
}
}
app/order/src/main/java/com/zrqx/order/fg/controller/FgOrderController.java
浏览文件 @
0bd90288
...
@@ -100,7 +100,7 @@ public class FgOrderController {
...
@@ -100,7 +100,7 @@ public class FgOrderController {
public
CallBack
<
PayInfoVo
>
createOrderAndPay
(
@RequestBody
WapOrderForm
form
){
public
CallBack
<
PayInfoVo
>
createOrderAndPay
(
@RequestBody
WapOrderForm
form
){
Integer
orderId
=
fgOrderService
.
createOrder
(
form
);
Integer
orderId
=
fgOrderService
.
createOrder
(
form
);
Order
o
=
fgOrderService
.
notNull
(
orderId
);
Order
o
=
fgOrderService
.
notNull
(
orderId
);
return
CallBack
.
success
(
fgOrderService
.
payWap
(
o
,
form
.
getSource
(),
form
.
getPayType
()));
return
CallBack
.
success
(
fgOrderService
.
payWap
(
o
,
form
.
getSource
(),
form
.
getPayType
()
,
form
.
getOpenid
()
));
}
}
...
...
app/order/src/main/java/com/zrqx/order/fg/service/FgOrderService.java
浏览文件 @
0bd90288
...
@@ -57,7 +57,7 @@ public interface FgOrderService extends BaseService<Order, Integer>{
...
@@ -57,7 +57,7 @@ public interface FgOrderService extends BaseService<Order, Integer>{
* @author lpf
* @author lpf
* @date 2020-04-09 10:49
* @date 2020-04-09 10:49
*/
*/
PayInfoVo
payWap
(
Order
order
,
String
source
,
String
payType
);
PayInfoVo
payWap
(
Order
order
,
String
source
,
String
payType
,
String
openid
);
/**
/**
* 接收三方调用----拿到支付回调修改订单状态
* 接收三方调用----拿到支付回调修改订单状态
...
...
app/order/src/main/java/com/zrqx/order/fg/service/FgOrderServiceImpl.java
浏览文件 @
0bd90288
...
@@ -203,8 +203,8 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
...
@@ -203,8 +203,8 @@ public class FgOrderServiceImpl extends BaseServiceImpl<Order, Integer> implemen
}
}
@Override
@Override
public
PayInfoVo
payWap
(
Order
order
,
String
source
,
String
payType
)
{
public
PayInfoVo
payWap
(
Order
order
,
String
source
,
String
payType
,
String
openid
)
{
CallBack
<
PayInfoVo
>
result
=
fgPayClient
.
pay
(
order
.
getCode
(),
source
,
payType
);
CallBack
<
PayInfoVo
>
result
=
fgPayClient
.
pay
(
order
.
getCode
(),
source
,
payType
,
openid
);
if
(
PayTypeEnum
.
BALANCE
.
getCode
().
equals
(
payType
))
{
if
(
PayTypeEnum
.
BALANCE
.
getCode
().
equals
(
payType
))
{
OrderTypeInterface
orderTypeService
=
springContext
.
getEnumsBindBean
(
OrderTypeEnum
.
class
,
order
.
getOrderType
(),
OrderTypeInterface
.
class
);
OrderTypeInterface
orderTypeService
=
springContext
.
getEnumsBindBean
(
OrderTypeEnum
.
class
,
order
.
getOrderType
(),
OrderTypeInterface
.
class
);
if
(
result
.
hasEntity
()
&&
result
.
getData
().
getIsPay
())
{
if
(
result
.
hasEntity
()
&&
result
.
getData
().
getIsPay
())
{
...
...
app/pay/src/main/java/com/zrqx/pay/fg/controller/FgPayController.java
浏览文件 @
0bd90288
...
@@ -35,8 +35,8 @@ public class FgPayController {
...
@@ -35,8 +35,8 @@ public class FgPayController {
@ApiOperation
(
"支付(根据不同的来源和支付类型发起支付)"
)
@ApiOperation
(
"支付(根据不同的来源和支付类型发起支付)"
)
@GetMapping
(
"/pay-wap"
)
@GetMapping
(
"/pay-wap"
)
public
CallBack
<
PayInfoVo
>
pay
(
String
orderCode
,
String
source
,
String
payType
)
{
public
CallBack
<
PayInfoVo
>
pay
(
String
orderCode
,
String
source
,
String
payType
,
String
openid
)
{
return
CallBack
.
success
(
fgPayService
.
pay
(
orderCode
,
source
,
payType
));
return
CallBack
.
success
(
fgPayService
.
pay
(
orderCode
,
source
,
payType
,
openid
));
}
}
@ApiOperation
(
"接收三方调用----获取订单详情"
)
@ApiOperation
(
"接收三方调用----获取订单详情"
)
...
...
app/pay/src/main/java/com/zrqx/pay/fg/service/FgPayService.java
浏览文件 @
0bd90288
...
@@ -26,7 +26,7 @@ public interface FgPayService {
...
@@ -26,7 +26,7 @@ public interface FgPayService {
* @author lpf
* @author lpf
* @date 2020-04-09 11:27
* @date 2020-04-09 11:27
*/
*/
PayInfoVo
pay
(
String
orderCode
,
String
source
,
String
payType
);
PayInfoVo
pay
(
String
orderCode
,
String
source
,
String
payType
,
String
openid
);
/**
/**
* 调用订单----获取订单详情
* 调用订单----获取订单详情
...
...
app/pay/src/main/java/com/zrqx/pay/fg/service/FgPayServiceImpl.java
浏览文件 @
0bd90288
...
@@ -113,7 +113,7 @@ public class FgPayServiceImpl implements FgPayService {
...
@@ -113,7 +113,7 @@ public class FgPayServiceImpl implements FgPayService {
@Override
@Override
public
PayInfoVo
pay
(
String
orderCode
,
String
source
,
String
payType
)
{
public
PayInfoVo
pay
(
String
orderCode
,
String
source
,
String
payType
,
String
openid
)
{
if
(
fgPayRecordManage
.
checkOrderIsConsume
(
orderCode
))
{
if
(
fgPayRecordManage
.
checkOrderIsConsume
(
orderCode
))
{
log
.
error
(
"订单:"
+
orderCode
+
"已经被支付"
);
log
.
error
(
"订单:"
+
orderCode
+
"已经被支付"
);
return
new
PayInfoVo
(
false
,
null
,
"该订单已经被支付"
);
return
new
PayInfoVo
(
false
,
null
,
"该订单已经被支付"
);
...
@@ -143,6 +143,7 @@ public class FgPayServiceImpl implements FgPayService {
...
@@ -143,6 +143,7 @@ public class FgPayServiceImpl implements FgPayService {
ToPayForm
toPayForm
=
new
ToPayForm
();
ToPayForm
toPayForm
=
new
ToPayForm
();
toPayForm
.
setOut_trade_no
(
orderCode
);
toPayForm
.
setOut_trade_no
(
orderCode
);
toPayForm
.
setPayType
(
payType
);
toPayForm
.
setPayType
(
payType
);
toPayForm
.
setOpenid
(
openid
);
// if(PayTypeEnum.WECHAT.getCode().equals(payType)){
// if(PayTypeEnum.WECHAT.getCode().equals(payType)){
if
(
SourceEnum
.
PC
.
getCode
().
equals
(
source
))
{
if
(
SourceEnum
.
PC
.
getCode
().
equals
(
source
))
{
toPayForm
.
setTrade_type
(
WeChartType
.
NATIVE
.
getCode
());
toPayForm
.
setTrade_type
(
WeChartType
.
NATIVE
.
getCode
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论