From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PaymentCtrl.java | 27 --------------------------- 1 files changed, 0 insertions(+), 27 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PaymentCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PaymentCtrl.java index bb69aa9..49b6ef7 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PaymentCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PaymentCtrl.java @@ -517,31 +517,4 @@ return result; } - @PostMapping(path = "add_wechatpay", consumes = MediaType.APPLICATION_JSON_VALUE) - @Transactional(rollbackFor = Exception.class) - @SsoAop() - public BaseResponse<Boolean> addWechatpay(@RequestBody @Valid Wechatpay po, BindingResult bindingResult) { - if(bindingResult != null && bindingResult.hasErrors()){ - return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); - } - - if(paymentSv.getWechatpayByAppId(po.getAppId()) != null) { - return BaseResponseUtils.buildErrorMsg("璇ュ井淇℃敮浠樹俊鎭凡缁忓瓨鍦�"); - } - - SeWechatpay seWechatpay = new SeWechatpay(); - seWechatpay.setAppId(po.getAppId()); - seWechatpay.setAppSecret(po.getAppSecret()); - seWechatpay.setMchId(po.getMchId()); - seWechatpay.setMchKey(po.getMchKey()); - seWechatpay.setSerialNo(po.getSerialNo()); - seWechatpay.setNotifyUrl(po.getNotifyUrl()); - seWechatpay.setRemarks(po.getRemarks()); - - Long rec = Optional.ofNullable(paymentSv.addWechatpay(seWechatpay)).orElse(0L); - if(rec == 0) { - return BaseResponseUtils.buildFail("娣诲姞寰俊鏀粯淇℃伅澶辫触"); - } - return BaseResponseUtils.buildSuccess(true) ; - } } -- Gitblit v1.8.0