From 237794cca5d458376a9de0f3590ea850d45e2499 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 11:17:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 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 468af7c..00b85ad 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);
@@ -283,10 +280,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;
@@ -327,7 +328,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 +356,8 @@
// 鍒稿け鏁堝浘鐗囨浛鎹�
if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(PIC_INVALID);
- }
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+ }
userCouponVO.setJumpBtn(jumpBtn);
@@ -423,6 +423,7 @@
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
+ userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
int differentDays = 0;
@@ -451,7 +452,7 @@
if (stateActivated == null || stateActivated == 0) {
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
remainDaysFontColor = "#CCCCCC";
@@ -549,7 +550,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) {
@@ -619,9 +620,9 @@
// 娑堟伅鎺ㄩ��
try {
if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
-// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
+ //userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);
} else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
-// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+ //userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
} catch(Exception e) {
@@ -1082,7 +1083,7 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
// 鍒搁��鍥�
- sendBackCoupon(record.getUserSystemCoupon());
+ sendBackCoupon(record.getUserSystemCoupon(), record);
}
@Transactional
@@ -1102,6 +1103,13 @@
record.setUpdateTime(new Date());
record.setState(UserSystemCouponRecord.STATE_SUCCESS);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 娑堟伅鎺ㄩ��
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);
+ } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);
+ }
}
@Transactional
@@ -1238,7 +1246,7 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
// 閫�鍥炲埜
- sendBackCoupon(userSystemCoupon);
+ sendBackCoupon(userSystemCoupon, record);
} else {
// 鍏嶅崟鍖归厤鎴愬姛
@@ -1253,16 +1261,15 @@
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
- SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+ String couponType = record.getCouponType();
+ if (couponType == null || couponType.trim().length() == 0) {
+ throw new Exception("鍒哥被鍨嬫湭琚褰�");
+ }
- SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
- if (baseCoupon == null) {
- // 鍒稿凡浣跨敤
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);
- } else if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
- } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);
+ } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
}
}
}
@@ -1274,7 +1281,7 @@
* 閫�鍥炲埜 鍒濆鏁版嵁
* @param userSystemCoupon
*/
- public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{
+ public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception{
int expiryDay = 15;
@@ -1303,6 +1310,13 @@
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+
+
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
+ } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
+ }
}
--
Gitblit v1.8.0