|
|
|
@ -161,20 +161,13 @@ public class AccountRechargeServiceImpl implements AccountRechargeService {
|
|
|
|
|
order.setStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
payOrderRepository.save(order);
|
|
|
|
|
i++;
|
|
|
|
|
//同步数据
|
|
|
|
|
//同步到聚石塔内数据
|
|
|
|
|
JSONObject jsonObject = requestCore.savePayOrder(order);
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject.get("code")) {
|
|
|
|
|
i++;
|
|
|
|
|
//子账号授权
|
|
|
|
|
JSONObject jsonObject1 = requestCore.authorizeChildrenAccount(order.getMasterUserId(), order.getNickName(), order.getTemplateId());
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject1.get("code")) {
|
|
|
|
|
i++;
|
|
|
|
|
// 修改账户信息 开通服务
|
|
|
|
|
JSONObject jsonObject2 = requestCore.updateSellerAccount(order);
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) {
|
|
|
|
|
updateRollBack(order, DefaultNumberConstants.THREE_NUMBER);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject1.get("code")) {
|
|
|
|
|
updateRollBack(order, DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
@ -192,14 +185,14 @@ public class AccountRechargeServiceImpl implements AccountRechargeService {
|
|
|
|
|
|
|
|
|
|
private void updateRollBack(PayOrder payOrder, int i) {
|
|
|
|
|
payOrder.setOrderStatus(i);
|
|
|
|
|
if (DefaultNumberConstants.ONE_NUMBER != i) {
|
|
|
|
|
if (i > DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
|
requestCore.updatePayOrder(payOrder);
|
|
|
|
|
}
|
|
|
|
|
payOrderRepository.save(payOrder);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 支付2
|
|
|
|
|
* 同步历史数据支付
|
|
|
|
|
*
|
|
|
|
|
* @param payTwoOrder
|
|
|
|
|
* @return {@link CommonResult}<{@link String}>
|
|
|
|
@ -238,6 +231,11 @@ public class AccountRechargeServiceImpl implements AccountRechargeService {
|
|
|
|
|
return new CommonResult<>().success(byNickName);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 同步历史数据支付回调
|
|
|
|
|
*
|
|
|
|
|
* @param request
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public CommonResult<String> pcTwoNotifyResponse(HttpServletRequest request) {
|
|
|
|
|
int i = 0;
|
|
|
|
@ -261,23 +259,35 @@ public class AccountRechargeServiceImpl implements AccountRechargeService {
|
|
|
|
|
i++;
|
|
|
|
|
//同步数据
|
|
|
|
|
JSONObject jsonObject = requestCore.savePayTwoOrder(order);
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject.get("code")) {
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject.get("code")) {
|
|
|
|
|
i++;
|
|
|
|
|
// 修改账户信息 开通服务
|
|
|
|
|
JSONObject jsonObject2 = requestCore.updateSellerAccount(order);
|
|
|
|
|
if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject2.get("code")) {
|
|
|
|
|
// 同步主账号
|
|
|
|
|
if (requestCore.updateAccount(order) == DefaultNumberConstants.ZERO_NUMBER) {
|
|
|
|
|
order.setOrderStatus(DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
requestCore.updateTwoPayOrder(order);
|
|
|
|
|
log.error("++++++++++++++++同步主账号错误,账号id:{}", order.getMasterUserId());
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
log.error("++++++++++++++++修改账户信息,开通淘宝服务失败:{}",order.getNickName());
|
|
|
|
|
order.setOrderStatus(i);
|
|
|
|
|
requestCore.updateTwoPayOrder(order);
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
log.error("++++++++++++++++同步到聚石塔内数据失败:{}", order.getNickName());
|
|
|
|
|
order.setOrderStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
requestCore.updateTwoPayOrder(order);
|
|
|
|
|
}
|
|
|
|
|
if (requestCore.updateAccount(order) == DefaultNumberConstants.ZERO_NUMBER) {
|
|
|
|
|
order.setOrderStatus(DefaultNumberConstants.TWO_NUMBER);
|
|
|
|
|
requestCore.updateTwoPayOrder(order);
|
|
|
|
|
log.error("++++++++++++++++同步主账号错误,账号id:{}", order.getMasterUserId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
order.setOrderStatus(DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
if (i == 1) {
|
|
|
|
|
order.setOrderStatus(i);
|
|
|
|
|
if (i > DefaultNumberConstants.ONE_NUMBER) {
|
|
|
|
|
requestCore.updateTwoPayOrder(order);
|
|
|
|
|
payTwoOrderRepository.save(order);
|
|
|
|
|
}
|
|
|
|
|
payTwoOrderRepository.save(order);
|
|
|
|
|
log.error("the pc response error time {}", LocalTime.now());
|
|
|
|
|
throw new TaoMiCommException(ResponseCode.CALLBACK_FAILED.getDesc());
|
|
|
|
|
}
|
|
|
|
|