diff --git a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java index 9fcb6d1118b60c5f81fcc4f2008e9cfc24d14bdb..37e0f177d965c9316cf866e6cea5de469b12cfca 100644 --- a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java +++ b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java @@ -125,7 +125,7 @@ public class ApiMemberController if (ObjectUtils.isNotEmpty(memberUser)){ // 1、向微信服务器 使用登录凭证 code 获取 session_key 和 openid - String params = "appid=wxbf6a9f26e8bd909b&secret=588008f64be11993ecceebd7b80eff6b&js_code=" + MapUtils.getString(param,"loginCode") + "&grant_type=" + "authorization_code"; + String params = "appid=wxd6fbe722d11e00f5&secret=84396e677785af5d3905784d36db8d73&js_code=" + MapUtils.getString(param,"loginCode") + "&grant_type=" + "authorization_code"; // 发送请求 String response = HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?" + params,""); // 解析相应内容(转换成jso n对象) @@ -199,7 +199,7 @@ public class ApiMemberController try { // 1、向微信服务器 使用登录凭证 code 获取 session_key 和 openid // 千冻网 - String params = "appid=wxbf6a9f26e8bd909b&secret=588008f64be11993ecceebd7b80eff6b&js_code=" + map.get("loginCode").toString() + "&grant_type=" + "authorization_code"; + String params = "appid=wxd6fbe722d11e00f5&secret=84396e677785af5d3905784d36db8d73&js_code=" + map.get("loginCode").toString() + "&grant_type=" + "authorization_code"; // 发送请求 String response = HttpUtils.sendGet("https://api.weixin.qq.com/sns/jscode2session?" + params,""); // 解析相应内容(转换成jso n对象) @@ -502,8 +502,8 @@ public class ApiMemberController String url = "https://api.weixin.qq.com/cgi-bin/token"; String result = HttpUtils.sendGet(url, "" + "grant_type=client_credential&" + - "appid=" + "wxbf6a9f26e8bd909b" + "&" + - "secret=" + "588008f64be11993ecceebd7b80eff6b"); + "appid=" + "wxd6fbe722d11e00f5" + "&" + + "secret=" + "84396e677785af5d3905784d36db8d73"); jsonObject = JSONObject.parseObject(result); // 有效期(s) Integer expiresIn = 0; diff --git a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiWXAuthWebServiceController.java b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiWXAuthWebServiceController.java index 06e463504eece89209087cfa926cc388dc5c2175..ef83a0ac92e4c043c27bee402906071aae934488 100644 --- a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiWXAuthWebServiceController.java +++ b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiWXAuthWebServiceController.java @@ -112,8 +112,8 @@ public class ApiWXAuthWebServiceController { String url = "https://api.weixin.qq.com/cgi-bin/token"; String result = HttpUtils.sendGet(url, "" + "grant_type=client_credential&" + - "appid=" + "wxbf6a9f26e8bd909b" + "&" + - "secret=" + "588008f64be11993ecceebd7b80eff6b"); + "appid=" + "wxd6fbe722d11e00f5" + "&" + + "secret=" + "84396e677785af5d3905784d36db8d73"); jsonObject = JSONObject.parseObject(result); // 有效期(s) Integer expiresIn = 0; diff --git a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiXcxNewController.java b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiXcxNewController.java index 04169912490eefb4c1327a49569aef30ddf0544d..d15775fca11b94df199e6175d58356eb8cb9e238 100644 --- a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiXcxNewController.java +++ b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/api/ApiXcxNewController.java @@ -513,8 +513,8 @@ public class ApiXcxNewController { String url = "https://api.weixin.qq.com/cgi-bin/token"; String result = HttpUtils.sendGet(url, "" + "grant_type=client_credential&" + - "appid=" + "wxbf6a9f26e8bd909b" + "&" + - "secret=" + "588008f64be11993ecceebd7b80eff6b"); + "appid=" + "wxd6fbe722d11e00f5" + "&" + + "secret=" + "84396e677785af5d3905784d36db8d73"); jsonObject = JSONObject.parseObject(result); // 有效期(s) Integer expiresIn = 0; diff --git a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/utils/XiaochengxuPayService.java b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/utils/XiaochengxuPayService.java index ec45429ac1ce8f74a89de5caf943459feab0ddbe..f8fefe3b9cd7a669ef188ae66628196ff1dbf15e 100644 --- a/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/utils/XiaochengxuPayService.java +++ b/xiaoniu-admin/src/main/java/com/ruoyi/web/controller/utils/XiaochengxuPayService.java @@ -39,7 +39,7 @@ public class XiaochengxuPayService { private static final String URL = "https://api.mch.weixin.qq.com/pay/unifiedorder"; //private static final String APP_ID = "wx38ab6dbc77769a53"; // 我们这边测试的小程序ID - private static final String APP_ID = "wxbf6a9f26e8bd909b"; + private static final String APP_ID = "wxd6fbe722d11e00f5"; private static final String MCH_ID = "1671247339"; private static final String TRADE_TYPE = "JSAPI"; private static final String SIGN_TYPE = "MD5"; diff --git a/xiaoniu-common/src/main/java/com/ruoyi/common/weiXin/WeiXinParamConfig.java b/xiaoniu-common/src/main/java/com/ruoyi/common/weiXin/WeiXinParamConfig.java index 5de4b0f33ec055c289426811a9e18f38f1a59136..ea87d52cfafa4637d301099ac7a6acfe3506819a 100644 --- a/xiaoniu-common/src/main/java/com/ruoyi/common/weiXin/WeiXinParamConfig.java +++ b/xiaoniu-common/src/main/java/com/ruoyi/common/weiXin/WeiXinParamConfig.java @@ -6,10 +6,10 @@ package com.ruoyi.common.weiXin; public class WeiXinParamConfig { /** 小程序APP_ID */ - public final static String APP_ID = "wxbf6a9f26e8bd909b"; + public final static String APP_ID = "wxd6fbe722d11e00f5"; /** 小程序APP_SECRET */ - public final static String APP_SECRET = "588008f64be11993ecceebd7b80eff6b"; + public final static String APP_SECRET = "84396e677785af5d3905784d36db8d73"; /** 商户号 */ public final static String MCH_ID = "1"; diff --git a/xiaoniu-system/src/main/resources/mapper/system/MallAppGoodsMapper.xml b/xiaoniu-system/src/main/resources/mapper/system/MallAppGoodsMapper.xml index e53bfd489bb2f33b17a88a9d1d379aa4a4371882..58f42d5eb202a7bfa979f5cc28aca6f60b2a7709 100644 --- a/xiaoniu-system/src/main/resources/mapper/system/MallAppGoodsMapper.xml +++ b/xiaoniu-system/src/main/resources/mapper/system/MallAppGoodsMapper.xml @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mall_goods_goods mgg LEFT JOIN mall_goods_product mgp ON mgg.id = mgp.goods_id - mgp.num = 1 + mgp.num is not null and mgg.goods_name like concat('%', #{name}, '%')