|
|
|
@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; |
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams; |
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; |
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaService; |
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; |
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
@@ -607,13 +608,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
.formId(payOrder.getPrepayId()) // 微信支付的formId是prepayId |
|
|
|
.page(gotopage) |
|
|
|
.data(Lists.newArrayList( |
|
|
|
new WxMaTemplateMessage.Data("keyword1", coupon.getPriceStr() + "元", "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword2", merchant.getName(), "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword3", coupon.getTitle(), "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword4", couponDetail, "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword5", coupon.getSalePriceStr() + "元", "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword6", dateFormat.format(new Date()), "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword7", notes, "#173177")) |
|
|
|
new WxMaTemplateData("keyword1", coupon.getPriceStr() + "元", "#173177"), |
|
|
|
new WxMaTemplateData("keyword2", merchant.getName(), "#173177"), |
|
|
|
new WxMaTemplateData("keyword3", coupon.getTitle(), "#173177"), |
|
|
|
new WxMaTemplateData("keyword4", couponDetail, "#173177"), |
|
|
|
new WxMaTemplateData("keyword5", coupon.getSalePriceStr() + "元", "#173177"), |
|
|
|
new WxMaTemplateData("keyword6", dateFormat.format(new Date()), "#173177"), |
|
|
|
new WxMaTemplateData("keyword7", notes, "#173177")) |
|
|
|
) |
|
|
|
.templateId(msg.getTemplateId()) |
|
|
|
.emphasisKeyword("keyword1.DATA") |
|
|
|
@@ -642,10 +643,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
.formId(payOrder.getPrepayId()) // 微信支付的formId是prepayId |
|
|
|
.page("pages/index/index") |
|
|
|
.data(Lists.newArrayList( |
|
|
|
new WxMaTemplateMessage.Data("keyword1", coupon.getTitle(), "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword2", dateFormat.format(new Date()), "#173177"), |
|
|
|
new WxMaTemplateMessage.Data("keyword3", "未知"), |
|
|
|
new WxMaTemplateMessage.Data("keyword4", couponDetail)) |
|
|
|
new WxMaTemplateData("keyword1", coupon.getTitle(), "#173177"), |
|
|
|
new WxMaTemplateData("keyword2", dateFormat.format(new Date()), "#173177"), |
|
|
|
new WxMaTemplateData("keyword3", "未知"), |
|
|
|
new WxMaTemplateData("keyword4", couponDetail)) |
|
|
|
) |
|
|
|
.templateId(msg.getTemplateId()) |
|
|
|
.emphasisKeyword("keyword1.DATA") |
|
|
|
|