Merge branch 'master' of gitee.com:super-shopkeeper/chaozhanggui into ys

Signed-off-by: liuyingfang <8517512+liuyingfang@user.noreply.gitee.com>

pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java

@@ -229,6 +229,11 @@ public class GetuiPushUtil implements IPush {
         sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam);
     }
 
+    @Override
+    public void sendAllPlatByAliasExt(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+
+    }
+
     @Override
     public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
         init();

pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java

@@ -34,6 +34,16 @@ public interface IPush {
      */
     void sendAllPlatByAlias(List<String> alias, String notificationTitle, String msgContent, String extrasParam);
 
+    /**
+     * 推送到全部，android & iOS
+     *
+     * @param alias             id数组
+     * @param notificationTitle 推送通知标题
+     * @param msgContent        推送内容
+     * @param extrasParam       附加参数
+     */
+    void  sendAllPlatByAliasExt(List<String> alias, String notificationTitle, String msgContent, String extrasParam);
+
     /**
      * 推送到全部iphone
      *

pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java

@@ -96,6 +96,11 @@ public class JGPushUtil implements IPush {
         sendAndResultHandle(pushPayload);
     }
 
+    @Override
+    public void sendAllPlatByAliasExt(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+
+    }
+
     @Override
     public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
         PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam)

pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java

@@ -119,6 +119,11 @@ public class MobPushUtil implements IPush {
         sendAndResultHandle(push);
     }
 
+    @Override
+    public void sendAllPlatByAliasExt(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+
+    }
+
     @Override
     public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) {
         PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam);

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());

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

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

pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java

@@ -188,6 +188,7 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
 
         UserApp userApp = new UserApp().setMerchantCode(merchantCode).setUserType("promoter");
         userApp = userAppService.queryUserApp(userApp);
+
         //TODO 微信机器人消息推送暂时干掉
         //wxTalkService.sendAuditAlert(userApp.getUserId() + "");
     }
@@ -233,7 +234,7 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl<MerchantChanne
         generalPushUtil.sendAllPlatByAlias(Collections.singletonList(userApp.getUserId() + ""), "收银呗审核通知", errMsg, "1");
 
         // 机器人发送已处理的信息到群组
-        wxTalkService.sendAuditResultAlert(userApp.getUserId() + "");
+        //wxTalkService.sendAuditResultAlert(userApp.getUserId() + "");
     }
 
     @Override

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.sendAllPlatByAliasExt(alias, content, content, extrasparam);
                 }
             }
             //发送模板消息

pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java

@@ -120,9 +120,10 @@ public abstract class BaseMerAuditHandler<T extends IMerAuditHandler> implements
             QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
                     .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
             MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
-            String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            //String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store";
             StringBuffer sb = new StringBuffer(baseUrl);
-            sb.append("&title=").append(merchantBaseInfo.getAlias());
+            sb.append("?title=").append(merchantBaseInfo.getAlias());
             sb.append("&password=").append(userInfo.getPassword().toLowerCase());
             sb.append("&mobile=").append(userInfo.getLoginName());
             sb.append("&syb_m_id=").append(merchantStore.getId());

pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java

@@ -277,9 +277,10 @@ public class RyxMerAuditHandler {
             QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
                     .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
             MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
-            String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            //String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store";
             StringBuffer sb = new StringBuffer(baseUrl);
-            sb.append("&title=").append(merchantBaseInfo.getAlias());
+            sb.append("?title=").append(merchantBaseInfo.getAlias());
             sb.append("&password=").append(userInfo.getPassword().toLowerCase());
             sb.append("&mobile=").append(userInfo.getLoginName());
             sb.append("&syb_m_id=").append(merchantStore.getId());

pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java

@@ -350,9 +350,10 @@ public class SxfMerAuditHandler {
             QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
                     .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
             MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
-            String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            //String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store";
             StringBuilder sb = new StringBuilder(baseUrl);
-            sb.append("&title=").append(merchantBaseInfo.getAlias());
+            sb.append("?title=").append(merchantBaseInfo.getAlias());
             sb.append("&password=").append(userInfo.getPassword().toLowerCase());
             sb.append("&mobile=").append(userInfo.getLoginName());
             sb.append("&syb_m_id=").append(merchantStore.getId());

pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java

@@ -68,7 +68,18 @@ 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();
+        }
+    }
+
+    @Override
+    public void sendAllPlatByAliasExt(List<String> alias, String notificationTitle, String msgContent, String extrasParam) {
+        try {
+
+            MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}");
 
         } catch (Exception e) {
             e.printStackTrace();

pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java

@@ -202,9 +202,15 @@ public class MerchantController {
         return "3cdbacb2d4ceefa36ef1c43d0c562fb9";
     }*/
 
-    @GetMapping("/auth/Hhk6kRGkb7.txt")
+    @GetMapping("/auth/ODzUwrTrcr.txt")
     @ResponseBody
     public String aKfAirN1hO() {
+        return "68eb6c8f59bf143e3165aa5198c6905f";
+    }
+
+    @GetMapping("/auth/Hhk6kRGkb7.txt")
+    @ResponseBody
+    public String Hhk6kRGkb7() {
         return "c9b7ead4b4b0efd96c335aad9d445f04";
     }