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 db3065d89..e12ca2d30 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 @@ -361,6 +361,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 查询时间段内订单总金额和总用电量V2 + * * @param dto * @return */ @@ -788,7 +789,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } /** - * * @param orderBasicInfo * @param adapayMemberAccount * @param wechatAppId @@ -840,6 +840,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 获取更新数据后的orderDetail对象 * 专用方法,其他地方如果要用请仔细检查 + * * @return 查询并更新过数据的orderDetail */ private OrderDetail returnUpdateOrderDetail(OrderBasicInfo orderBasicInfo, TransactionRecordsData data) { @@ -1247,8 +1248,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 余额支付订单,使用余额分账 - * @param orderBasicInfo - * @param adapayMemberAccount + * + * @param orderBasicInfo 订单信息 + * @param adapayMemberAccount 汇付用户信息 * @return */ @Override @@ -1259,7 +1261,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { BigDecimal confirmAmt = BigDecimal.ZERO; BigDecimal feeAmt = BigDecimal.ZERO; String status = null; - String description = null; // 获取余额支付扣除金额 也许存在一笔不够扣,需要扣多笔的情况 List list = calculateTheBalanceDeductionAmount(orderBasicInfo.getMemberId(), settleAmount); @@ -1273,7 +1274,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { confirmAmt = confirmAmt.add(new BigDecimal(paymentConfirmResponse.getConfirmed_amt())); feeAmt = feeAmt.add(new BigDecimal(paymentConfirmResponse.getFee_amt())); status = paymentConfirmResponse.getStatus(); - description = paymentConfirmResponse.getDescription(); memberAdapayRecordService.updateSpendAmount(paymentId, deductionAmount); } } @@ -1283,12 +1283,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { result.setConfirmAmt(confirmAmt.toString()); result.setStatus(status); result.setFeeAmt(feeAmt.toString()); - // result.setDescription(description); return result; } /** * 计算余额扣除金额 + * * @param memberId 会员id * @param amount 消费金额/退款金额 */ @@ -2414,6 +2414,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 汇付支付-订单退款处理逻辑 * 汇付支付订单退款 + * * @param dto */ @Override @@ -2511,10 +2512,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 汇付支付余额退款 + * * @param dto */ @Override - public void refundBalanceWithAdapay(ApplyRefundDTO dto){ + public void refundBalanceWithAdapay(ApplyRefundDTO dto) { // 做个拦截,如果前一笔退款没有完成,就抛异常 String redisKey = CacheConstants.MEMBER_BALANCE_REFUNDS_ARE_IN_PROGRESS + dto.getMemberId(); PaymentReverseResponse redisResult = redisCache.getCacheObject(redisKey); @@ -2868,6 +2870,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 查询订单推款记录 + * * @param orderBasicInfo * @return */ @@ -2895,6 +2898,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 重试订单退款 + * * @param orderCode 订单编号 * @throws BaseAdaPayException */ @@ -3024,8 +3028,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 查询余额订单分账信息 + * * @param orderCode 订单编号 - * @param memberId 会员id + * @param memberId 会员id */ private BigDecimal queryBalanceOrderSettleInfo(String orderCode, String memberId, String wechatAppId) { BigDecimal resultAmt = BigDecimal.ZERO; @@ -3041,7 +3046,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { dto.setWechatAppId(wechatAppId); dto.setPaymentId(record.getPaymentId()); QueryPaymentConfirmDetailResponse response = adapayService.queryPaymentConfirmList(dto); - if (response != null && CollectionUtils.isNotEmpty(response.getPaymentConfirms()) ) { + if (response != null && CollectionUtils.isNotEmpty(response.getPaymentConfirms())) { for (QueryPaymentConfirmDetailResponse.PaymentConfirmInfo paymentConfirm : response.getPaymentConfirms()) { JSONObject jsonObject = JSON.parseObject(paymentConfirm.getDescription()); if (StringUtils.equals(jsonObject.getString("orderCode"), orderCode)) {