|
@@ -525,17 +525,17 @@ public class PayServiceImpl implements PayService {
|
|
UserVo user = payDao.findUser(order.getUserID());
|
|
UserVo user = payDao.findUser(order.getUserID());
|
|
if (user != null && "3".equals(order.getReceiptStatus()) && "0".equals(order.getSecondHandOrderFlag())) {
|
|
if (user != null && "3".equals(order.getReceiptStatus()) && "0".equals(order.getSecondHandOrderFlag())) {
|
|
int userBeans = user.getUserBeans() == null ? 0 : user.getUserBeans();
|
|
int userBeans = user.getUserBeans() == null ? 0 : user.getUserBeans();
|
|
- //线上支付送100采美豆
|
|
|
|
|
|
+ //线上支付送200采美豆
|
|
UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
|
|
UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
|
|
beansHistory.setUserId(order.getUserID().intValue());
|
|
beansHistory.setUserId(order.getUserID().intValue());
|
|
beansHistory.setOrderId(order.getOrderID().intValue());
|
|
beansHistory.setOrderId(order.getOrderID().intValue());
|
|
beansHistory.setBeansType(6);
|
|
beansHistory.setBeansType(6);
|
|
beansHistory.setType(1);
|
|
beansHistory.setType(1);
|
|
- beansHistory.setNum(100);
|
|
|
|
|
|
+ beansHistory.setNum(200);
|
|
beansHistory.setPushStatus(0);
|
|
beansHistory.setPushStatus(0);
|
|
beansHistory.setAddTime(date);
|
|
beansHistory.setAddTime(date);
|
|
payDao.insertBeansHistory(beansHistory);
|
|
payDao.insertBeansHistory(beansHistory);
|
|
- userBeans = userBeans + 100;
|
|
|
|
|
|
+ userBeans = userBeans + 200;
|
|
|
|
|
|
//自主下单且没有促销活动送豆
|
|
//自主下单且没有促销活动送豆
|
|
Integer id = payDao.findPromotionsOrder(order.getOrderID());
|
|
Integer id = payDao.findPromotionsOrder(order.getOrderID());
|
|
@@ -543,21 +543,19 @@ public class PayServiceImpl implements PayService {
|
|
BigDecimal payTotalFee = order.getPayTotalFee();
|
|
BigDecimal payTotalFee = order.getPayTotalFee();
|
|
int num = 0;
|
|
int num = 0;
|
|
if (MathUtil.compare(1000, payTotalFee) > -1) {
|
|
if (MathUtil.compare(1000, payTotalFee) > -1) {
|
|
- num = 10;
|
|
|
|
|
|
+ num = 1000;
|
|
} else if (MathUtil.compare(5000, payTotalFee) > -1) {
|
|
} else if (MathUtil.compare(5000, payTotalFee) > -1) {
|
|
- num = 20;
|
|
|
|
|
|
+ num = 2500;
|
|
} else if (MathUtil.compare(10000, payTotalFee) > -1) {
|
|
} else if (MathUtil.compare(10000, payTotalFee) > -1) {
|
|
- num = 50;
|
|
|
|
|
|
+ num = 5000;
|
|
} else if (MathUtil.compare(25000, payTotalFee) > -1) {
|
|
} else if (MathUtil.compare(25000, payTotalFee) > -1) {
|
|
- num = 100;
|
|
|
|
|
|
+ num = 7500;
|
|
} else if (MathUtil.compare(100000, payTotalFee) > -1) {
|
|
} else if (MathUtil.compare(100000, payTotalFee) > -1) {
|
|
- num = 150;
|
|
|
|
|
|
+ num = 10000;
|
|
} else if (MathUtil.compare(250000, payTotalFee) > -1) {
|
|
} else if (MathUtil.compare(250000, payTotalFee) > -1) {
|
|
- num = 200;
|
|
|
|
|
|
+ num = 12500;
|
|
} else if (MathUtil.compare(500000, payTotalFee) > -1) {
|
|
} else if (MathUtil.compare(500000, payTotalFee) > -1) {
|
|
- num = 250;
|
|
|
|
- } else {
|
|
|
|
- num = 400;
|
|
|
|
|
|
+ num = 20000;
|
|
}
|
|
}
|
|
beansHistory.setBeansType(5);
|
|
beansHistory.setBeansType(5);
|
|
beansHistory.setNum(num);
|
|
beansHistory.setNum(num);
|