Commit bb784864 authored by tangfang's avatar tangfang

修改用户二维码生成

parent e9db6ce5
......@@ -18,9 +18,9 @@ public class CompanyTollPointDaoImpl extends BaseDaoImpl implements CompanyTollP
register(CompanyTollPointVo.class);
table.add(QUERY_PAGE_LIST,"select a.*,b.name as companyName from pd_company_point a left join pd_company b on a.company_id = b.id " +
table.add(QUERY_PAGE_LIST,"select a.*,b.company_name from pd_company_point a left join pd_company b on a.company_id = b.id " +
"where 1=1{WHERE} ")
.add("companyId","and a.company_id = ?");
.add("companyId","and a.company_id = ? ");
}
......
......@@ -10,6 +10,7 @@ import com.pangding.web.authority.vo.reqvo.CompanyExtendGetReqVo;
import com.pangding.web.authority.vo.reqvo.WithdrawalReqVo;
import com.pangding.web.authority.vo.resvo.WithdrawalResVo;
import com.pangding.web.constant.CompanyConstant;
import com.pangding.web.constant.report.ReportMqConstant;
import com.pangding.web.vo.order.pd.CapitalFlowVo;
import com.pangding.web.vo.order.req.CapitalFlowReqVo;
import com.pangding.web.vo.order.req.back.CashWithdrawalBackReqVo;
......@@ -24,6 +25,8 @@ import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
import com.pangding.web.vo.system.req.company.CompanyRuleReqVo;
import com.pangding.web.vo.system.req.company.UpdateCompanyMoneyReqVo;
import com.pangding.web.vo.system.res.company.CompanyResVo;
import com.yanzuoguang.mq.service.MqService;
import com.yanzuoguang.mq.vo.req.MessageLogReqVo;
import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.helper.DateHelper;
......@@ -58,6 +61,8 @@ public class FinanceServiceImpl implements FinanceService {
private CompanyRuleDao companyRuleDao;
@Autowired
private CompanyConsumer companyConsumer;
@Autowired
private MqService mqService;
@Override
......@@ -467,6 +472,7 @@ public class FinanceServiceImpl implements FinanceService {
@Transactional
@Override
public ResponseResult<String> saveCapitalFlow(CapitalFlowReqVo req) {
mqService.log(new MessageLogReqVo(ReportMqConstant.REPORT_PRODUCT_DETAIL_SAVE, req.getTempId()));
double money = req.getActualMoney();
if (CompanyConstant.CATEGORY_REFUND == req.getCategory()) {
......@@ -481,6 +487,7 @@ public class FinanceServiceImpl implements FinanceService {
updateCompanyMoneyReqVo.setCompanyId(req.getCompanyId());
updateCompanyMoneyReqVo.setNewWithdrawTotalCash(money);
companyExtendDao.updateCompanyMoney(updateCompanyMoneyReqVo);
System.out.println("处理余额:" + req.getOrderId() + "," + req.getOrderMonetDetailId());
CompanyResVo companyVo = companyDao.load(req.getCompanyId(), CompanyResVo.class);
if (StringHelper.isEmpty(companyVo)) {
......
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