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 | 255 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 191 insertions(+), 64 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 2e81e87..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
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
@@ -27,6 +28,8 @@
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -47,7 +50,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -58,6 +63,12 @@
@Service
public class UserSystemCouponServiceImpl implements UserSystemCouponService {
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
+ @Resource
+ private RedisManager redisManager;
+
@Resource
private UserSystemCouponMapper userSystemCouponMapper;
@@ -106,9 +117,6 @@
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
-
- // 鍒稿け鏁堝浘鐗�
- public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -185,15 +193,37 @@
// 鎻掑叆鏁版嵁搴�
insertSelective(userCoupon);
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ // 娣诲姞涓�鏉℃秷鎭�
+ if (userInfoExtra != null) {
+ if (userInfoExtra.getCouponNews() == null) {
+ userInfoExtra.setCouponNews(1);
+ } else {
+ userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ }
+
+
+ try {
+ userInfoExtraService.saveUserInfoExtra(userInfoExtra);
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ });
// 娑堟伅鎺ㄩ��
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) {
@@ -206,7 +236,7 @@
}
-
+ @Transactional
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -256,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;
@@ -276,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) {
// 鏄剧ず瑙勫垯
@@ -300,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) {
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
@@ -313,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);
@@ -329,8 +361,8 @@
// 鍒稿け鏁堝浘鐗囨浛鎹�
if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(PIC_INVALID);
- }
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+ }
userCouponVO.setJumpBtn(jumpBtn);
@@ -396,14 +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.setCouponPicture(PIC_INVALID); // 鏈縺娲�
- userCouponVO.setState(0);
- } else {
- userCouponVO.setCouponPicture(systemCoupon.getPicture());
- }
int differentDays = 0;
String couponTerm = "鏈夋晥鏈燂細";
@@ -425,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);
}
@@ -456,6 +498,7 @@
return hasCoupon;
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -476,10 +519,16 @@
return getEnableListByCouponId(uid, 1, couponList);
}
+ @Transactional
@Override
- public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception {
+ public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
+ }
+
+ if (auctionId == null) {
+ throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
}
// 鏇存柊杩囨湡鍒�
@@ -493,9 +542,36 @@
return null;
}
- return getEnableListByCouponId(uid, null, couponList);
+ List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
+
+ // 鑾峰彇鍟嗗搧璇︽儏
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ if (taoBaoGoodsBrief != null) {
+ BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+
+ // 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟
+ if (quanPrice.compareTo(new BigDecimal(10)) > 0) {
+ if (list != null && list.size() > 0) {
+ for (UserSystemCouponVO userCouponVO: list) {
+ // 鏄剧ず涓嶈兘浣跨敤
+ userCouponVO.setState(0);
+ userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());
+
+ Map<String, Object> map = userCouponVO.getRemainDays();
+ if (map != null) {
+ map.put("fontColor", "#CCCCCC");
+ }
+ userCouponVO.setRemainDays(map);
+
+ }
+ }
+ }
+ }
+
+ return list;
}
+ @Transactional
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -548,10 +624,10 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);
- } 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) {
@@ -666,7 +742,7 @@
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
} catch(Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -733,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>();
@@ -752,6 +828,7 @@
return userRecordVO;
}
+
@Override
public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -953,7 +1030,7 @@
return userRecordVO;
}
-
+ @Transactional
@Override
public void activatedWelfareFreeCoupon(Long uid) {
if (uid == null) {
@@ -990,11 +1067,57 @@
}
}
}
-
-
}
+ @Transactional
+ @Override
+ public void updateStateByDrawback(String orderNo) throws Exception {
+
+ if (orderNo == null || orderNo.trim().length() == 0) {
+ return;
+ }
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ if (record == null) {
+ return;
+ }
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+ record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 鍒搁��鍥�
+ sendBackCoupon(record.getUserSystemCoupon(), record);
+ }
+
+ @Transactional
+ @Override
+ public void updateStateByArrivalAccount(String orderNo) throws Exception {
+
+ if (orderNo == null || orderNo.trim().length() == 0) {
+ return;
+ }
+
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, 2);
+ if (record == null) {
+ return;
+ }
+
+ record.setOrderNo(orderNo);
+ 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);
@@ -1019,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);
}
@@ -1037,10 +1160,11 @@
}
}
+ @Transactional
@Override
public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
if (list == null || list.size() == 0) {
return;
}
@@ -1082,13 +1206,10 @@
}
}
+ @Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
Long auctionId) throws Exception{
-
- //鍙鐞嗕粯娆鹃噾棰濆皬浜�10鐨�
- if(payment==null||payment.compareTo(new BigDecimal(10))<0)
- return false;
boolean isfree = false;
@@ -1130,7 +1251,7 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
// 閫�鍥炲埜
- sendBackCoupon(userSystemCoupon);
+ sendBackCoupon(userSystemCoupon, record);
} else {
// 鍏嶅崟鍖归厤鎴愬姛
@@ -1145,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) {
- userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
+ } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
}
}
}
@@ -1166,7 +1286,7 @@
* 閫�鍥炲埜 鍒濆鏁版嵁
* @param userSystemCoupon
*/
- public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{
+ public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception{
int expiryDay = 15;
@@ -1195,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