Merge branch 'develop'

master
taylor.dang 6 years ago
commit aa584e4286

@ -190,7 +190,6 @@ public class ActRedPackServiceImpl implements ActRedPackService {
JSONObject prizeDetail = actRedPacketsCustomerOrdersMapper.findLockedPrize(lock, paymentOpenId); JSONObject prizeDetail = actRedPacketsCustomerOrdersMapper.findLockedPrize(lock, paymentOpenId);
BigDecimal luckyMoeny = prizeDetail.getBigDecimal("red_packet_amount"); BigDecimal luckyMoeny = prizeDetail.getBigDecimal("red_packet_amount");
String redPackOrderId = prizeDetail.getString("red_packet_order_id"); String redPackOrderId = prizeDetail.getString("red_packet_order_id");
BigDecimal totalAmount = luckyMoeny.multiply(CommonConsts.HUNDRED);
String notifyUrl = "https://mpay.royalpay.com.au/sys/lucky_money/customer/redpacks/" + redPackOrderId + "/notify"; String notifyUrl = "https://mpay.royalpay.com.au/sys/lucky_money/customer/redpacks/" + redPackOrderId + "/notify";
JSONObject customerRelation = customerMapper.findCustomerByOpenId(paymentOpenId); JSONObject customerRelation = customerMapper.findCustomerByOpenId(paymentOpenId);
if (customerRelation == null) { if (customerRelation == null) {
@ -206,7 +205,7 @@ public class ActRedPackServiceImpl implements ActRedPackService {
String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey()); String rpOpenId = customerRelation.getString(redpackApi.getOpenIdKey());
WechatRedpack wechatRedpack = new WechatRedpack(); WechatRedpack wechatRedpack = new WechatRedpack();
wechatRedpack.setActName(actName); wechatRedpack.setActName(actName);
wechatRedpack.setAmount(totalAmount); wechatRedpack.setAmount(luckyMoeny);
wechatRedpack.setNotifyUrl(notifyUrl); wechatRedpack.setNotifyUrl(notifyUrl);
wechatRedpack.setOpenId(rpOpenId); wechatRedpack.setOpenId(rpOpenId);
wechatRedpack.setSendName(sendName); wechatRedpack.setSendName(sendName);

Loading…
Cancel
Save