From 2a06b2e866eff968833fe0705d031e0ac028541b Mon Sep 17 00:00:00 2001
From: zhujunshuai <602228920@qq.com>
Date: Fri, 7 Apr 2023 17:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/pluss/platform/util/MobV2PushUtil.java   | 2 ++
 .../src/main/resources/config/application-common.yml          | 2 +-
 pluss-manage-page/src/main/resources/application.yml          | 3 +++
 .../platform/merchantOrder/impl/MerchantOrderServiceImpl.java | 4 ++--
 .../java/cn/pluss/platform/user/impl/GeneralPushUtil.java     | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java
index 48e576f..0c733bc 100644
--- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java
@@ -162,6 +162,8 @@ public class MobV2PushUtil {
 
         ApiResult<Map<String, Map<String, String>>> apiResult = pushApi.pushBatchByAlias(pushBatchDTO);
 
+        log.info("[uni推送]PushResult result is {}", apiResult.getData());
+
         if (apiResult.isSuccess()) {
             // success
             System.out.println(apiResult.getData());
diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml
index bcef10e..aa34061 100644
--- a/pluss-common-bundle/src/main/resources/config/application-common.yml
+++ b/pluss-common-bundle/src/main/resources/config/application-common.yml
@@ -100,7 +100,7 @@ parameter:
   APPID: wx212769170d2c6b2a
   # wxfffc7bff64c7a11e
   #小程序付款APPID
-  APPLETS_APPID: wxfffc7bff64c7a11e
+  APPLETS_APPID: wxc2bb94c0ddda1032
   APPSECRET: 4e00bbf3fc75a1ff68ce866fd13f2bcc
   # b84ee0efaa0d9a649746ac65525f8e10
   KEY: 微信原生加密用的KEY
diff --git a/pluss-manage-page/src/main/resources/application.yml b/pluss-manage-page/src/main/resources/application.yml
index 978381b..348b186 100644
--- a/pluss-manage-page/src/main/resources/application.yml
+++ b/pluss-manage-page/src/main/resources/application.yml
@@ -31,3 +31,6 @@ server:
   port: 8083
   servlet:
     context-path: /manage
+  compression:
+    enabled: true
+    mime-types: application/json
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
index f07514b..47f6d80 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
@@ -1964,7 +1964,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
         try {
             Notice notice = new Notice(2,98,userApp);
             notice.setUniqueKey(order.getOrderNumber()+userApp.getUserId());
-            String content = "收银呗到账" + order.getConsumeFee() + "元";
+            String content = "快银到账" + order.getConsumeFee() + "元";
             notice.setConrtent(content);
             noticeService.saveOrUpdate(notice);
             // 会员充值播报
@@ -1976,7 +1976,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
                 }
             }else{
                 if(UserVoice.ENABLE.equals(voice.getPaySuccess())){
-                    generalPushUtil.sendAllPlatByAlias(alias, "收银呗到账通知", content, extrasparam);
+                    generalPushUtil.sendAllPlatByAlias(alias, content, content, extrasparam);
                 }
             }
             //发送模板消息
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
index 464b2cf..80441de 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java
@@ -68,7 +68,7 @@ public class GeneralPushUtil implements IPush {
             mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam);
             userPushService.push(alias, notificationTitle, msgContent, extrasParam);*/
 
-            MobV2PushUtil.sendSingleByAlias(alias, "快银到账1万元", "快银到账1万元", "payload:{voice:\"快银到账1万元\",type:\"1\"}}");
+            MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}");
 
         } catch (Exception e) {
             e.printStackTrace();