diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index a5414d4f4..3af268e99 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -22,6 +22,7 @@ import com.jsowell.pile.service.IMemberPlateNumberRelationService; import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.vo.MemberBalanceVO; import com.jsowell.service.OrderService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -259,27 +260,28 @@ public class TempController extends BaseController { /** - * 批量退款接口 + * 批量余额退款接口 * * @param dto * @return */ @PostMapping("/batchWechatRefund") public RestApiResponse batchWechatRefund(@RequestBody ApplyRefundDTO dto) { - logger.info("批量退款接口 params:{}", JSONObject.toJSONString(dto)); + logger.info("批量余额退款接口 params:{}", JSONObject.toJSONString(dto)); RestApiResponse response = null; List memberIdList = dto.getMemberIdList(); try { // 查询出本金金额 List memberRefundAmount = memberBasicInfoService.getMemberRefundAmount(memberIdList); - // ApplyRefundDTO refundDTO; - for (MemberBalanceVO memberBalanceVO : memberRefundAmount) { - dto = new ApplyRefundDTO(); - dto.setMemberId(memberBalanceVO.getMemberId()); - dto.setRefundType("2"); - dto.setRefundAmount(new BigDecimal(memberBalanceVO.getPrincipalAmount())); - // 调用退款接口 - orderService.weChatRefund(dto); + if (CollectionUtils.isNotEmpty(memberRefundAmount)) { + memberRefundAmount.parallelStream().forEach(memberBalanceVO -> { + ApplyRefundDTO refundDTO = new ApplyRefundDTO(); + refundDTO.setMemberId(memberBalanceVO.getMemberId()); + refundDTO.setRefundType("2"); + refundDTO.setRefundAmount(new BigDecimal(memberBalanceVO.getPrincipalAmount())); + // 调用退款接口 + orderService.weChatRefund(refundDTO); + }); } response = new RestApiResponse<>(); } catch (Exception e) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index bc5d9c6ed..1da37b2d1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1803,8 +1803,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (CollectionUtils.isNotEmpty(requestList)) { for (WechatPayRefundRequest refundRequest : requestList) { try { - return wechatPayService.ApplyForWechatPayRefundV3(refundRequest); - // logger.info("调微信退款API退款====={}", JSONObject.toJSONString(refundRequest)); + WechatPayRefundResponse wechatPayRefundResponse = wechatPayService.ApplyForWechatPayRefundV3(refundRequest); + logger.info("调微信退款API退款====={}", JSONObject.toJSONString(wechatPayRefundResponse)); } catch (Exception e) { logger.error("调微信退款API发生异常", e); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java index 87f656814..b6cc33d07 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java @@ -111,13 +111,6 @@ public class AMapServiceImpl implements AMapService { }).collect(Collectors.toList()) ).fork().join(); - // List resultList = pageInfo.getList().parallelStream().map(x -> { - // try { - // return assembleAMapData(x); - // } catch (ExecutionException | InterruptedException e) { - // throw new RuntimeException(e); - // } - // }).collect(Collectors.toList()); sw.stop(); log.info("接口耗时:{}, 详情:{}", sw.getTotalTimeMillis(), sw.prettyPrint()); return resultList;