From f133e718945877cc5ebb84c1ce2445a6b3f7098b Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 13 Jul 2018 20:53:17 +0800 Subject: [PATCH 1/4] fix encourage --- src/main/resources/templates/activity/encourage_money/my.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/templates/activity/encourage_money/my.html b/src/main/resources/templates/activity/encourage_money/my.html index 6d15bf1db..839bb330f 100644 --- a/src/main/resources/templates/activity/encourage_money/my.html +++ b/src/main/resources/templates/activity/encourage_money/my.html @@ -19,9 +19,6 @@
-
活动期间任意消费满10澳币，获随机鼓励金
From f8df5a607948989269f3d7def20adf2c5d6b4246 Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 13 Jul 2018 21:06:48 +0800 Subject: [PATCH 2/4] fix encourage --- .../manage/customers/core/impls/EncourageUseProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java index 1cd71fc5f..b092caf4a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java @@ -129,7 +129,7 @@ public class EncourageUseProcessor implements Ordered, EncourageService { logger.debug("测试模式，不是管理员"); return new JSONObject(); } - JSONObject member = customerMembershipMapper.findByPaymentOpenId(openId); + JSONObject member = customerMembershipMapper.findByPaymentOpenId(visitorOpenId); if (member == null) { member = new JSONObject(); if ("Wechat".equals(channel)){ @@ -138,7 +138,7 @@ public class EncourageUseProcessor implements Ordered, EncourageService { logger.debug("用户关系不存在"); return new JSONObject(); } - member.put("payment_openid", openId); + member.put("payment_openid", visitorOpenId); member.put("kanga_openid", relation.getString("kanga_openid")); member.put("redpack_openid", relation.getString("redpack_openid")); member.put("attend_time", new Date()); From 0bf42064df9e77c32cae1f65b43b49703979cf6e Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 13 Jul 2018 21:21:55 +0800 Subject: [PATCH 3/4] fix encourage --- src/main/resources/templates/activity/encourage_money/my.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/activity/encourage_money/my.html b/src/main/resources/templates/activity/encourage_money/my.html index 839bb330f..fd10dd932 100644 --- a/src/main/resources/templates/activity/encourage_money/my.html +++ b/src/main/resources/templates/activity/encourage_money/my.html @@ -26,7 +26,7 @@
-
+
From b4123e7f3fcfa898952778c6b063c8bd0e944861 Mon Sep 17 00:00:00 2001 From: eason Date: Fri, 13 Jul 2018 21:30:56 +0800 Subject: [PATCH 4/4] fix encourage --- src/main/resources/templates/activity/encourage_money/my.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/activity/encourage_money/my.html b/src/main/resources/templates/activity/encourage_money/my.html index fd10dd932..9050764c4 100644 --- a/src/main/resources/templates/activity/encourage_money/my.html +++ b/src/main/resources/templates/activity/encourage_money/my.html @@ -29,7 +29,7 @@
-
+