From cdaacd7f7ba10c00696e14de498085af59caa402 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 04 三月 2019 09:33:32 +0800
Subject: [PATCH] 支付宝更改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 9238670..196e085 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
@@ -118,9 +118,6 @@
private UserOtherMsgNotificationService userOtherMsgNotificationService;
- // 鍒稿け鏁堝浘鐗�
- public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";
-
@Override
public int insertSelective(UserSystemCoupon record) {
return userSystemCouponMapper.insertSelective(record);
@@ -202,7 +199,13 @@
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
// 娣诲姞涓�鏉℃秷鎭�
if (userInfoExtra != null) {
- userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ if (userInfoExtra.getCouponNews() == null) {
+ userInfoExtra.setCouponNews(1);
+ } else {
+ userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ }
+
+
try {
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
} catch (UserInfoExtraException e) {
@@ -283,10 +286,14 @@
userCouponVO.setCouponPicture(systemCoupon.getPicture());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
+ userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
// 浣跨敤鐘舵��
Integer state = userCouponVO.getState();
-
+
+ // 鍒哥被鍨�
+ CouponTypeEnum type = systemCoupon.getType();
+
// 鎸夐挳璺宠浆
Map<String, Object> jumpBtn = null;
@@ -303,22 +310,21 @@
}
jumpBtn = new HashMap<String, Object>();
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- 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=true");
- } else {
- // 婵�娲婚個璇风爜鐣岄潰
- jumpLink.put("url", configService.get("invite_activation_url"));
- }
+ /*
+ * Map<String, Object> jumpLink = new HashMap<String, Object>();
+ *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=true"); } else { // 婵�娲婚個璇风爜鐣岄潰 jumpLink.put("url",
+ * configService.get("invite_activation_url")); }
+ * jumpBtn.put("params", jumpLink);
+ */
- jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
} else if (stateActivated == 1) {
// 鏄剧ず瑙勫垯
@@ -327,7 +333,6 @@
if (UserSystemCoupon.STATE_CAN_USE == state) {
Map<String, Object> jumpLink = new HashMap<String, Object>();
- CouponTypeEnum type = systemCoupon.getType();
if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) {
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
@@ -356,8 +361,8 @@
// 鍒稿け鏁堝浘鐗囨浛鎹�
if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(PIC_INVALID);
- }
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+ }
userCouponVO.setJumpBtn(jumpBtn);
@@ -423,6 +428,7 @@
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
+ userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
int differentDays = 0;
@@ -451,7 +457,7 @@
if (stateActivated == null || stateActivated == 0) {
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
remainDaysFontColor = "#CCCCCC";
@@ -549,7 +555,7 @@
for (UserSystemCouponVO userCouponVO: list) {
// 鏄剧ず涓嶈兘浣跨敤
userCouponVO.setState(0);
- userCouponVO.setCouponPicture(PIC_INVALID);
+ userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());
Map<String, Object> map = userCouponVO.getRemainDays();
if (map != null) {
--
Gitblit v1.8.0