From 958f63acf15b0fae95624aabd75b81997c00ee77 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Fri, 21 Jun 2024 16:27:44 +0800 Subject: [PATCH 1/2] 1 --- .../src/main/java/com/web/controller/OrderPayController.java | 3 --- hai-service/src/main/java/com/hai/common/utils/WxUtils.java | 1 - 2 files changed, 4 deletions(-) diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java index c856726e..9f2176bf 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayController.java +++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java @@ -418,7 +418,6 @@ public class OrderPayController { } } - // weChatPayReqInfo.setOpenid(openId); weChatPayReqInfo.setSub_openid(body.getString("openId")); weChatPayReqInfo.setNonce_str(nonce_str); // 随机字符串 @@ -435,8 +434,6 @@ public class OrderPayController { SortedMap sortedMap; - System.out.println("-----------------------" + payPlatformType); - if (payPlatformType == 2) { objectGas.put("outTradeNo" , order.getOrderNo()); objectGas.put("transType" , "JSAPI"); diff --git a/hai-service/src/main/java/com/hai/common/utils/WxUtils.java b/hai-service/src/main/java/com/hai/common/utils/WxUtils.java index 0bbd1879..282810b1 100644 --- a/hai-service/src/main/java/com/hai/common/utils/WxUtils.java +++ b/hai-service/src/main/java/com/hai/common/utils/WxUtils.java @@ -480,7 +480,6 @@ public class WxUtils { Set keySet = data.keySet(); String[] keyArray = keySet.toArray(new String[keySet.size()]); -// Arrays.sort(keyArray); StringBuilder sb = new StringBuilder(); for (String k : keyArray) { if (k.equals(WXPayConstants.FIELD_SIGN)) { From c18c1443a79b9cbf6995baa20cc692aee73c601e Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Fri, 21 Jun 2024 16:41:56 +0800 Subject: [PATCH 2/2] 1 --- .../controller/Etc/EtcCustomerController.java | 7 +------ .../com/web/controller/OrderPayController.java | 15 +-------------- .../main/java/com/hai/etc/EtcCustMsgService.java | 2 ++ .../com/hai/etc/impl/EtcCustMsgServiceImpl.java | 5 +++++ 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java b/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java index 4006a157..12734770 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/Etc/EtcCustomerController.java @@ -399,10 +399,6 @@ public class EtcCustomerController { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到相关内容！"); } - if (etcCarMsg.getVehStatus() == 11 || etcCarMsg.getVehStatus() == 12 || etcCarMsg.getVehStatus() == 13 || etcCarMsg.getVehStatus() == 15 || etcCarMsg.getVehStatus() == 20) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "状态错误！"); - } - etcCarMsgService.deleteEtcCar(id); return ResponseMsgUtil.success("删除成功！"); @@ -424,8 +420,7 @@ public class EtcCustomerController { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到相关内容！"); } - etcCustMsg.setStatus(0); - etcCustMsgService.editEtcCust(etcCustMsg); + etcCustMsgService.deleteEtcCust(id); return ResponseMsgUtil.success("删除成功！"); diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java index 9f2176bf..cf39b77f 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayController.java +++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java @@ -373,20 +373,7 @@ public class OrderPayController { weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1667177808); } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE12.getNumber())) { -// weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); -// - // 查询支付配置 - HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type2); - if (gasChannelConfig == null) { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); - } - - payPlatformType = gasChannelConfig.getPayPlatformType(); - payPlatformKey = gasChannelConfig.getPayPlatformMerKey(); - payPlatformMerNo = gasChannelConfig.getPayPlatformMerNo(); - - weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo()); - profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N"; + weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE15.getNumber())) { // 查询支付配置 HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type7); diff --git a/hai-service/src/main/java/com/hai/etc/EtcCustMsgService.java b/hai-service/src/main/java/com/hai/etc/EtcCustMsgService.java index d14b6b9d..2775597f 100644 --- a/hai-service/src/main/java/com/hai/etc/EtcCustMsgService.java +++ b/hai-service/src/main/java/com/hai/etc/EtcCustMsgService.java @@ -37,6 +37,8 @@ public interface EtcCustMsgService { void editEtcCust(EtcCustMsg etcCustMsg) throws Exception; + void deleteEtcCust(Long id) throws Exception; + /** * @Author Sum1Dream * @Name getCustInfoList diff --git a/hai-service/src/main/java/com/hai/etc/impl/EtcCustMsgServiceImpl.java b/hai-service/src/main/java/com/hai/etc/impl/EtcCustMsgServiceImpl.java index 1a9f5c14..2050c7ba 100644 --- a/hai-service/src/main/java/com/hai/etc/impl/EtcCustMsgServiceImpl.java +++ b/hai-service/src/main/java/com/hai/etc/impl/EtcCustMsgServiceImpl.java @@ -47,6 +47,11 @@ public class EtcCustMsgServiceImpl implements EtcCustMsgService { etcCustMsgMapper.updateByPrimaryKey(etcCustMsg); } + @Override + public void deleteEtcCust(Long id) throws Exception { + etcCustMsgMapper.deleteByPrimaryKey(id); + } + @Override public List getEtcCustList(Map map) {