|
|
@@ -291,25 +291,29 @@ public class WalletService {
|
|
|
if (createUserR.getCode() != 200) {
|
|
|
throw new BusinessException(createUserR.getMsg());
|
|
|
}
|
|
|
- KwpWallet kwpWallet = new KwpWallet();
|
|
|
- kwpWallet.setEntId(entId);
|
|
|
- kwpWallet.setUid(userPara.getUid());
|
|
|
- kwpWallet.setEntType(Integer.valueOf(entCacheResDto.getEntTypes()));
|
|
|
- kwpWallet.setCashAmount(new BigDecimal("0"));
|
|
|
- kwpWallet.setPrepayAmount(new BigDecimal("0"));
|
|
|
- kwpWallet.setDealingAmount(new BigDecimal("0"));
|
|
|
- kwpWallet.setFreightAmount(new BigDecimal("0"));
|
|
|
- kwpWallet.setProcessingAmount(new BigDecimal("0"));
|
|
|
- kwpWallet.setPayingAmount(new BigDecimal("0"));
|
|
|
- kwpWallet.setChannel("xinwang");
|
|
|
- kwpWallet.setStatus(1);
|
|
|
- kwpWallet.setRemark("");
|
|
|
- kwpWallet.setCreateBy(LoginUserHolder.getUserId());
|
|
|
- kwpWallet.setCreateTime(LocalDateTime.now());
|
|
|
- kwpWallet.setUpdateBy(LoginUserHolder.getUserId());
|
|
|
- kwpWallet.setUpdateTime(LocalDateTime.now());
|
|
|
- kwpWallet.setDelFlag(0);
|
|
|
- kwpWalletMapper.insert(kwpWallet);
|
|
|
+ if (Objects.isNull(one)) {
|
|
|
+ KwpWallet kwpWallet = new KwpWallet();
|
|
|
+ kwpWallet.setEntId(entId);
|
|
|
+ kwpWallet.setUid(userPara.getUid());
|
|
|
+ kwpWallet.setEntType(Integer.valueOf(entCacheResDto.getEntTypes()));
|
|
|
+ kwpWallet.setCashAmount(new BigDecimal("0"));
|
|
|
+ kwpWallet.setPrepayAmount(new BigDecimal("0"));
|
|
|
+ kwpWallet.setDealingAmount(new BigDecimal("0"));
|
|
|
+ kwpWallet.setFreightAmount(new BigDecimal("0"));
|
|
|
+ kwpWallet.setProcessingAmount(new BigDecimal("0"));
|
|
|
+ kwpWallet.setPayingAmount(new BigDecimal("0"));
|
|
|
+ kwpWallet.setChannel("xinwang");
|
|
|
+ kwpWallet.setStatus(1);
|
|
|
+ kwpWallet.setRemark("");
|
|
|
+ kwpWallet.setCreateBy(LoginUserHolder.getUserId());
|
|
|
+ kwpWallet.setCreateTime(LocalDateTime.now());
|
|
|
+ kwpWallet.setUpdateBy(LoginUserHolder.getUserId());
|
|
|
+ kwpWallet.setUpdateTime(LocalDateTime.now());
|
|
|
+ kwpWallet.setDelFlag(0);
|
|
|
+ kwpWalletMapper.insert(kwpWallet);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
HashMap<String, Object> res = new HashMap<>();
|
|
|
res.put("userId", userPara.getUid());
|
|
|
@@ -364,22 +368,22 @@ public class WalletService {
|
|
|
summary.setTradingFreightTotal(walletPayableSummary.getTradingFreightTotal());
|
|
|
summary.setPayingFreightTotal(walletPayableSummary.getPayingFreightTotal());
|
|
|
}
|
|
|
- if (Objects.equals(one.getStatus(), 1)) {//开户中，兜底查询支付服务，判定用户是否开户成功
|
|
|
- R<UserDetailDto> account = payXwService.account(new UserInfo(one.getUid()));
|
|
|
- if (account.getCode() == 200) {
|
|
|
- UserDetailDto data = account.getData();
|
|
|
- if (Objects.nonNull(data)) {
|
|
|
- if (Objects.equals(data.getAuditFlag(), 6)) {//开户成功
|
|
|
- bean.setStatus(2);
|
|
|
- one.setStatus(2);
|
|
|
- kwpWalletMapper.updateById(one);
|
|
|
- }
|
|
|
- }
|
|
|
- bean.setStatusLabel(WalletStatusEnum.getByCode(bean.getStatus()));
|
|
|
- }
|
|
|
- } else {
|
|
|
- bean.setStatusLabel(WalletStatusEnum.getByCode(one.getStatus()));
|
|
|
- }
|
|
|
+// if (Objects.equals(one.getStatus(), 1)) {//开户中，兜底查询支付服务，判定用户是否开户成功
|
|
|
+// R<UserDetailDto> account = payXwService.account(new UserInfo(one.getUid()));
|
|
|
+// if (account.getCode() == 200) {
|
|
|
+// UserDetailDto data = account.getData();
|
|
|
+// if (Objects.nonNull(data)) {
|
|
|
+// if (Objects.equals(data.getAuditFlag(), 6)) {//开户成功
|
|
|
+// bean.setStatus(2);
|
|
|
+// one.setStatus(2);
|
|
|
+// kwpWalletMapper.updateById(one);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// bean.setStatusLabel(WalletStatusEnum.getByCode(bean.getStatus()));
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// bean.setStatusLabel(WalletStatusEnum.getByCode(one.getStatus()));
|
|
|
+// }
|
|
|
bean.setCashAmount(one.getCashAmount());
|
|
|
bean.setPrepayAmount(summary.getPreBalanceTotal());
|
|
|
bean.setDealingAmount(summary.getPreTradingAmountTotal());
|
