diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index db2855f00..40c9c240b 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -102,7 +102,7 @@ public class UserThirdCircleOrderController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); }catch(Exception e){ - e.printStackTrace(); + logger.error("异常:" + e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } @@ -162,7 +162,7 @@ public class UserThirdCircleOrderController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); }catch(Exception e){ - e.printStackTrace(); + logger.error("异常:" + e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } @@ -237,7 +237,7 @@ public class UserThirdCircleOrderController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); }catch(Exception e){ - e.printStackTrace(); + logger.error("异常:" + e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java b/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java index 8b481babf..ed6771231 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java @@ -32,7 +32,7 @@ public interface WxThirdPartyOrdersService { * @return */ WxThirdPartyOrders getOrderByTransactionId(EnumThirdOrderType orderType, String transactionId, String tenantId); - WxThirdPartyOrders getRefundOrderByRefundId(String refundId, String tenantId); + WxThirdPartyOrders getRefundOrderByRefundId(EnumThirdOrderType orderType,String refundId, String tenantId); List getRefundOrderByTransactionId(EnumThirdOrderType orderType, String transactionId, String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index e38d229bf..fa0661c6c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -72,8 +72,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService } @Override - public WxThirdPartyOrders getRefundOrderByRefundId(String refundId, String tenantId) { + public WxThirdPartyOrders getRefundOrderByRefundId(EnumThirdOrderType orderType,String refundId, String tenantId) { WxThirdPartyOrders recordQ = new WxThirdPartyOrders(); + recordQ.setSourceType(orderType.getCode()); recordQ.setRefundId(refundId); recordQ.setTenantId(tenantId); return wxThirdPartyOrdersMapper.getRefundOrderByRefundId(recordQ); @@ -191,7 +192,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService logger.error("--第三方退款--付款消息未找到--transactionId="+record.getTransactionId()); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "付款消息未找到"); }else{ - WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(record.getRefundId(),record.getTenantId()); + WxThirdPartyOrders refundOrder = this.getRefundOrderByRefundId(EnumThirdOrderType.RMB_PAY,record.getRefundId(),record.getTenantId()); if(refundOrder != null){ logger.error("--Ali商圈退款--退款消息已存在---RefundId="+record.getRefundId()); }else{ diff --git a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml index f4ccaa263..e28821a96 100644 --- a/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxThirdPartyOrdersMapper.xml @@ -158,7 +158,7 @@ from wx_third_party_orders where `is_refund` = 0 - and `sourceType` = #{sourceType} + and `source_type` = #{sourceType} and `tenant_id` = #{tenantId} and `transaction_id` = #{transactionId} @@ -168,6 +168,7 @@ from wx_third_party_orders where `is_refund` = 1 + and `source_type` = #{sourceType} and tenant_id = #{tenantId} and `refund_id` = #{refundId} @@ -177,7 +178,7 @@ from wx_third_party_orders where `is_refund` = 1 - and `sourceType` = #{sourceType} + and `source_type` = #{sourceType} and `tenant_id` = #{tenantId} and `transaction_id` = #{transactionId}