|
|
@@ -128,6 +128,13 @@ public class WithdrawRecordServiceImpl extends AbstractService<WithdrawRecord> i
|
|
|
.payBankcode(w.getBank().toLowerCase())
|
|
|
.build()
|
|
|
, paymentChannel.getSecretKey());
|
|
|
+ JSONObject resultJson;
|
|
|
+ try {
|
|
|
+ resultJson = JSONUtil.parseObj(bizLog.getReceiveMessage());
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("提现失败三方返回-->" + bizLog);
|
|
|
+ throw new ServiceException(LocalUtil.get("withdrawal.failed"));
|
|
|
+ }
|
|
|
bizLogList.add(BizLog.builder()
|
|
|
.bizType(2)
|
|
|
.bizNo(w.getOrderNo())
|
|
|
@@ -137,36 +144,28 @@ public class WithdrawRecordServiceImpl extends AbstractService<WithdrawRecord> i
|
|
|
.sendMessage(bizLog.getSendMessage())
|
|
|
.createTime(now)
|
|
|
.createUser(userName)
|
|
|
- .memo("提现申请调用第三方").build());
|
|
|
- JSONObject resultJson;
|
|
|
- try {
|
|
|
- resultJson = JSONUtil.parseObj(bizLog.getReceiveMessage());
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("提现失败三方返回-->" + bizLog);
|
|
|
- throw new ServiceException(LocalUtil.get("withdrawal.failed"));
|
|
|
- }
|
|
|
+ .memo(resultJson.getStr("msg")).build());
|
|
|
if (!resultJson.getStr("status").equals("200")) {
|
|
|
log.error("提现失败--->" + resultJson.getStr("msg"));
|
|
|
- throw new RuntimeException("提现失败--->" + resultJson.getStr("msg"));
|
|
|
}
|
|
|
break;
|
|
|
default:
|
|
|
throw new ServiceException(LocalUtil.get("this.channel.is.not.supported.temporarily"));
|
|
|
}
|
|
|
- try {
|
|
|
- // 新增日志
|
|
|
- bizLogList.add(BizLog.builder()
|
|
|
- .bizType(2)
|
|
|
- .bizNo(w.getOrderNo())
|
|
|
- .thirdOrderNo(thirdOrderNo)
|
|
|
- .type(5)
|
|
|
- .createTime(now)
|
|
|
- .createUser(userName)
|
|
|
- .memo(review).build());
|
|
|
- bizLogService.save(bizLogList);
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("新增提现提交订单日志失败", e);
|
|
|
- }
|
|
|
+ try {
|
|
|
+ // 新增日志
|
|
|
+ bizLogList.add(BizLog.builder()
|
|
|
+ .bizType(2)
|
|
|
+ .bizNo(w.getOrderNo())
|
|
|
+ .thirdOrderNo(thirdOrderNo)
|
|
|
+ .type(5)
|
|
|
+ .createTime(now)
|
|
|
+ .createUser(userName)
|
|
|
+ .memo(review).build());
|
|
|
+ bizLogService.save(bizLogList);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("新增提现提交订单日志失败", e);
|
|
|
+ }
|
|
|
this.update(WithdrawRecord.builder().id(w.getId()).channel(paymentChannel.getChannelName()).review(review).status(status).updateUser(userName).thirdOrderNo(thirdOrderNo).build());
|
|
|
} finally {
|
|
|
lockTemplate.releaseLock(lockInfo);
|