Commit 12d57f00 authored by tangf's avatar tangf

新增修改商户余额mq

parent 27706c49
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.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
......@@ -19,9 +22,17 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.pangding.*",
"com.yanzuoguang.*"
})
public class UserApp {
public class UserApp implements CommandLineRunner{
@Autowired
private MqPlan mqPlan;
public static void main(String[] args) {
SpringApplication.run(UserApp.class, args);
}
@Override
public void run(String... args) throws Exception {
mqPlan.init();
}
}
\ No newline at end of file
......@@ -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.GetCompanyResVo;
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.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -311,7 +312,7 @@ public class PangdingManagementController {
}
@RequestMapping(value = "updateCompanyMoney",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseResult<String> updateCompanyMoney(@RequestBody UpdateCompanyMoneyReqVo req){
public ResponseResult<String> updateCompanyMoney(@RequestBody CompanyMoneyUpdateReqVo req){
CheckerHelper.newInstance()
.notBlankCheck("companyId",req.getCompanyId())
.notBlankCheck("money", req.getMoney())
......
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);
}
}
}
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();
}
}
}
......@@ -5,6 +5,7 @@ import com.pangding.web.authority.vo.CompanyBankCardVo;
import com.pangding.web.authority.vo.CompanyVo;
import com.pangding.web.authority.vo.reqvo.*;
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.yanzuoguang.util.vo.PageSizeData;
import com.yanzuoguang.util.vo.ResponseResult;
......@@ -179,7 +180,7 @@ public interface CompanyService{
*/
void examineConfig(ExamineConfigReqVo reqVo);
ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req);
ResponseResult<String> updateCompanyMoney(CompanyMoneyUpdateReqVo req);
/**
......
......@@ -290,6 +290,7 @@ public class AuthorityServiceImpl implements AuthorityService {
@Override
public AuthorityListResVo getListByLevel(AuthorityListReqVo reqVo) {
// 找到该公司管理员角色
RoleGetReqVo roleGetReqVo = new RoleGetReqVo();
roleGetReqVo.setCompanyId(reqVo.getCompanyId());
roleGetReqVo.setIsAdmin(1);
......
......@@ -15,6 +15,7 @@ import com.pangding.web.authority.vo.reqvo.*;
import com.pangding.web.authority.vo.resvo.*;
import com.pangding.web.util.RSAUtils;
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.CompanyMoneyDetailResVo;
import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
......@@ -964,7 +965,7 @@ public class CompanyServiceImpl implements CompanyService {
@Override
public ResponseResult<String> updateCompanyMoney(UpdateCompanyMoneyReqVo req) {
public ResponseResult<String> updateCompanyMoney(CompanyMoneyUpdateReqVo req) {
CompanyVo companyVo = companyDao.load(req.getCompanyId(), CompanyVo.class);
CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(req.getCompanyId(), CompanyExtendVo.class);
if (StringHelper.isEmpty(companyVo) || StringHelper.isEmpty(companyExtendVo)) {
......
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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment