From 54ddf8ce5b24c055d2d7e273b29777a136427494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Fri, 27 Dec 2024 08:55:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96openid=E7=9A=84bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/DeviceOtherMsgConsumer.java | 4 ++++ .../data/controller/pay/WeChatPayController.java | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java index b3e40b3..0403351 100644 --- a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java +++ b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java @@ -71,6 +71,7 @@ public class DeviceOtherMsgConsumer { if(jsonObject.getStr("type")!=null){ if(jsonObject.getStr("type").equals("waterEleData")){ String data1 = jsonObject.getStr("data"); + //收到定时报文 if(JSONUtil.parseObj(data1).get("action").equals("timeMsg")){ //更新设备在线状态 updateDeviceOnlineStatus( productId,serialNumber); @@ -79,6 +80,9 @@ public class DeviceOtherMsgConsumer { if(i<1){ System.err.println("--------------------------保存使用记录失败!---------------------------"); } + }else if(JSONUtil.parseObj(data1).get("action").equals("safeMsg")){ + //续费在线状态 + updateDeviceOnlineStatus( productId,serialNumber); } } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/pay/WeChatPayController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/pay/WeChatPayController.java index 5fb3a61..aba765d 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/pay/WeChatPayController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/pay/WeChatPayController.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; @@ -47,6 +48,9 @@ import static com.fastbee.common.constant.Constants.LANGUAGE; import static com.fastbee.common.utils.pay.RSAUtil.verifySignature; import static com.fastbee.rechargecard.service.impl.UserWechatPayServiceImpl.apiV3Key; +/** + * @author mijiupro + */ @Api(tags = "支付模块") @Slf4j @RestController @@ -87,6 +91,9 @@ public class WeChatPayController extends BaseController { @PostMapping("/getOpenId") public Map BuildOrder(@RequestBody String code) { + if(StringUtils.isBlank(code)){ + return AjaxResult.error("code不能为空！"); + } Map result=userWechatPayService.GetOpenId(code); Map returnParams=new HashMap<>(); if(result.get("openid")==null && result.get("errcode")!=null) @@ -105,6 +112,10 @@ public class WeChatPayController extends BaseController { //return warn("验证码已失效，请重新获取"); } } + if(result.get("openid")==null){ + return error("获取openid失败"); + } + return success(result.get("openid").toString()); } @@ -121,10 +132,10 @@ public class WeChatPayController extends BaseController { { out_trade_no=UUID.randomUUID().toString().replace("-", "");; } - //System.out.println(out_trade_no); + System.err.println("随机字符串"+out_trade_no); recharge.setRechargeCode(out_trade_no); Map result = userWechatPayService.CreateOrder(recharge); // 生成订单 - + System.err.println("创建订单完成：" +result); //打印出返回前端的所有参数 // 获取键的集合 Set keySet = result.keySet();