Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-web
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hqzhdj
cloud-web
Commits
7aba5542
Commit
7aba5542
authored
Jun 16, 2021
by
胡涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化
parent
587ab04d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
14 deletions
+10
-14
cloud-web-student/pom.xml
+5
-5
cloud-web-student/src/main/java/com/yizhi/application/settlement/SettlementController.java
+3
-6
cloud-web-student/src/main/java/com/yizhi/application/wechat/controller/WechatController.java
+2
-3
No files found.
cloud-web-student/pom.xml
View file @
7aba5542
...
...
@@ -44,11 +44,11 @@
<artifactId>
cloud-mall-api
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</dependency>
<dependency
>
<groupId>
com.yizhi
</groupId
>
<artifactId>
cloud-szwechat-api
</artifactId
>
<version>
1.0-SNAPSHOT
</version
>
</dependency
>
<!-- <dependency>--
>
<!-- <groupId>com.yizhi</groupId>--
>
<!-- <artifactId>cloud-szwechat-api</artifactId>--
>
<!-- <version>1.0-SNAPSHOT</version>--
>
<!-- </dependency>--
>
</dependencies>
</project>
cloud-web-student/src/main/java/com/yizhi/application/settlement/SettlementController.java
View file @
7aba5542
...
...
@@ -3,13 +3,9 @@ package com.yizhi.application.settlement;
import
com.yizhi.application.settlement.config.SettlementHandlerContext
;
import
com.yizhi.application.settlement.handler.SettlementBaseHandler
;
import
com.yizhi.application.settlement.vo.SettlementBaseVo
;
import
com.yizhi.application.settlement.vo.TrainingInfoVo
;
import
com.yizhi.core.application.context.ContextHolder
;
import
com.yizhi.core.application.context.RequestContext
;
import
com.yizhi.core.application.enums.InternationalEnums
;
import
com.yizhi.mall.application.feign.TokenControllerClient
;
import
com.yizhi.training.application.feign.TrainingProjectClient
;
import
com.yizhi.training.application.vo.domain.TrainingProjectVo
;
import
com.yizhi.util.application.domain.BizResponse
;
import
io.swagger.annotations.ApiOperation
;
import
org.slf4j.Logger
;
...
...
@@ -34,14 +30,15 @@ public class SettlementController {
/**
* 结算台详情
*
* @param type 查询的类型;例如:type=1 项目;
* @param id 需要查询类型的id;例如:项目id
*/
@GetMapping
(
"/details/get"
)
@ApiOperation
(
value
=
"结算台信息展示详情"
)
public
BizResponse
<
SettlementBaseVo
>
getSettlementInfo
(
@RequestParam
(
"type"
)
Integer
type
,
@RequestParam
(
"id"
)
Long
id
)
{
public
BizResponse
<
SettlementBaseVo
>
getSettlementInfo
(
@RequestParam
(
"type"
)
Integer
type
,
@RequestParam
(
"id"
)
Long
id
)
{
RequestContext
context
=
ContextHolder
.
get
();
logger
.
info
(
"结算台获取详情入参type= {};id = {},accountId = {},companyId = {},siteId = {}"
,
type
,
id
,
context
.
getAccountId
(),
context
.
getCompanyId
(),
context
.
getSiteId
());
logger
.
info
(
"结算台获取详情入参type= {};id = {},accountId = {},companyId = {},siteId = {}"
,
type
,
id
,
context
.
getAccountId
(),
context
.
getCompanyId
(),
context
.
getSiteId
());
if
(
null
==
type
||
null
==
id
||
type
.
compareTo
(
0
)
<
0
||
id
.
compareTo
(
0L
)
<
0
)
{
logger
.
error
(
"结算台获取详情入参为空;"
);
return
BizResponse
.
fail
(
InternationalEnums
.
INTERNATIONALIZATIONWORDCONTROLLER1
.
getCode
());
...
...
cloud-web-student/src/main/java/com/yizhi/application/wechat/controller/WechatController.java
View file @
7aba5542
...
...
@@ -5,7 +5,6 @@ import com.yizhi.core.application.context.ContextHolder;
import
com.yizhi.core.application.context.RequestContext
;
import
com.yizhi.site.application.enums.PortalEnum
;
import
com.yizhi.system.application.system.remote.AccountClient
;
import
com.yizhi.szwechat.application.feign.SZWeiXinClient
;
import
com.yizhi.util.application.domain.Response
;
import
com.yizhi.util.application.ras.RSAUtil
;
import
com.yizhi.wechat.application.feign.PublicConfigClient
;
...
...
@@ -45,8 +44,8 @@ public class WechatController {
private
WeiXinClient
weiXinClient
;
@Autowired
private
PublicConfigClient
publicConfigClient
;
@Autowired
private
SZWeiXinClient
szWeiXinClient
;
//
@Autowired
//
private SZWeiXinClient szWeiXinClient;
@Autowired
private
AccountClient
accountClient
;
...
...
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