ANDRU-PC\Andru
2023-02-22 d173add10a9106c4acd4fa79d86f51fb8f4fa5bd
Merge branch 'master-prod-new'
1个文件已修改
16 ■■■■ 已修改文件
phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderServiceV2Impl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/service/order/impl/OrderServiceV2Impl.java
@@ -428,15 +428,15 @@
                     *      2、开启线程进行处理
                     *      3、贴异步注解方式(@Async)
                     */
//                    OrdersTotal ordersTotalSync = ordersTotal;
//                    JSONArray hisPayListSync = hisPayList;
                    OrdersTotal ordersTotalSync = ordersTotal;
                    JSONArray hisPayListSync = hisPayList;
                    orderNodeBuilder.append("-开始处理老带新");
//                    CompletableFuture<JSONObject> commissionObjectFuture = CompletableFuture.supplyAsync(() -> {
//                        return OrderPayMoneyUtil.handPayOldNew(ordersTotalSync, user, hisPayListSync, commonService);
//                    }, threadPool);
//                    // get 线程返回结果
//                    commissionObject = commissionObjectFuture.get();
                    orderService.handPayOldNew(ordersTotal,user,hisPayList,commonService);
                    CompletableFuture<JSONObject> commissionObjectFuture = CompletableFuture.supplyAsync(() -> {
                        return OrderPayMoneyUtil.handPayOldNew(ordersTotalSync, user, hisPayListSync, commonService);
                    }, threadPool);
                    // get 线程返回结果
                    commissionObject = commissionObjectFuture.get();
//                    orderService.handPayOldNew(ordersTotal,user,hisPayList,commonService);
                    orderNodeBuilder.append("-结束处理老带新");
                }catch (Exception e){