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 | 159 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 101 insertions(+), 58 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 502436e..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) {
@@ -215,12 +218,12 @@
// 娑堟伅鎺ㄩ��
try {
- if (coupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponGet(userCoupon);
- } else if (coupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
- } else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon);
+ } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
}
} catch(Exception e) {
@@ -233,7 +236,7 @@
}
-
+ @Transactional
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -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) {
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
@@ -340,7 +345,7 @@
} else if (CouponTypeEnum.rebatePercentCoupon == type) {
// 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
- jumpLink.put("state", 2);
+ jumpLink.put("state", "2");
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
@@ -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,15 +428,8 @@
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
+ userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
- Integer stateActivated = userCouponVO.getStateActivated();
- if (stateActivated == null || stateActivated == 0) {
- userCouponVO.setState(0);
- userCouponVO.setCouponEffect("寰呮縺娲�");
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
- } else {
- userCouponVO.setCouponPicture(systemCoupon.getPicture());
- }
int differentDays = 0;
String couponTerm = "鏈夋晥鏈燂細";
@@ -453,7 +451,23 @@
// 鍓╀綑澶╂暟
Map<String, Object> remainDays = new HashMap<String, Object>();
remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
- remainDays.put("fontColor", "#F14242");
+ String remainDaysFontColor = "";
+
+ Integer stateActivated = userCouponVO.getStateActivated();
+ if (stateActivated == null || stateActivated == 0) {
+ userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+
+ remainDaysFontColor = "#CCCCCC";
+
+ } else {
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
+
+ remainDaysFontColor = "#F14242";
+ }
+
+ remainDays.put("fontColor", remainDaysFontColor);
userCouponVO.setRemainDays(remainDays);
}
@@ -484,6 +498,7 @@
return hasCoupon;
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -504,6 +519,7 @@
return getEnableListByCouponId(uid, 1, couponList);
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {
@@ -539,7 +555,14 @@
for (UserSystemCouponVO userCouponVO: list) {
// 鏄剧ず涓嶈兘浣跨敤
userCouponVO.setState(0);
- userCouponVO.setCouponPicture(PIC_INVALID);
+ userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());
+
+ Map<String, Object> map = userCouponVO.getRemainDays();
+ if (map != null) {
+ map.put("fontColor", "#CCCCCC");
+ }
+ userCouponVO.setRemainDays(map);
+
}
}
}
@@ -548,6 +571,7 @@
return list;
}
+ @Transactional
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -600,10 +624,10 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
-// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ //userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
+ //userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
} catch(Exception e) {
@@ -718,7 +742,7 @@
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
} catch(Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -785,8 +809,8 @@
}
userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
- // 璺宠浆绂忓埄涓績
- JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore");
+ // 璧勯噾鏄庣粏
+ JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
Map<String, Object> jumpWelfare = new HashMap<String, Object>();
jumpWelfare.put("jumpDetail", welfareCore);
Map<String, Object> jumpparms = new HashMap<String, Object>();
@@ -804,6 +828,7 @@
return userRecordVO;
}
+
@Override
public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -1005,7 +1030,7 @@
return userRecordVO;
}
-
+ @Transactional
@Override
public void activatedWelfareFreeCoupon(Long uid) {
if (uid == null) {
@@ -1044,6 +1069,7 @@
}
}
+ @Transactional
@Override
public void updateStateByDrawback(String orderNo) throws Exception {
@@ -1062,9 +1088,10 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
// 鍒搁��鍥�
- sendBackCoupon(record.getUserSystemCoupon());
+ sendBackCoupon(record.getUserSystemCoupon(), record);
}
+ @Transactional
@Override
public void updateStateByArrivalAccount(String orderNo) throws Exception {
@@ -1081,8 +1108,16 @@
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
@Override
public void updateCounponInvalid(Long uid) {
List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
@@ -1107,11 +1142,11 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
}
@@ -1125,6 +1160,7 @@
}
}
+ @Transactional
@Override
public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
@@ -1170,6 +1206,7 @@
}
}
+ @Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
Long auctionId) throws Exception{
@@ -1214,7 +1251,7 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
// 閫�鍥炲埜
- sendBackCoupon(userSystemCoupon);
+ sendBackCoupon(userSystemCoupon, record);
} else {
// 鍏嶅崟鍖归厤鎴愬姛
@@ -1229,16 +1266,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);
- } 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);
+ } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
}
}
}
@@ -1250,7 +1286,7 @@
* 閫�鍥炲埜 鍒濆鏁版嵁
* @param userSystemCoupon
*/
- public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{
+ public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception{
int expiryDay = 15;
@@ -1279,6 +1315,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