msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix1' into develop

Browse Source
master
eason 8 years ago
parent dd058ce25a b4123e7f3f
commit 3696f360b5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
Unescape View File

@ -130,7 +130,7 @@ public class EncourageUseProcessor implements Ordered, EncourageService {
logger.debug("测试模式，不是管理员"); logger.debug("测试模式，不是管理员");
return new JSONObject(); return new JSONObject();
} }
JSONObject member = customerMembershipMapper.findByPaymentOpenId(openId); JSONObject member = customerMembershipMapper.findByPaymentOpenId(visitorOpenId);
if (member == null) { if (member == null) {
member = new JSONObject(); member = new JSONObject();
if ("Wechat".equals(channel)){ if ("Wechat".equals(channel)){
@ -139,7 +139,7 @@ public class EncourageUseProcessor implements Ordered, EncourageService {
logger.debug("用户关系不存在"); logger.debug("用户关系不存在");
return new JSONObject(); return new JSONObject();
} }
member.put("payment_openid", openId); member.put("payment_openid", visitorOpenId);
member.put("kanga_openid", relation.getString("kanga_openid")); member.put("kanga_openid", relation.getString("kanga_openid"));
member.put("redpack_openid", relation.getString("redpack_openid")); member.put("redpack_openid", relation.getString("redpack_openid"));
member.put("attend_time", new Date()); member.put("attend_time", new Date());

7
src/main/resources/templates/activity/encourage_money/my.html
Unescape View File

@ -19,9 +19,6 @@
</head> </head>
<body> <body>
<div class="main-container"> <div class="main-container">
<div class="banner">
<img class="head-box" data-th-src="@{${wxUser['headimgurl']}">
</div>
<div class="desc">活动期间任意消费满10澳币，获随机鼓励金</div> <div class="desc">活动期间任意消费满10澳币，获随机鼓励金</div>
<div class="detail-box"> <div class="detail-box">
<div class="detail-heading"> <div class="detail-heading">
@ -29,10 +26,10 @@
</div> </div>
<div class="balance-log-container" data-th-if="${balance_status['logs']}"> <div class="balance-log-container" data-th-if="${balance_status['logs']}">
<div class="item" data-th-each="item : ${balance_status['logs']}" data-th-classappend="${item['is_today']?'today':''}" > <div class="item" data-th-each="item : ${balance_status['logs']}" data-th-classappend="${item['is_today']}?'today':''" >
<div class="date-box" data-th-text="${item['date_str']}"> <div class="date-box" data-th-text="${item['date_str']}">
</div> </div>
<div class="count" data-th-classappend="${item['type'] eq 'Debit']?'debit':''}" data-th-text="${#numbers.formatDecimal(item['amount'],1,2)}"></div> <div class="count" data-th-classappend="${item['type']} eq 'Debit'?'debit':''" data-th-text="${#numbers.formatDecimal(item['amount'],1,2)}"></div>
<div class="factor" data-th-if="${item['factor']}>1" data-th-text="|已翻${item['factor']}倍|"> <div class="factor" data-th-if="${item['factor']}>1" data-th-text="|已翻${item['factor']}倍|">

Write Preview
Loading…
Cancel
Save