Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pseer
gxpt_ht
Commits
56290163
Commit
56290163
authored
Feb 03, 2024
by
YG8999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
域名改为配置文件配置
parent
dc720283
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
7 deletions
+18
-7
application-prod.yml
share-admin/src/main/resources/application-prod.yml
+4
-2
application-prod.yml
share-front/src/main/resources/application-prod.yml
+2
-0
OrderPayServiceImpl.java
...n/java/share/system/service/impl/OrderPayServiceImpl.java
+6
-4
OrderRefundServiceImpl.java
...ava/share/system/service/impl/OrderRefundServiceImpl.java
+6
-1
No files found.
share-admin/src/main/resources/application-prod.yml
View file @
56290163
...
...
@@ -218,4 +218,6 @@ order:
allow-refund-time
:
3600
mqtt
:
device-op-last-time
:
-5
device-gateway-last-report-time
:
-10
\ No newline at end of file
device-gateway-last-report-time
:
-10
api
:
domain
:
https://www.coujio.com
\ No newline at end of file
share-front/src/main/resources/application-prod.yml
View file @
56290163
...
...
@@ -216,3 +216,5 @@ order:
mqtt
:
device-op-last-time
:
-5
device-gateway-last-report-time
:
-10
api
:
domain
:
https://www.coujio.com
share-system/src/main/java/share/system/service/impl/OrderPayServiceImpl.java
View file @
56290163
...
...
@@ -7,6 +7,7 @@ import com.saobei.open.sdk.model.response.trade.SaobeiMiniPayResponse;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
share.common.config.SaobeiConfig
;
import
share.common.config.WeChatConfig
;
...
...
@@ -54,6 +55,11 @@ public class OrderPayServiceImpl implements OrderPayService {
@Autowired
private
SaobeiService
saobeiService
;
/**
* 获取域名
*/
@Value
(
"${api.domain}"
)
private
String
apiDomain
;
@Override
public
OrderPayResultResponse
payment
(
SOrder
sOrder
)
{
...
...
@@ -142,8 +148,6 @@ public class OrderPayServiceImpl implements OrderPayService {
* @return 微信预下单对象
*/
private
CreateOrderRequestVo
getUnifiedorderVo
(
SOrder
sOrder
,
String
openid
,
String
appId
,
String
mchId
,
String
signKey
)
{
// 获取域名
String
apiDomain
=
Constants
.
CONFIG_KEY_API_URL
;
AttachVo
attachVo
=
new
AttachVo
(
OrderTypeEnum
.
getEnumByCode
(
sOrder
.
getOrderType
()).
getValue
(),
sOrder
.
getConsumerId
());
CreateOrderRequestVo
vo
=
new
CreateOrderRequestVo
();
...
...
@@ -204,8 +208,6 @@ public class OrderPayServiceImpl implements OrderPayService {
* @return 预下单对象
*/
private
SaobeiMiniPayRequestVo
getSaobeiUnifiedOrderVo
(
SOrder
sOrder
,
String
openid
,
String
appId
,
String
mchId
,
String
signKey
)
{
// 获取域名
String
apiDomain
=
Constants
.
CONFIG_KEY_API_URL
;
AttachVo
attachVo
=
new
AttachVo
(
OrderTypeEnum
.
getEnumByCode
(
sOrder
.
getOrderType
()).
getValue
(),
sOrder
.
getConsumerId
());
SaobeiMiniPayRequestVo
vo
=
new
SaobeiMiniPayRequestVo
();
...
...
share-system/src/main/java/share/system/service/impl/OrderRefundServiceImpl.java
View file @
56290163
...
...
@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.saobei.open.sdk.model.response.trade.SaobeiTradeRefundResponse
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
share.common.config.WeChatConfig
;
import
share.common.constant.Constants
;
...
...
@@ -53,6 +54,11 @@ public class OrderRefundServiceImpl extends ServiceImpl<SOrderMapper, SOrder> im
private
ISConsumptionRecordsService
sConsumptionRecordsService
;
@Autowired
private
ISRoomService
roomService
;
/**
* 获取域名
*/
@Value
(
"${api.domain}"
)
private
String
apiDomain
;
/**
* 退款 需要优化
...
...
@@ -78,7 +84,6 @@ public class OrderRefundServiceImpl extends ServiceImpl<SOrderMapper, SOrder> im
String
mchId
=
weChatConfig
.
getMchId
();
String
signKey
=
weChatConfig
.
getSignKey
();
String
path
=
weChatConfig
.
getCertPath
();
//TODO 商户证书路径p12(待提供)
String
apiDomain
=
Constants
.
CONFIG_KEY_API_URL
;
//统一下单数据
WxRefundVo
wxRefundVo
=
new
WxRefundVo
();
wxRefundVo
.
setAppid
(
appId
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment