diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java index 24e12dee4..6126907f9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java @@ -495,6 +495,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { */ @Override public void refundBalance(ApplyRefundDTO dto) { + logger.info("【{}】-余额退款start dto:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); // 做个拦截,如果前一笔退款没有完成,就抛异常 String redisKey = CacheConstants.MEMBER_BALANCE_REFUNDS_ARE_IN_PROGRESS + dto.getMemberId(); PaymentReverseResponse redisResult = redisCache.getCacheObject(redisKey); @@ -539,7 +540,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { */ @Transactional(rollbackFor = Exception.class) public void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) { - logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); + logger.info("【{}】-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); // 订单编号 String orderCode = orderBasicInfo.getOrderCode(); // 订单消费金额 @@ -583,7 +584,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { * 在线支付订单退款 */ private void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) { - logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); + logger.info("【{}】-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); // 订单编号 String orderCode = orderBasicInfo.getOrderCode(); @@ -611,7 +612,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic { * @param dto */ private void refundOrderWithAdapay(ApplyRefundDTO dto) { - logger.info("{}-汇付支付订单:{}, 执行退款逻辑 param:{}", this.getClass().getSimpleName(), dto.getOrderCode(), JSON.toJSONString(dto)); + logger.info("【{}】-汇付支付订单:{}, 执行退款逻辑 param:{}", this.getClass().getSimpleName(), dto.getOrderCode(), JSON.toJSONString(dto)); // 查出来原来的支付信息 AdapayCallbackRecord callbackRecord = adapayCallbackRecordService.selectByOrderCode(dto.getOrderCode()); if (Objects.isNull(callbackRecord)) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java index ab550f0bf..1a8b5a134 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java @@ -66,7 +66,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ */ @Override public OrderBasicInfo generateOrder(GenerateOrderDTO dto) throws ParseException { - logger.info("{}-生成订单start, param:{}", this.getClass().getSimpleName(), JSONObject.toJSONString(dto)); + logger.info("【{}】-生成订单start, param:{}", this.getClass().getSimpleName(), JSONObject.toJSONString(dto)); // 处理前端传的参数 analysisPileParameter(dto); @@ -184,7 +184,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ @Override public Map payOrder(PayOrderDTO dto) { - logger.info("{}-支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); + logger.info("【{}】-支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(dto.getOrderCode()); if (orderInfo == null) { throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_INFO_IS_NULL); @@ -221,7 +221,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ * @param dto */ public void balancePayOrder(PayOrderDTO dto) { - logger.info("{}-余额支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); + logger.info("【{}】-余额支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); String orderCode = dto.getOrderCode(); // 订单编号 BigDecimal chargeAmount = dto.getPayAmount(); // 支付金额 // 查询该会员的余额 @@ -307,7 +307,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ * @param dto */ public Map onlinePaymentOrder(PayOrderDTO dto) { - logger.info("{}-在线支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); + logger.info("【{}】-在线支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); Map weixinMap = adapayService.createPayment(dto); return weixinMap; } @@ -318,7 +318,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ * @param dto */ public void whitelistPaymentOrder(PayOrderDTO dto) { - logger.info("{}-白名单支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); + logger.info("【{}】-白名单支付订单start, param:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); String orderCode = dto.getOrderCode(); BigDecimal payAmount = dto.getPayAmount(); String payMode = dto.getPayMode(); @@ -342,7 +342,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ */ @Override public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) { - logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo)); + logger.info("【{}】-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo)); // 判断订单状态 if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) { logger.info("结算订单:{}, 是订单完成状态", orderBasicInfo.getOrderCode()); @@ -463,6 +463,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ */ @Override public void refundBalance(ApplyRefundDTO dto) { + logger.info("【{}】-余额退款start dto:{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); // 做个拦截,如果前一笔退款没有完成,就抛异常 String redisKey = CacheConstants.MEMBER_BALANCE_REFUNDS_ARE_IN_PROGRESS + dto.getMemberId(); RefundResponse redisResult = redisCache.getCacheObject(redisKey); @@ -521,7 +522,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ */ @Transactional(rollbackFor = Exception.class) public void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) { - logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); + logger.info("【{}】-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); // 订单编号 String orderCode = orderBasicInfo.getOrderCode(); // 订单消费金额 @@ -573,7 +574,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ * @param orderBasicInfo */ private void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) { - logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); + logger.info("【{}】-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo)); // 订单编号 String orderCode = orderBasicInfo.getOrderCode(); @@ -601,7 +602,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{ * @param dto */ private void refundOrderWithAdapay(ApplyRefundDTO dto) { - logger.info("{}-汇付支付订单:{}, 执行退款逻辑 param:{}", this.getClass().getSimpleName(), dto.getOrderCode(), JSON.toJSONString(dto)); + logger.info("【{}】-汇付支付订单:{}, 执行退款逻辑 param:{}", this.getClass().getSimpleName(), dto.getOrderCode(), JSON.toJSONString(dto)); // 查出来原来的支付信息 AdapayCallbackRecord callbackRecord = adapayCallbackRecordService.selectByOrderCode(dto.getOrderCode()); if (Objects.isNull(callbackRecord)) {