From a04f4f4dd730f65ff5db67ec3a2f0fcab7d0e887 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 26 二月 2019 16:24:24 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 71c335e..00dcf6c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -35,6 +36,7 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
@@ -90,6 +92,9 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
// 鍒稿け鏁堝浘鐗�
public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";
@@ -143,7 +148,7 @@
}
// 鏁版嵁缁勭粐
- listDataFactory(listVO);
+ listDataFactory(listVO, uid);
return listVO;
}
@@ -153,7 +158,7 @@
*
* @param listVO
*/
- public void listDataFactory(List<UserSystemCouponVO> listVO) throws Exception{
+ public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{
for (UserSystemCouponVO userCouponVO : listVO) {
@@ -174,21 +179,18 @@
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
- // 浣跨敤涓姸鎬� 鏀瑰彉涓哄凡浣跨敤
+ // 浣跨敤鐘舵��
Integer state = userCouponVO.getState();
- if (UserSystemCoupon.STATE_IN_USE == state) {
- state = UserSystemCoupon.STATE_END_USE;
- userCouponVO.setState(state);
- }
// 鎸夐挳璺宠浆
-
Map<String, Object> jumpBtn = null;
+
Integer stateActivated = userCouponVO.getStateActivated();
+
if (stateActivated == null || stateActivated == 0) {
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRemark());
- systemCoupon.setEffect("寰呮縺娲�");
+ userCouponVO.setCouponEffect("寰呮縺娲�");
// 鐘舵�佹湭婵�娲� -涓旀湭琚娇鐢�
if (UserSystemCoupon.STATE_CAN_USE == state) {
@@ -197,7 +199,17 @@
jumpBtn = new HashMap<String, Object>();
Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("url", configService.get("invite_activation_url"));
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null && userInfoExtra.getInviteCode() != null
+ && userInfoExtra.getInviteCode().trim().length() > 0) {
+
+ jumpLink.put("url", configService.get("invite_activation_success_url" +"?alert=ture"));
+ } else {
+
+ jumpLink.put("url", configService.get("invite_activation_url"));
+ }
+
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
@@ -220,21 +232,26 @@
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
} else if (CouponTypeEnum.rebatePercentCoupon == type) {
- // 杩斿埄濂栧姳鍒�
- jumpLink.put("state", "2");
+ // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
+ jumpLink.put("state", 2);
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
-
// 璺宠浆璁㈠崟鍒楄〃
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
-
}
- } else if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(PIC_INVALID);
+
+ } else if (UserSystemCoupon.STATE_IN_USE == state) {
+ // 浣跨敤涓�
+ userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
}
-
}
+
+ // 鍒稿け鏁堝浘鐗囨浛鎹�
+ if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
+ userCouponVO.setCouponPicture(PIC_INVALID);
+ }
+
userCouponVO.setJumpBtn(jumpBtn);
String couponTerm = "鏈夋晥鏈燂細";
@@ -822,4 +839,6 @@
return userRecordVO;
}
+
+
}
--
Gitblit v1.8.0