From 0c7362a19750d78dc1fa1db675460407b604ff58 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 21 Feb 2023 17:44:46 +0800 Subject: [PATCH 1/2] //bug --- .../main/java/com/iformall/controller/WxCouponController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 479a73f86..98008e76a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -286,7 +286,7 @@ public class WxCouponController extends BaseController { sb.append(coupon.getRemainInventory()); } sb.append(",\"inventory\":").append(coupon.getInventory()).append(",\"price\":").append(coupon.getPrice()).append(",\"creditPrice\":").append(coupon.getCreditPrice()); - if (null != config && config.getConfigItemValue().equals("1")) { + if (null != config && "1".equals(config.getConfigItemValue())) { sb.append(",\"selledCount\":").append(coupon.getInventory()-coupon.getRemainInventory()); } sb.append("}"); From 526a3caad9c09e5e1faab94edf641c6257ba5ce2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 21 Feb 2023 17:58:27 +0800 Subject: [PATCH 2/2] //bug --- .../src/main/java/com/iformall/domain/po/WxCampaign.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index 0f293807f..ed8f3087b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -95,7 +95,7 @@ public class WxCampaign extends TenantEntity { if(type.equals(EnumCampaignType.PAGEPATH.getCode())) { return pagePath; } - return Constant.mainPageUrl + "?type=bd&bt="+type+"&id="+id; + return Constant.mainPageUrl + "?type=bd&bt="+type+"&id="+id+"&tenantId="+tenantId; } public String getWeappScene() { @@ -104,7 +104,7 @@ public class WxCampaign extends TenantEntity { if(type.equals(EnumCampaignType.PAGEPATH.getCode())) { return pageScene; } - return "t:bd:" + type + ":" +id; + return "t:bd:" + type + ":" + id + ":" + tenantId; } }