diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 53765c93c..384fc1bea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponChannelVo; import com.iformall.enums.*; import com.iformall.service.WxCampaignService; @@ -116,6 +117,7 @@ public class WxCampaignController extends BaseController { @SystemControllerLog(description = "宣传页-id更新") public ResultData update(@RequestBody WxCampaign wxCampaign) { logger.debug("[" + getIpAddr() + "] WxCampaignController::update"); + if (StringUtils.isNotBlank(wxCampaign.getCouponIds())) { String[] arys = wxCampaign.getCouponIds().split(","); wxCampaign.setCouponIds(JSON.toJSONString(arys)); diff --git a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java index 11c214ce8..71e5e945e 100644 --- a/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java +++ b/mallinkBApi/src/main/java/com/iformall/utils/ImgYwsqhUtil.java @@ -27,6 +27,8 @@ public class ImgYwsqhUtil { //模板图片 private static final String imgTempPath = "imgTemp/wxjjywsqh.jpg"; + //字体路径 + private static final String fontPath = "imgTemp/simhei.ttf"; /** * 生成图片证书 @@ -50,9 +52,9 @@ public class ImgYwsqhUtil { // backImgUrl.close(); Graphics g = backImg.getGraphics(); -// Font font = Font.createFont(Font.TRUETYPE_FONT, ResourceUtils.getFile("classpath:"+fontPath)); -// Font fTxtBottom = font.deriveFont(Font.PLAIN, 35); - Font fTxtBottom = new Font("黑体", Font.PLAIN, 37); + Font font = Font.createFont(Font.TRUETYPE_FONT, ResourceUtils.getFile("classpath:"+fontPath)); + Font fTxtBottom = font.deriveFont(Font.PLAIN, 35); +// Font fTxtBottom = new Font("黑体", Font.PLAIN, 37); Color myColorTxtBottom = Color.BLACK; g.setFont(fTxtBottom); diff --git a/mallinkBApi/src/main/resources/imgTemp/simhei.ttf b/mallinkBApi/src/main/resources/imgTemp/simhei.ttf new file mode 100644 index 000000000..5bd4687e7 Binary files /dev/null and b/mallinkBApi/src/main/resources/imgTemp/simhei.ttf differ