From a266b18ddafe225bfcb0a6a505223526ad25bcfd Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 15 Nov 2023 16:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/web/config/AuthConfig.java | 1 + .../notify/HuiPayNotifyController.java | 10 ++++++- .../dao/HighGasClassGroupTaskMapperExt.java | 27 ++++++++----------- .../impl/OrderPayBeforeServiceImpl.java | 12 ++++----- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/hai-order/src/main/java/com/web/config/AuthConfig.java b/hai-order/src/main/java/com/web/config/AuthConfig.java index 619df5e5..a4f245c8 100644 --- a/hai-order/src/main/java/com/web/config/AuthConfig.java +++ b/hai-order/src/main/java/com/web/config/AuthConfig.java @@ -91,6 +91,7 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/**/swagger-ui.html") .excludePathPatterns("/login/*") .excludePathPatterns("/createNL") + .excludePathPatterns("/getDetailByOrderNo") .excludePathPatterns("/cqNotify/*") .excludePathPatterns("/mobileRechargeNotify/*") .excludePathPatterns("/payNotify/*") diff --git a/hai-order/src/main/java/com/web/controller/notify/HuiPayNotifyController.java b/hai-order/src/main/java/com/web/controller/notify/HuiPayNotifyController.java index b3e114f4..ebaeb4bd 100644 --- a/hai-order/src/main/java/com/web/controller/notify/HuiPayNotifyController.java +++ b/hai-order/src/main/java/com/web/controller/notify/HuiPayNotifyController.java @@ -49,9 +49,17 @@ public class HuiPayNotifyController { // 查询交易订单 HighOrder order = orderService.getOrderDetailByNo(dataObject.getString("outTradeNo")); if (order != null && order.getOrderStatus().equals(OrderStatus.STATUS1.getNumber())) { + OrderPayType orderPayType = null; + if (dataObject.getString("payMode").equals("WECHAT")) { + orderPayType = OrderPayType.PAY_TYPE2; + } else if (dataObject.getString("payMode").equals("ALIPAY")) { + orderPayType = OrderPayType.PAY_TYPE1; + } else if (dataObject.getString("payMode").equals("UQRCODEPAY")) { + orderPayType = OrderPayType.PAY_TYPE5; + } // 处理订单业务 paySuccessService.orderPaySuccessHandle(dataObject.getString("outTradeNo"), - OrderPayType.PAY_TYPE2, + orderPayType, dataObject.getString("accTradeNo"), dataObject.getBigDecimal("tradeAmount"), null); diff --git a/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java index 82bba05d..0ea5a7c8 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighGasClassGroupTaskMapperExt.java @@ -13,27 +13,23 @@ public interface HighGasClassGroupTaskMapperExt { @Select("") Map countRefuelData(@Param("gasClassGroupTaskId") Long gasClassGroupTaskId); @Select("") Map countRefundData(@Param("gasClassGroupTaskId") Long gasClassGroupTaskId); @@ -46,12 +42,11 @@ public interface HighGasClassGroupTaskMapperExt { " FROM" + " high_gas_oil_price a " + " LEFT JOIN (select gas_oil_no," + - " case when SUM(a.total_price) is not null then SUM(a.total_price) else 0 end refuelPrice," + + " case when SUM(a.gas_refuel_price) is not null then SUM(a.gas_refuel_price) else 0 end refuelPrice," + " COUNT(1) refuelNum," + " case when SUM(a.gas_oil_liters) is not null then SUM(a.gas_oil_liters) else 0 end refuelLiters" + - " from high_child_order a" + - " LEFT JOIN high_order b on b.id = a.order_id" + - " where a.gas_class_group_task_id = #{gasClassGroupTaskId} and a.goods_type = 3 and b.order_status in (2,3)" + + " from high_gas_order a" + + " where a.gas_class_group_task_id = #{gasClassGroupTaskId} and a.status in (4)" + " GROUP BY a.gas_oil_no) b on b.gas_oil_no = a.oil_no" + " WHERE a.merchant_store_id = #{gasId} and 0 ]]> " + "") diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java index 235c8bea..55fb3306 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java @@ -51,41 +51,41 @@ public class OrderPayBeforeServiceImpl implements OrderPayBeforeService { if (store.getSourceType().equals(MerchantStoreSourceType.type1.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type1, GasChannelPayPlatformType.type1 ); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type1); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); } } else if (store.getSourceType().equals(MerchantStoreSourceType.type2.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type2,GasChannelPayPlatformType.type1 ); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type2); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); } } else if (store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type3,GasChannelPayPlatformType.type1 ); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type3); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); } } else if (store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type4,GasChannelPayPlatformType.type1 ); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type4); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); } } else if (store.getSourceType().equals(MerchantStoreSourceType.type5.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type5,GasChannelPayPlatformType.type1 ); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type5); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); } } else if (store.getSourceType().equals(MerchantStoreSourceType.type6.getNumber())) { // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type6,GasChannelPayPlatformType.type1 ); + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type6); if (gasChannelConfig == null) { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); }