Browse Source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
lin 3 years ago
parent
commit
d728919f23
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -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("}");


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java View File

@@ -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;
}

}

Loading…
Cancel
Save