|
@@ -18,6 +18,7 @@ import org.dromara.backstage.cardCenter.mapper.PtCardMapper;
|
|
|
import org.dromara.backstage.consumption.mapper.XfCreditAccountMapper;
|
|
import org.dromara.backstage.consumption.mapper.XfCreditAccountMapper;
|
|
|
import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
|
|
import org.dromara.backstage.payment.domain.vo.PtUserAccountVo;
|
|
|
import org.dromara.backstage.payment.mapper.PtUserAccountMapper;
|
|
import org.dromara.backstage.payment.mapper.PtUserAccountMapper;
|
|
|
|
|
+import org.dromara.backstage.payment.service.IPtBagService;
|
|
|
import org.dromara.backstage.wx.domain.vo.WxCreditAccountVo;
|
|
import org.dromara.backstage.wx.domain.vo.WxCreditAccountVo;
|
|
|
import org.dromara.backstage.wx.service.IWxService;
|
|
import org.dromara.backstage.wx.service.IWxService;
|
|
|
import org.dromara.common.core.config.DefaultConfig;
|
|
import org.dromara.common.core.config.DefaultConfig;
|
|
@@ -50,6 +51,7 @@ public class WxServiceImpl implements IWxService {
|
|
|
private final RemoteDictService dictService;
|
|
private final RemoteDictService dictService;
|
|
|
private final DefaultConfig defaultConfig;
|
|
private final DefaultConfig defaultConfig;
|
|
|
private final UserFaceBusiness userFaceBusiness;
|
|
private final UserFaceBusiness userFaceBusiness;
|
|
|
|
|
+ private final IPtBagService bagService;
|
|
|
|
|
|
|
|
@Value("${dzbp.sync-img.url}/") // 电子班牌照片推送接口
|
|
@Value("${dzbp.sync-img.url}/") // 电子班牌照片推送接口
|
|
|
private String syncImgToDzbpUrl;
|
|
private String syncImgToDzbpUrl;
|
|
@@ -119,6 +121,7 @@ public class WxServiceImpl implements IWxService {
|
|
|
Collectors.toMap(RemoteDictDataVo::getDictValue, RemoteDictDataVo::getDictLabel));
|
|
Collectors.toMap(RemoteDictDataVo::getDictValue, RemoteDictDataVo::getDictLabel));
|
|
|
PtUserAccountVo vo = accountMapper.selectVoById(userId);
|
|
PtUserAccountVo vo = accountMapper.selectVoById(userId);
|
|
|
vo.setAccountStatus(dictMap.getOrDefault(vo.getAccountStatus(), ""));
|
|
vo.setAccountStatus(dictMap.getOrDefault(vo.getAccountStatus(), ""));
|
|
|
|
|
+ vo.setAccountBalance(bagService.queryBalanceByUserId(vo.getUserId()).toString());
|
|
|
// 根据userId查询卡片信息
|
|
// 根据userId查询卡片信息
|
|
|
PtCard card = cardMapper.selectOne(new LambdaUpdateWrapper<PtCard>()
|
|
PtCard card = cardMapper.selectOne(new LambdaUpdateWrapper<PtCard>()
|
|
|
.eq(PtCard::getUserId, userId)
|
|
.eq(PtCard::getUserId, userId)
|