From d9bc907dc0558755d4d43d7cd9bfd7d23e8e0259 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 21 Feb 2023 13:08:43 +0800 Subject: [PATCH] //bug --- .../java/com/iformall/common/ErrorCode.java | 2 +- .../com/iformall/domain/po/WxMerchant.java | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 543021484..e1c740c4a 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -357,7 +357,7 @@ public enum ErrorCode{ REFUND_NOT_ALLOW(12017, "退款订单不允许退款"), APP_ID_NOT_ENABLE(12019, "小程序未启用"), - APP_ID_NOT_FOUND(12020, "APPID没找到"), + APP_ID_NOT_FOUND(12020, "未找到可用的小程序"), MCH_INFO_NOT_FOUND(12021, "微信商户平台信息没找到"), MCH_INFO_NOT_EQUAL(12022, "微信商户平台信息不对应"), API_KEY_NOT_FOUND(12023, "支付密钥未配置"), diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 69b66c5ac..80657f3fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -304,24 +304,24 @@ public class WxMerchant extends TenantEntity { public String getWeappPath() { if(id == null) return Constant.mainPageUrl; - return Constant.mainPageUrl + "?type=md&id=" + id; + return Constant.mainPageUrl + "?type=md&id=" + id + "&tenantId=" + tenantId; } - public String getTtparams(){ - return Constant.mainPageUrl; - } - - public String getTtPath(){ - JsonObject object = new JsonObject(); - object.addProperty("type","md"); - object.addProperty("id",id); - return object.toString(); - } +// public String getTtparams(){ +// return Constant.mainPageUrl; +// } +// +// public String getTtPath(){ +// JsonObject object = new JsonObject(); +// object.addProperty("type","md"); +// object.addProperty("id",id); +// return object.toString(); +// } public String getWeappScene() { if(id == null) return ""; - return "t:md:" + id; + return "t:md:" + id + ":" + tenantId; } @io.swagger.annotations.ApiModelProperty(value = "积分锁定0正常1锁定", name = "creditLocked")