Browse Source

//bug

release_toaliyun_real
xhxu 3 years ago
parent
commit
d9bc907dc0
2 changed files with 13 additions and 13 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  2. +12
    -12
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java View File

@@ -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, "支付密钥未配置"),


+ 12
- 12
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java View File

@@ -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")


Loading…
Cancel
Save