From e4c7f45ed5a06512fa9981ef63d256e950b433c8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 17:54:22 +0800
Subject: [PATCH] 取消新人免单券奖励
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
index eaeedc7..9842079 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java
@@ -663,6 +663,9 @@
boolean satisfy = false;
// 閬嶅巻鏄惁瀛樺湪绗﹀悎鐩稿簲鍟嗗搧
for (CommonOrder commonOrder: list) {
+ // 璁㈠崟澶辨晥
+ if(commonOrder.getState() != CommonOrder.STATE_FK && commonOrder.getState() != CommonOrder.STATE_JS)
+ continue;
// 浠樻閲戦闄愬埗
BigDecimal payment = commonOrder.getPayment();
if (payment == null || payment.compareTo(limitPayMent) < 0)
@@ -687,8 +690,8 @@
// 璧犻�佽喘涔拌�呬竴寮犲厤鍗曞埜
try {
- userSystemCouponService.freeCouponWinBySystem(orderUid, CouponTypeEnum.freeCouponBuy,
- UserSystemCoupon.SOURCE_PULL_NEW, 1, true, 2);
+ userSystemCouponService.freeCouponWinBySystem(orderUid, CouponTypeEnum.freeCoupon,
+ UserSystemCoupon.SOURCE_PULL_NEW, 1, true, 2, 1);
} catch (UserSystemCouponException e) {
e.printStackTrace();
} catch (Exception e) {
--
Gitblit v1.8.0