Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
T
tcm-system
Project
Project
Details
Activity
Releases
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
TCM
tcm-system
Commits
12d57f00
Commit
12d57f00
authored
Mar 17, 2020
by
tangf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增修改商户余额mq
parent
27706c49
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
121 additions
and
38 deletions
+121
-38
UserApp.java
src/main/java/com/pangding/web/UserApp.java
+12
-1
PangdingManagementController.java
...eb/authority/controller/PangdingManagementController.java
+2
-1
CompanyConsumer.java
...n/java/com/pangding/web/authority/mq/CompanyConsumer.java
+51
-0
MqPlan.java
src/main/java/com/pangding/web/authority/mq/MqPlan.java
+51
-0
CompanyService.java
...va/com/pangding/web/authority/service/CompanyService.java
+2
-1
AuthorityServiceImpl.java
...ding/web/authority/service/impl/AuthorityServiceImpl.java
+1
-0
CompanyServiceImpl.java
...ngding/web/authority/service/impl/CompanyServiceImpl.java
+2
-1
UpdateCompanyMoneyReqVo.java
...gding/web/authority/vo/reqvo/UpdateCompanyMoneyReqVo.java
+0
-34
No files found.
src/main/java/com/pangding/web/UserApp.java
View file @
12d57f00
package
com
.
pangding
.
web
;
package
com
.
pangding
.
web
;
import
com.pangding.web.authority.mq.MqPlan
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.CommandLineRunner
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
...
@@ -19,9 +22,17 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
...
@@ -19,9 +22,17 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.pangding.*"
,
"com.pangding.*"
,
"com.yanzuoguang.*"
"com.yanzuoguang.*"
})
})
public
class
UserApp
{
public
class
UserApp
implements
CommandLineRunner
{
@Autowired
private
MqPlan
mqPlan
;
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
UserApp
.
class
,
args
);
SpringApplication
.
run
(
UserApp
.
class
,
args
);
}
}
@Override
public
void
run
(
String
...
args
)
throws
Exception
{
mqPlan
.
init
();
}
}
}
\ No newline at end of file
src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java
View file @
12d57f00
...
@@ -8,6 +8,7 @@ import com.pangding.web.authority.vo.resvo.CompanyResVo;
...
@@ -8,6 +8,7 @@ import com.pangding.web.authority.vo.resvo.CompanyResVo;
import
com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo
;
import
com.pangding.web.authority.vo.resvo.GetCompanyDivideResVo
;
import
com.pangding.web.authority.vo.resvo.GetCompanyResVo
;
import
com.pangding.web.authority.vo.resvo.GetCompanyResVo
;
import
com.pangding.web.authority.vo.resvo.SaveCompanyResVo
;
import
com.pangding.web.authority.vo.resvo.SaveCompanyResVo
;
import
com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo
;
import
com.yanzuoguang.util.helper.CheckerHelper
;
import
com.yanzuoguang.util.helper.CheckerHelper
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.ResponseResult
;
import
com.yanzuoguang.util.vo.ResponseResult
;
...
@@ -311,7 +312,7 @@ public class PangdingManagementController {
...
@@ -311,7 +312,7 @@ public class PangdingManagementController {
}
}
@RequestMapping
(
value
=
"updateCompanyMoney"
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
@RequestMapping
(
value
=
"updateCompanyMoney"
,
produces
=
MediaType
.
APPLICATION_JSON_UTF8_VALUE
)
public
ResponseResult
<
String
>
updateCompanyMoney
(
@RequestBody
UpdateCompanyMoney
ReqVo
req
){
public
ResponseResult
<
String
>
updateCompanyMoney
(
@RequestBody
CompanyMoneyUpdate
ReqVo
req
){
CheckerHelper
.
newInstance
()
CheckerHelper
.
newInstance
()
.
notBlankCheck
(
"companyId"
,
req
.
getCompanyId
())
.
notBlankCheck
(
"companyId"
,
req
.
getCompanyId
())
.
notBlankCheck
(
"money"
,
req
.
getMoney
())
.
notBlankCheck
(
"money"
,
req
.
getMoney
())
...
...
src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java
0 → 100644
View file @
12d57f00
package
com
.
pangding
.
web
.
authority
.
mq
;
import
com.pangding.web.authority.service.CompanyService
;
import
com.pangding.web.constant.MqConstant
;
import
com.pangding.web.mq.CompanyProducer
;
import
com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo
;
import
com.rabbitmq.client.Channel
;
import
com.yanzuoguang.mq.service.MqService
;
import
com.yanzuoguang.util.helper.DateHelper
;
import
com.yanzuoguang.util.helper.JsonHelper
;
import
com.yanzuoguang.util.log.Log
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.amqp.core.Message
;
import
org.springframework.amqp.rabbit.annotation.RabbitListener
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
@Component
public
class
CompanyConsumer
{
private
static
final
Logger
log
=
LoggerFactory
.
getLogger
(
CompanyConsumer
.
class
);
@Autowired
private
CompanyProducer
companyProducer
;
@Autowired
private
MqService
mqService
;
@Autowired
private
CompanyService
companyService
;
/**
* 初始化mq
*/
public
void
init
()
{
companyProducer
.
init
();
}
@RabbitListener
(
queues
=
{
MqConstant
.
COMPANY_MONEY_UPDATE
})
public
void
UpdateCompanyMoney
(
String
content
,
Message
message
,
Channel
channel
)
{
log
.
info
(
"[UpdateCompanyMoney 监听的消息] - [消费时间] - [{}] - [{}]"
,
DateHelper
.
getNow
(),
content
);
try
{
CompanyMoneyUpdateReqVo
companyMoneyUpdateReqVo
=
JsonHelper
.
deserialize
(
content
,
CompanyMoneyUpdateReqVo
.
class
);
companyService
.
updateCompanyMoney
(
companyMoneyUpdateReqVo
);
}
catch
(
Exception
e
)
{
Log
.
error
(
CompanyConsumer
.
class
,
e
);
}
finally
{
mqService
.
basicAck
(
message
,
channel
);
}
}
}
src/main/java/com/pangding/web/authority/mq/MqPlan.java
0 → 100644
View file @
12d57f00
package
com
.
pangding
.
web
.
authority
.
mq
;
import
com.pangding.web.mq.CompanyProducer
;
import
com.pangding.web.mq.DistributionProducer
;
import
com.pangding.web.mq.OrderProducer
;
import
com.pangding.web.mq.PayProducer
;
import
com.yanzuoguang.mq.service.MqService
;
import
com.yanzuoguang.util.thread.ThreadNext
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
/**
* 消息队列初始化服务,用于重启时,初始化消息队列对象
*
* @author 11488
*/
@Component
public
class
MqPlan
implements
ThreadNext
.
Next
{
@Autowired
private
MqService
mqService
;
@Autowired
private
CompanyProducer
companyProducer
;
public
MqPlan
()
{
ThreadNext
.
start
(
this
,
"queue initByLog error"
);
}
@Override
public
boolean
next
()
throws
Exception
{
if
(
mqService
==
null
||
null
==
companyProducer
)
{
return
true
;
}
companyProducer
.
init
();
return
false
;
}
@Override
public
int
getNextTime
()
{
return
1000
;
}
public
void
init
()
{
try
{
this
.
next
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
src/main/java/com/pangding/web/authority/service/CompanyService.java
View file @
12d57f00
...
@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
...
@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.CompanyVo
;
import
com.pangding.web.authority.vo.reqvo.*
;
import
com.pangding.web.authority.vo.reqvo.*
;
import
com.pangding.web.authority.vo.resvo.*
;
import
com.pangding.web.authority.vo.resvo.*
;
import
com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo
;
import
com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo
;
import
com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.PageSizeData
;
import
com.yanzuoguang.util.vo.ResponseResult
;
import
com.yanzuoguang.util.vo.ResponseResult
;
...
@@ -179,7 +180,7 @@ public interface CompanyService{
...
@@ -179,7 +180,7 @@ public interface CompanyService{
*/
*/
void
examineConfig
(
ExamineConfigReqVo
reqVo
);
void
examineConfig
(
ExamineConfigReqVo
reqVo
);
ResponseResult
<
String
>
updateCompanyMoney
(
UpdateCompanyMoney
ReqVo
req
);
ResponseResult
<
String
>
updateCompanyMoney
(
CompanyMoneyUpdate
ReqVo
req
);
/**
/**
...
...
src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java
View file @
12d57f00
...
@@ -290,6 +290,7 @@ public class AuthorityServiceImpl implements AuthorityService {
...
@@ -290,6 +290,7 @@ public class AuthorityServiceImpl implements AuthorityService {
@Override
@Override
public
AuthorityListResVo
getListByLevel
(
AuthorityListReqVo
reqVo
)
{
public
AuthorityListResVo
getListByLevel
(
AuthorityListReqVo
reqVo
)
{
// 找到该公司管理员角色
RoleGetReqVo
roleGetReqVo
=
new
RoleGetReqVo
();
RoleGetReqVo
roleGetReqVo
=
new
RoleGetReqVo
();
roleGetReqVo
.
setCompanyId
(
reqVo
.
getCompanyId
());
roleGetReqVo
.
setCompanyId
(
reqVo
.
getCompanyId
());
roleGetReqVo
.
setIsAdmin
(
1
);
roleGetReqVo
.
setIsAdmin
(
1
);
...
...
src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java
View file @
12d57f00
...
@@ -15,6 +15,7 @@ import com.pangding.web.authority.vo.reqvo.*;
...
@@ -15,6 +15,7 @@ import com.pangding.web.authority.vo.reqvo.*;
import
com.pangding.web.authority.vo.resvo.*
;
import
com.pangding.web.authority.vo.resvo.*
;
import
com.pangding.web.util.RSAUtils
;
import
com.pangding.web.util.RSAUtils
;
import
com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo
;
import
com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo
;
import
com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo
;
import
com.pangding.web.vo.system.res.company.CompanyExtendResVo
;
import
com.pangding.web.vo.system.res.company.CompanyExtendResVo
;
import
com.pangding.web.vo.system.res.company.CompanyMoneyDetailResVo
;
import
com.pangding.web.vo.system.res.company.CompanyMoneyDetailResVo
;
import
com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo
;
import
com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo
;
...
@@ -964,7 +965,7 @@ public class CompanyServiceImpl implements CompanyService {
...
@@ -964,7 +965,7 @@ public class CompanyServiceImpl implements CompanyService {
@Override
@Override
public
ResponseResult
<
String
>
updateCompanyMoney
(
UpdateCompanyMoney
ReqVo
req
)
{
public
ResponseResult
<
String
>
updateCompanyMoney
(
CompanyMoneyUpdate
ReqVo
req
)
{
CompanyVo
companyVo
=
companyDao
.
load
(
req
.
getCompanyId
(),
CompanyVo
.
class
);
CompanyVo
companyVo
=
companyDao
.
load
(
req
.
getCompanyId
(),
CompanyVo
.
class
);
CompanyExtendVo
companyExtendVo
=
companyExtendDaoImpl
.
load
(
req
.
getCompanyId
(),
CompanyExtendVo
.
class
);
CompanyExtendVo
companyExtendVo
=
companyExtendDaoImpl
.
load
(
req
.
getCompanyId
(),
CompanyExtendVo
.
class
);
if
(
StringHelper
.
isEmpty
(
companyVo
)
||
StringHelper
.
isEmpty
(
companyExtendVo
))
{
if
(
StringHelper
.
isEmpty
(
companyVo
)
||
StringHelper
.
isEmpty
(
companyExtendVo
))
{
...
...
src/main/java/com/pangding/web/authority/vo/reqvo/UpdateCompanyMoneyReqVo.java
deleted
100644 → 0
View file @
27706c49
package
com
.
pangding
.
web
.
authority
.
vo
.
reqvo
;
public
class
UpdateCompanyMoneyReqVo
{
private
String
companyId
;
private
double
money
;
private
int
moneyType
;
public
String
getCompanyId
()
{
return
companyId
;
}
public
void
setCompanyId
(
String
companyId
)
{
this
.
companyId
=
companyId
;
}
public
double
getMoney
()
{
return
money
;
}
public
void
setMoney
(
double
money
)
{
this
.
money
=
money
;
}
public
int
getMoneyType
()
{
return
moneyType
;
}
public
void
setMoneyType
(
int
moneyType
)
{
this
.
moneyType
=
moneyType
;
}
}
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