Merge branch 'ka-bugfix-新增接口用于补偿发券工作' into qa

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -49,7 +49,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlemen
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import io.swagger.annotations.ApiOperation;
@@ -111,7 +110,6 @@ public class OrderController {
 
         Map<String, Object> resultMap = new LinkedHashMap<>();
         String remark = "bugfix:遗漏补发";
-        List<Long> deleteSettlementIds = new ArrayList<>();
         for (String orderCode : req.getOrderCodes()) {
             Map<String, Object> msgMap = new HashMap<>();
             QueryByCodeResponse orderInfoResp = orderSdkService.getOrderInfo(null, orderCode, null
@@ -254,24 +252,12 @@ public class OrderController {
                 }
                 msgMap.put("remark", "===补发成功===");
 
-                // todo 获取要删除的 settlemnt 集合
-                List<OrderSettlementResp> deleteSettlementList = orderInfo.getOrderSettlementDetailList();
-                if (CollectionUtils.isNotEmpty(deleteSettlementList) && deleteSettlementList.size() > 1) {
-                    Map<String, List<OrderSettlementResp>> stringListMap = deleteSettlementList.stream().collect(Collectors.groupingBy(OrderSettlementResp::getExternalObjectId));
-                    stringListMap.forEach((key, val) -> {
-                        // 从 第二个开始 需要删除
-                        for (int i = 1; i < val.size(); i++) {
-                            deleteSettlementIds.add(val.get(i).getId());
-                        }
-                    });
-                }
             } else {
                 msgMap.put("remark", "购买商品数据不存在");
             }
 
             // final msg
             resultMap.put(orderCode, msgMap);
-            resultMap.put("deleteIds", deleteSettlementIds);
         }
 
         return ResponseUtil.success(resultMap);