diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml
index 263c5bb2d..48f046367 100644
--- a/mallinkAdmin/pom.xml
+++ b/mallinkAdmin/pom.xml
@@ -13,6 +13,7 @@
mallinkAdmin
+ 3.2.0
3.2.0
@@ -27,6 +28,11 @@
mybatis-multi-tenancy
1.0
+
+ com.github.binarywang
+ weixin-java-mp
+ ${weixin-java-mp.version}
+
com.github.binarywang
weixin-java-open
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
index c06b54c53..7e1b38ad8 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
@@ -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")
diff --git a/pom.xml b/pom.xml
index e62015220..2b7808c8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,9 @@
- 3.1.0
+ 3.2.0
+ 3.2.0
+ 3.2.0
2.3.0
@@ -232,8 +234,14 @@
org.bouncycastle
- bcprov-jdk16
- 1.45
+ bcprov-jdk15on
+ 1.60
+
+
+
+ org.bouncycastle
+ bcpkix-jdk15on
+ 1.60
@@ -287,12 +295,31 @@
0.0.9
+
+
+ com.thoughtworks.xstream
+ xstream
+ 1.4.9
+
+
+
+ com.github.binarywang
+ weixin-java-common
+ ${weixin-java-common.version}
+
+
com.github.binarywang
weixin-java-miniapp
${weixin-java-miniapp.version}
+
+ com.github.binarywang
+ weixin-java-pay
+ ${weixin-java-pay.version}
+
+
com.github.ulisesbocchio
jasypt-spring-boot