From 9e190fef360e6e891b9eb22fadc4645b84bc977a Mon Sep 17 00:00:00 2001 From: 0katekate0 <32161300+0katekate0@users.noreply.github.com> Date: Sat, 22 Apr 2023 15:51:15 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#2985=E3=80=90=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E5=A2=9E=E5=8A=A0=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E5=AD=98=E6=A1=A3=E5=B8=B8=E9=87=8F=E7=B1=BB=E5=9E=8B=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/cp/constant/WxCpConsts.java | 55 +++++++++++++++++++ .../weixin/cp/api/WxCpMsgAuditTest.java | 30 +++++----- .../bean/notify/WxPayNotifyV3Response.java | 6 +- .../wxpay/bean/request/BaseWxPayRequest.java | 7 +++ .../impl/BaseWxPayServiceImplTest.java | 21 ++++++- .../src/test/resources/test-config.sample.xml | 6 +- 6 files changed, 104 insertions(+), 21 deletions(-) diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java index a097f6414..7487c6143 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java @@ -175,6 +175,61 @@ public class WxCpConsts { } + /** + * 会话存档媒体类型 + * https://developer.work.weixin.qq.com/document/path/91774 + */ + @UtilityClass + public static class MsgAuditMediaType { + + /** + * 图片 + */ + public static final String IMAGE = "image"; + + /** + * 语音 + */ + public static final String VOICE = "voice"; + + /** + * 视频 + */ + public static final String VIDEO = "video"; + + /** + * 表情 + */ + public static final String EMOTION = "emotion"; + + /** + * 文件 + */ + public static final String FILE = "file"; + + /** + * 音频存档消息 + */ + public static final String MEETING_VOICE_CALL = "meeting_voice_call"; + + /** + * 音频共享文档消息 + */ + public static final String VOIP_DOC_SHARE = "voip_doc_share"; + + @UtilityClass + public static class MsgAuditSuffix { + + public static final String JPG = ".jpg"; + public static final String PNG = ".png"; + public static final String GIF = ".gif"; + public static final String MP4 = ".mp4"; + public static final String AMR = ".amr"; + + } + + } + /** * 家校通讯录变更事件CHANGE_TYPE */ diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java index 60de0dac7..740725cb8 100644 --- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMsgAuditTest.java @@ -165,8 +165,10 @@ public class WxCpMsgAuditTest { /* * 图片，语音，视频，表情，文件，音频存档消息,音频共享文档消息调用 获取媒体消息 */ - List mediaType = Arrays.asList("image", "voice", "video", "emotion", "file", - "meeting_voice_call", "voip_doc_share"); + List mediaType = Arrays.asList(WxCpConsts.MsgAuditMediaType.IMAGE, + WxCpConsts.MsgAuditMediaType.VOICE, WxCpConsts.MsgAuditMediaType.VIDEO, + WxCpConsts.MsgAuditMediaType.EMOTION, WxCpConsts.MsgAuditMediaType.FILE, + WxCpConsts.MsgAuditMediaType.MEETING_VOICE_CALL, WxCpConsts.MsgAuditMediaType.VOIP_DOC_SHARE); // 模拟多次拉取数据，根据seq拉取 for (int i = 0; i < 3; i++) { @@ -214,43 +216,43 @@ public class WxCpMsgAuditTest { // sdkFileId String sdkFileId = ""; switch (msgType) { - case "image": - suffix = ".jpg"; + case WxCpConsts.MsgAuditMediaType.IMAGE: + suffix = WxCpConsts.MsgAuditMediaType.MsgAuditSuffix.JPG; md5Sum = decryptData.getImage().getMd5Sum(); sdkFileId = decryptData.getImage().getSdkFileId(); break; - case "voice": - suffix = ".amr"; + case WxCpConsts.MsgAuditMediaType.VOICE: + suffix = WxCpConsts.MsgAuditMediaType.MsgAuditSuffix.AMR; md5Sum = decryptData.getVoice().getMd5Sum(); sdkFileId = decryptData.getVoice().getSdkFileId(); break; - case "video": - suffix = ".mp4"; + case WxCpConsts.MsgAuditMediaType.VIDEO: + suffix = WxCpConsts.MsgAuditMediaType.MsgAuditSuffix.MP4; md5Sum = decryptData.getVideo().getMd5Sum(); sdkFileId = decryptData.getVideo().getSdkFileId(); break; - case "emotion": + case WxCpConsts.MsgAuditMediaType.EMOTION: md5Sum = decryptData.getEmotion().getMd5Sum(); sdkFileId = decryptData.getEmotion().getSdkFileId(); int type = decryptData.getEmotion().getType(); switch (type) { case 1: - suffix = ".gif"; + suffix = WxCpConsts.MsgAuditMediaType.MsgAuditSuffix.GIF; break; case 2: - suffix = ".png"; + suffix = WxCpConsts.MsgAuditMediaType.MsgAuditSuffix.PNG; break; default: return; } break; - case "file": + case WxCpConsts.MsgAuditMediaType.FILE: md5Sum = decryptData.getFile().getMd5Sum(); suffix = "." + decryptData.getFile().getFileExt(); sdkFileId = decryptData.getFile().getSdkFileId(); break; // 音频存档消息 - case "meeting_voice_call": + case WxCpConsts.MsgAuditMediaType.MEETING_VOICE_CALL: md5Sum = decryptData.getVoiceId(); sdkFileId = decryptData.getMeetingVoiceCall().getSdkFileId(); @@ -262,7 +264,7 @@ public class WxCpMsgAuditTest { break; // 音频共享文档消息 - case "voip_doc_share": + case WxCpConsts.MsgAuditMediaType.VOIP_DOC_SHARE: md5Sum = decryptData.getVoipId(); WxCpFileItem docShare = decryptData.getVoipDocShare(); diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyV3Response.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyV3Response.java index 58a2eb66b..b9d7f4d9f 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyV3Response.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyV3Response.java @@ -1,10 +1,10 @@ package com.github.binarywang.wxpay.bean.notify; -import com.google.gson.Gson; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import me.chanjar.weixin.common.util.json.WxGsonBuilder; /** * 微信支付订单和退款的异步通知，V3版本共用的响应类. @@ -33,7 +33,7 @@ public class WxPayNotifyV3Response { */ public static String success(String msg) { WxPayNotifyV3Response response = new WxPayNotifyV3Response(SUCCESS, msg); - return new Gson().toJson(response); + return WxGsonBuilder.create().toJson(response); } /** @@ -44,7 +44,7 @@ public class WxPayNotifyV3Response { */ public static String fail(String msg) { WxPayNotifyV3Response response = new WxPayNotifyV3Response(FAIL, msg); - return new Gson().toJson(response); + return WxGsonBuilder.create().toJson(response); } } diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java index 6d227f636..5eeeb3660 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java @@ -157,6 +157,13 @@ public abstract class BaseWxPayRequest implements Serializable { return yuan.multiply(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP).intValue(); } + /** + * 分转元 + */ + public static BigDecimal fen2Yuan(BigDecimal fen) { + return fen.divide(BigDecimal.valueOf(100)).setScale(2, BigDecimal.ROUND_HALF_UP); + } + /** * 检查请求参数内容，包括必填参数以及特殊约束. */ diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java index 10781cf6e..ad4a36962 100644 --- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java +++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java @@ -779,7 +779,7 @@ public class BaseWxPayServiceImplTest { * @throws Exception the exception */ @Test - public void testParseOrderNotifyV3Result(HttpServletRequest request, HttpServletResponse response) throws Exception { + public String testParseOrderNotifyV3Result(HttpServletRequest request, HttpServletResponse response) throws Exception { String timestamp = request.getHeader("Wechatpay-Timestamp"); Optional.ofNullable(timestamp).orElseThrow(() -> new RuntimeException("时间戳不能为空")); @@ -799,6 +799,8 @@ public class BaseWxPayServiceImplTest { final WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = this.payService.parseOrderNotifyV3Result(RequestUtils.readData(request), new SignatureHeader(timestamp, nonce, signature, serialNo)); log.info(GSON.toJson(wxPayOrderNotifyV3Result)); + + return WxPayNotifyV3Response.success("成功"); } /** @@ -808,7 +810,7 @@ public class BaseWxPayServiceImplTest { * @throws Exception the exception */ @Test - public void testParseRefundNotifyV3Result(HttpServletRequest request, HttpServletResponse response) throws Exception { + public String testParseRefundNotifyV3Result(HttpServletRequest request, HttpServletResponse response) throws Exception { String timestamp = request.getHeader("Wechatpay-Timestamp"); Optional.ofNullable(timestamp).orElseThrow(() -> new RuntimeException("时间戳不能为空")); @@ -827,6 +829,21 @@ public class BaseWxPayServiceImplTest { final WxPayRefundNotifyV3Result wxPayRefundNotifyV3Result = this.payService.parseRefundNotifyV3Result(RequestUtils.readData(request), new SignatureHeader(timestamp, nonce, signature, serialNo)); log.info(GSON.toJson(wxPayRefundNotifyV3Result)); + + // 退款金额 + final WxPayRefundNotifyV3Result.DecryptNotifyResult result = wxPayRefundNotifyV3Result.getResult(); + final BigDecimal total = BaseWxPayRequest.fen2Yuan(BigDecimal.valueOf(result.getAmount().getTotal())); + final BigDecimal payerRefund = BaseWxPayRequest.fen2Yuan(BigDecimal.valueOf(result.getAmount().getPayerRefund())); + + // 处理业务逻辑 ... + + return WxPayNotifyV3Response.success("成功"); + } + + @Test + public void testWxPayNotifyV3Response() { + System.out.println(WxPayNotifyV3Response.success("success")); + System.out.println(WxPayNotifyV3Response.fail("fail")); } @Test diff --git a/weixin-java-pay/src/test/resources/test-config.sample.xml b/weixin-java-pay/src/test/resources/test-config.sample.xml index 9a299b8ac..a63cd8dc3 100644 --- a/weixin-java-pay/src/test/resources/test-config.sample.xml +++ b/weixin-java-pay/src/test/resources/test-config.sample.xml @@ -1,12 +1,14 @@ - 公众号appid - 微信商户平台ID + + appid + 微信商户平台ID + 商户平台设置的API密钥 商户平台的证书文件地址