From 684779576c02c13cb2a18a7d93e88da7e57fd4b8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 31 三月 2020 11:25:13 +0800
Subject: [PATCH] 2.1 需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 56fd1cb..da9cc4e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -63,6 +63,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -135,6 +136,9 @@
@Resource
private UserInfoService userInfoService;
+
+ @Resource
+ private UserInviteService userInviteService;
@Resource(name = "producer")
private Producer orderProducer;
@@ -1730,6 +1734,14 @@
return commonOrderMapper.countSearchOrderByUid(uid, list);
}
+
+ @Override
+ public List<CommonOrder> getMinSettleTimeAndUid() {
+ return commonOrderMapper.getMinSettleTimeAndUid();
+ }
+
+
+
@Override
public List<CommonOrderVO> searchOrderByUid(AcceptData acceptData, int page, int size, Long uid, List<ESOrder> list)
throws Exception {
@@ -1824,8 +1836,8 @@
// 2019.8.1寮�濮嬭繑鍥炵淮鏉冧俊鎭�
Date august = TimeUtil.parse("2019-08-01");
- // 褰撳墠鐢ㄦ埛鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
+ // 褰撳墠鐢ㄦ埛鏄惁鍙互浣跨敤濂栧姳鍒�
+ boolean isvip = userInviteService.verifyVIP(uid);
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
@@ -2101,13 +2113,13 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, isvip);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip);
+ couponFactoryNew(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, isvip);
}
}
--
Gitblit v1.8.0