|
@@ -724,7 +724,7 @@ public class OrderManagementService {
|
|
resString = resString + "查询客户信息失败:" + flowOrderInfo.getOrderId() + ";";
|
|
resString = resString + "查询客户信息失败:" + flowOrderInfo.getOrderId() + ";";
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- if (flowAppInfo.getSecondCallback() == 0){
|
|
|
|
|
|
+ if (flowAppInfo.getSecondCallback() == 0 ){
|
|
resString = resString + "客户不允许二次回调:" + flowOrderInfo.getOrderId() + ";";
|
|
resString = resString + "客户不允许二次回调:" + flowOrderInfo.getOrderId() + ";";
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -769,6 +769,9 @@ public class OrderManagementService {
|
|
//更改回调时间
|
|
//更改回调时间
|
|
flowOrderInfo.setCallbackTime(new Date());
|
|
flowOrderInfo.setCallbackTime(new Date());
|
|
String orderString = om.writeValueAsString(flowOrderInfo);
|
|
String orderString = om.writeValueAsString(flowOrderInfo);
|
|
|
|
+ //redis改状态
|
|
|
|
+ long hKey = flowOrderInfo.getOrderId() / 10000000;
|
|
|
|
+ jedisCluster.hset(ORDER_INFO.key() + hKey, String.valueOf(flowOrderInfo.getOrderId()), orderString);
|
|
//入MQ队列
|
|
//入MQ队列
|
|
rocketMQTemplate.syncSendOrderly(ORDER_TOPIC + ":" + (flowOrderInfo.getStatus().equals(OrderStatus.ORDER_SUCCESS.status()) ? RocketTags.SUCCESS_TAG:RocketTags.FAIL_TAG), MessageBuilder.withPayload(orderString).build(), String.valueOf(flowOrderInfo.getOrderId()));
|
|
rocketMQTemplate.syncSendOrderly(ORDER_TOPIC + ":" + (flowOrderInfo.getStatus().equals(OrderStatus.ORDER_SUCCESS.status()) ? RocketTags.SUCCESS_TAG:RocketTags.FAIL_TAG), MessageBuilder.withPayload(orderString).build(), String.valueOf(flowOrderInfo.getOrderId()));
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|