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

Merge branch 'hotfix' into develop

Browse Source 
# Conflicts:
#	src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
master
kira 6 years ago
parent 3696f360b5 dce6f0e180
commit ecfda6a9ad
6 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/customers/core/EncourageService.java
Unescape View File

@ -30,4 +30,6 @@ public interface EncourageService {
JSONObject listReceiveLogs(String eventId, ReceiveLogQueryBean query);
JSONObject listUseLogs(String eventId, int page, int limit);
void prepareUserInfo(JSONObject user, String user_id);
}

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

@ -1,32 +1,7 @@
package au.com.royalpay.payment.manage.customers.core.impls;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import au.com.royalpay.payment.channels.wechat.config.WeChatPayConfig;
import au.com.royalpay.payment.channels.wechat.config.WechatPayEnvironment;
import au.com.royalpay.payment.manage.mappers.system.ManagerCustomerRelationAlipayMapper;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.Ordered;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.Order;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList;
import au.com.royalpay.payment.core.TransactionService;
import au.com.royalpay.payment.manage.customers.beans.EncourageEventParameters;
import au.com.royalpay.payment.manage.customers.beans.ReceiveLogQueryBean;
@ -37,13 +12,38 @@ import au.com.royalpay.payment.manage.mappers.customers.CustomerEncourageMoneyUs
import au.com.royalpay.payment.manage.mappers.customers.CustomerMembershipMapper;
import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerCustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.exceptions.NotFoundException;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import au.com.royalpay.payment.tools.utils.PageListUtils;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.Order;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList;
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.core.Ordered;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
/**
* 鼓励金 Created by yixian on 2017-04-24.
*/
@ -169,8 +169,8 @@ public class EncourageUseProcessor implements Ordered, EncourageService {
logger.debug("超出领取次数");
return new JSONObject();
}
int rand = RandomUtils
.nextInt(0,config.getBigDecimal("max_amount").subtract(config.getBigDecimal("min_amount")).multiply(CommonConsts.HUNDRED).intValue());
int rand = RandomUtils.nextInt(0,
config.getBigDecimal("max_amount").subtract(config.getBigDecimal("min_amount")).multiply(CommonConsts.HUNDRED).intValue());
BigDecimal amount = config.getBigDecimal("min_amount").add(BigDecimal.valueOf(rand).divide(CommonConsts.HUNDRED, 2, BigDecimal.ROUND_DOWN));
customerMembershipMapper.addEncourage(memberId, amount);
JSONObject customer = customerMembershipMapper.findByMemberId(memberId);
@ -330,4 +330,14 @@ public class EncourageUseProcessor implements Ordered, EncourageService {
PageList<JSONObject> receiveLogs = customerEncourageMoneyUseLogMapper.list(params, new PageBounds(page, limit, Order.formString("use_time.desc")));
return PageListUtils.buildPageListResult(receiveLogs);
}
@Override
public void prepareUserInfo(JSONObject user, String user_id) {
if ("wechat".equals(user.getString("channel"))) {
user.put("headimg", customerMapper.findCustomerByOpenId(user_id).getString("headimg"));
}
if ("alipay".equals(user.getString("channel"))) {
user.put("headimg", managerCustomerRelationAlipayMapper.findCustomerByUserId(user_id).getString("headimg"));
}
}
}

19
src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
Unescape View File

@ -2,6 +2,7 @@ package au.com.royalpay.payment.manage.customers.web;
import au.com.royalpay.payment.manage.customers.core.EncourageService;
import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
import com.alibaba.fastjson.JSONObject;
@ -27,8 +28,10 @@ public class EncourageMoneyController {
@Resource
private EncourageService encourageService;
@RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET)
public JSONObject takeEncourageMoney(@PathVariable String orderId,@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
@RequestMapping(value = "/orders/{orderId}", method = RequestMethod.PUT)
public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
String user_id = "";
if (wxUser == null) {
user_id = aliuser.getString("user_id");
@ -47,17 +50,25 @@ public class EncourageMoneyController {
return encourageService.doubleEncourageMoney(orderId);
}
@RequestMapping(value = "/my", method = RequestMethod.GET)
@WechatMapping(value = "/my", method = RequestMethod.GET)
public ModelAndView encourageLogs(@ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser, @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
ModelAndView mav = new ModelAndView("activity/encourage_money/my");
mav.addObject("wxUser", wxUser);
JSONObject user = new JSONObject();
String user_id = "";
if (wxUser == null) {
user.put("headimg", aliuser.getString("avatar"));
user.put("channel","alipay");
user_id = aliuser.getString("user_id");
} else {
user.put("headimg", wxUser.getString("headimgurl"));
user.put("channel","wechat");
user_id = wxUser.getString("openid");
}
if(StringUtils.isEmpty(user.getString("headimg"))) {
encourageService.prepareUserInfo(user, user_id);
}
JSONObject balanceStatus = encourageService.getBalanceStatus(user_id);
mav.addObject("user", user);
mav.addObject("balance_status", balanceStatus);
return mav;
}

6
src/main/resources/templates/activity/encourage_money/desc.html
Unescape View File

@ -68,9 +68,9 @@
鼓励金仅在活动期间有效，活动结束鼓励金自动清零。
</div>
</div>
<a class="merchants-link" href="/act/encourage_money/merchants">
<span class="text">查看活动商家</span>
</a>
<!--<a class="merchants-link" href="/act/encourage_money/merchants">-->
<!--<span class="text">查看活动商家</span>-->
<!--</a>-->
<div class="remark">本活动的最终解释权归RoyalPay所有</div>
</div>
</body>

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

@ -1,5 +1,5 @@
<!doctype html>
<html>
<html xmlns:th="http://www.w3.org/1999/xhtml">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
@ -16,9 +16,15 @@
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=201607281849"></script>
<script type="text/javascript" data-th-inline="javascript">
</script>
</head>
<body>
<div class="main-container">
<div class="banner">
<img class="head-box" data-th-src="@{${user['headimg']}?${user['headimg']}:'/static/images/act/encourage_money/default_headimg.png' }">
</div>
<div class="desc">活动期间任意消费满10澳币，获随机鼓励金</div>
<div class="detail-box">
<div class="detail-heading">

BIN
src/main/ui/static/images/act/encourage_money/default_headimg.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

Write Preview
Loading…
Cancel
Save