diff --git a/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java b/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java index 1bfeaad..0ff5f1a 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java +++ b/payment-base-app/src/main/java/com/base/springcloud/constant/ErrorConstant.java @@ -28,8 +28,9 @@ public enum ErrorConstant { BILL_COMPLETE_PAYMENT("RBS00023","销售单据已完成付款！"), ALL_BILL_COMPLETE_PAYMENT("RBS00024","所有销售单据已完成付款！"), MISTAKE_TARGET("RBS00025","要提供的对象不是数组！"), - SUPER_REFUND_ORDER_COUNT_FAL("RBS00026","退款订单次数累计失败!"), - SUPER_PAY_ORDER_COUNT_FAL("RBS00027","支付订单次数累计失败!"); + SUPER_REFUND_ORDER_COUNT_FAIL("RBS00026","退款订单次数累计失败!"), + SUPER_PAY_ORDER_COUNT_FAIL("RBS00027","支付订单次数累计失败!"), + ORDER_SYNC_FAIL("RBS00027","订单信息同步失败!"); private String code; private String message; diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/DepartServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/DepartServiceImp.java index e3abe2e..3171680 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/DepartServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/DepartServiceImp.java @@ -20,8 +20,6 @@ import java.util.UUID; @Service public class DepartServiceImp implements DepartService { - Logger logger = LoggerFactory.getLogger(DepartServiceImp.class); - @Autowired private DepartMapper departMapper; diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java index 2ed8abe..055a996 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; @Service public class MerchantServiceImp implements MerchantService { - Logger logger = LoggerFactory.getLogger(MerchantServiceImp.class); + private Logger logger = LoggerFactory.getLogger(MerchantServiceImp.class); @Autowired private MerchantConfigMapper merchantConfigMapper; diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java index a367fe0..3126752 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/OrderServiceImp.java @@ -88,8 +88,9 @@ public class OrderServiceImp implements OrderService { @Override public void updateOrderSuccess(String orderNo) { int count = orderMapper.updateOrderSuccess(orderNo); - if(count > 0) return; - // TODO 抛出业务异常 + if(count > 0) + return; + throw new BusinessException(ErrorConstant.ORDER_SYNC_FAIL); } /** @@ -124,6 +125,6 @@ public class OrderServiceImp implements OrderService { return; int count = orderMapper.superPayCount(id); if(count <= 0) - throw new BusinessException(ErrorConstant.SUPER_PAY_ORDER_COUNT_FAL); + throw new BusinessException(ErrorConstant.SUPER_PAY_ORDER_COUNT_FAIL); } } diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java index 8b6305d..6210d16 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/PaymentServiceImp.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; @Service public class PaymentServiceImp implements PaymentService { - Logger logger = LoggerFactory.getLogger(PaymentServiceImp.class); + private Logger logger = LoggerFactory.getLogger(PaymentServiceImp.class); @Autowired private MerchantService merchantService; @@ -88,10 +88,8 @@ public class PaymentServiceImp implements PaymentService { List orderList = orderService.queryOrder(date); if(!Optional.ofNullable(orderList).isPresent()) return; // 遍历查询第三方订单信息 - orderList.forEach(orderBO -> { - queryOrder(orderBO); - //amqpTemplate.convertSendAndReceive(PaymentConstant.ORDER_QUEUE,orderBO); - }); + //amqpTemplate.convertSendAndReceive(PaymentConstant.ORDER_QUEUE,orderBO); + orderList.forEach(this::queryOrder); } /** diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/RefundServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/RefundServiceImp.java index 82f50b4..2005841 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/RefundServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/RefundServiceImp.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; @Service public class RefundServiceImp implements RefundService { - Logger logger = LoggerFactory.getLogger(RefundServiceImp.class); + private Logger logger = LoggerFactory.getLogger(RefundServiceImp.class); @Autowired private OrderService orderService; @@ -170,12 +170,12 @@ public class RefundServiceImp implements RefundService { * @param refundBO */ private void superRefundCount(RefundBO refundBO) { - String refundId = Optional.ofNullable(refundBO).map(o->o.getRefundId()).orElse(null); + String refundId = Optional.ofNullable(refundBO).map(RefundBO::getRefundId).orElse(null); if(StringUtils.isBlank(refundId)) return; int count = refundMapper.superRefundCount(refundId); if(count < 1) - throw new BusinessException(ErrorConstant.SUPER_REFUND_ORDER_COUNT_FAL); + throw new BusinessException(ErrorConstant.SUPER_REFUND_ORDER_COUNT_FAIL); } } diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java index a756d72..24da111 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/WecPaymentServiceImp.java @@ -26,7 +26,7 @@ import java.util.Map; @Service public class WecPaymentServiceImp implements WecPaymentService { - Logger logger = LoggerFactory.getLogger(WecPaymentServiceImp.class); + private Logger logger = LoggerFactory.getLogger(WecPaymentServiceImp.class); /** * 微信Native支付 @@ -73,9 +73,7 @@ public class WecPaymentServiceImp implements WecPaymentService { wxpayRefundVo.setAmount(wxRefundAmountVo); String refundRsp = WxpayUtils.refund(wxpayRefundVo,refundBO.getMchId(),refundBO.getMchPrivateKey(),refundBO.getCertificate(),refundBO.getSerialNo()); JSONObject jsonObject = JSONObject.parseObject(refundRsp); - if(PaymentConstant.WX_SUCCESS.equals(jsonObject.getString("status"))) - return true; - return false; + return PaymentConstant.WX_SUCCESS.equals(jsonObject.getString("status")); } /**