|
@@ -505,6 +505,7 @@ public class HahaCallbackServiceImpl implements HahaCallbackService {
|
|
|
.tryRecoverPayScoreOrderId(record.getUserId(), record.getDeviceId());
|
|
.tryRecoverPayScoreOrderId(record.getUserId(), record.getDeviceId());
|
|
|
if (payScoreOrderId != null) {
|
|
if (payScoreOrderId != null) {
|
|
|
payScoreState = PayScoreState.CREATED.getCode();
|
|
payScoreState = PayScoreState.CREATED.getCode();
|
|
|
|
|
+ serviceId = payScoreService.getServiceId();
|
|
|
log.info("从追踪SET恢复支付分订单ID成功 - userId: {}, deviceId: {}, payScoreOrderId: {}",
|
|
log.info("从追踪SET恢复支付分订单ID成功 - userId: {}, deviceId: {}, payScoreOrderId: {}",
|
|
|
record.getUserId(), record.getDeviceId(), payScoreOrderId);
|
|
record.getUserId(), record.getDeviceId(), payScoreOrderId);
|
|
|
} else {
|
|
} else {
|
|
@@ -1182,6 +1183,7 @@ public class HahaCallbackServiceImpl implements HahaCallbackService {
|
|
|
.tryRecoverPayScoreOrderId(uid, deviceId);
|
|
.tryRecoverPayScoreOrderId(uid, deviceId);
|
|
|
if (payScoreOrderId != null) {
|
|
if (payScoreOrderId != null) {
|
|
|
payScoreState = PayScoreState.CREATED.getCode();
|
|
payScoreState = PayScoreState.CREATED.getCode();
|
|
|
|
|
+ serviceId = payScoreService.getServiceId();
|
|
|
log.info("从追踪SET恢复支付分订单ID成功 - userId: {}, deviceId: {}, payScoreOrderId: {}",
|
|
log.info("从追踪SET恢复支付分订单ID成功 - userId: {}, deviceId: {}, payScoreOrderId: {}",
|
|
|
userId, deviceId, payScoreOrderId);
|
|
userId, deviceId, payScoreOrderId);
|
|
|
} else {
|
|
} else {
|
|
@@ -1638,12 +1640,17 @@ public class HahaCallbackServiceImpl implements HahaCallbackService {
|
|
|
order.setPayChannel(PaymentChannel.WECHAT_PAYSCORE.getCode());
|
|
order.setPayChannel(PaymentChannel.WECHAT_PAYSCORE.getCode());
|
|
|
order.setPayType("微信支付分");
|
|
order.setPayType("微信支付分");
|
|
|
order.setPayScoreState(PayScoreState.CREATED.getCode());
|
|
order.setPayScoreState(PayScoreState.CREATED.getCode());
|
|
|
|
|
+ String svcId = payScoreService.getServiceId();
|
|
|
|
|
+ if (svcId != null) {
|
|
|
|
|
+ order.setServiceId(svcId);
|
|
|
|
|
+ }
|
|
|
// 回写到数据库
|
|
// 回写到数据库
|
|
|
orderService.lambdaUpdate()
|
|
orderService.lambdaUpdate()
|
|
|
.set(Order::getPayScoreOrderId, recovered)
|
|
.set(Order::getPayScoreOrderId, recovered)
|
|
|
.set(Order::getPayChannel, PaymentChannel.WECHAT_PAYSCORE.getCode())
|
|
.set(Order::getPayChannel, PaymentChannel.WECHAT_PAYSCORE.getCode())
|
|
|
.set(Order::getPayType, "微信支付分")
|
|
.set(Order::getPayType, "微信支付分")
|
|
|
.set(Order::getPayScoreState, PayScoreState.CREATED.getCode())
|
|
.set(Order::getPayScoreState, PayScoreState.CREATED.getCode())
|
|
|
|
|
+ .set(svcId != null, Order::getServiceId, svcId)
|
|
|
.eq(Order::getId, order.getId())
|
|
.eq(Order::getId, order.getId())
|
|
|
.update();
|
|
.update();
|
|
|
log.info("支付分订单ID已从追踪SET恢复 - orderId: {}, payScoreOrderId: {}",
|
|
log.info("支付分订单ID已从追踪SET恢复 - orderId: {}, payScoreOrderId: {}",
|