From e61ed7fbbc44d1ff5b92b2e76ec168f23ffe07df Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期四, 06 二月 2020 23:44:26 +0800
Subject: [PATCH] 小程序相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 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 c9f73e0..ac3bb18 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
@@ -46,6 +46,7 @@
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -230,7 +231,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,
Boolean needNotify) throws UserSystemCouponException, Exception {
@@ -344,7 +345,7 @@
return userCoupon;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
throws UserSystemCouponException, Exception {
@@ -449,7 +450,7 @@
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
// 鍏嶅崟鍟嗗搧鍒楄〃
- jumpLink.put("url", configService.get("free_goods_list"));
+ jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
@@ -467,7 +468,7 @@
} else if (UserSystemCoupon.STATE_IN_USE == state) {
// 浣跨敤涓�
- userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+ userCouponVO.setInUseExplain(configService.get(ConfigKeyEnum.freeCouponUsingHelp.getKey()));
}
}
@@ -610,7 +611,7 @@
return hasCoupon;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
@@ -633,7 +634,7 @@
return getEnableListByCouponId(uid, 1, couponList);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
throws UserSystemCouponException, Exception {
@@ -955,7 +956,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,
Order order) throws Exception {
org.springframework.transaction.TransactionStatus transactionStatus = transactionManager
@@ -1093,9 +1094,9 @@
userRecordVO.setJumpWelfare(jumpWelfare);
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
+ userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
- String rewardCouponRemark = configService.get("reward_coupon_remark");
+ String rewardCouponRemark = configService.get(ConfigKeyEnum.rewardCouponRemark.getKey());
if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
}
@@ -1154,7 +1155,7 @@
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("free_coupon_help"));
+ userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
@@ -1192,7 +1193,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get("free_coupon_back_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
// 閫�娆�
@@ -1211,7 +1212,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get("free_coupon_back_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
// 鍏嶅崟涓�
@@ -1225,7 +1226,7 @@
progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
}
- rewardCouponRemark = configService.get("free_coupon_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
// 鍏嶅崟鎴愬姛
@@ -1247,7 +1248,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
- rewardCouponRemark = configService.get("free_coupon_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
}
userRecordVO.setProgressState(progressState);
userRecordVO.setPayMoney(payMoney);
@@ -1358,7 +1359,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateStateByDrawback(String orderNo) throws Exception {
@@ -1380,7 +1381,7 @@
sendBackCoupon(record.getUserSystemCoupon(), record);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateStateByArrivalAccount(String orderNo) throws Exception {
@@ -1414,7 +1415,7 @@
return userSystemCouponMapper.getCounponNowInvalid(count);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
throws Exception {
@@ -1494,7 +1495,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
return;
@@ -1577,7 +1578,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void randomRewardCoupon(int num, Long uid, String source) throws Exception {
if (num < 1) {
return;
@@ -1650,7 +1651,7 @@
throws Exception {
// 娣诲姞濂栧姳鍒�
insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(), "绯荤粺璧犻��",
- new BigDecimal(configService.get("exchange_rebate_percent")), false);
+ new BigDecimal(configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey())), false);
// 娣诲姞濂栧姳鍒告秷鎭�
userOtherMsgNotificationService.systemGiveRewardCoupon(uid, null, MsgOtherSystemGiveDTOFactory
.createRewardCouponGive(num, "璇锋寜鐓ц繑鍒╁鍔卞埜瑙勫垯浣跨敤", "杩斿埄濂栧姳鍒�", orderId, orderType, reason));
@@ -1717,7 +1718,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
@@ -1773,7 +1774,7 @@
insertSelective(userCoupon);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -1873,7 +1874,7 @@
// 缁熻寰呮縺娲绘暟閲�
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
- String activateNum = configService.get("free_coupon_activate_num");
+ String activateNum = configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey());
userCouponVO.setCouponEffect(
"(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
}
@@ -1911,7 +1912,7 @@
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
} else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
|| CouponTypeEnum.freeCouponBuy == type) {
- jumpLink.put("url", configService.get("free_goods_list"));
+ jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
@@ -1939,13 +1940,13 @@
TokenTypeEnum tokenType = null;
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
tokenType = TokenTypeEnum.freeCoupon;
}
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_rebate_percent_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
@@ -1961,7 +1962,7 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get("app_down_link"));
+ configService.get(ConfigKeyEnum.appDownLink.getKey()));
userCouponVO.setGiveTips(tips);
}
@@ -2047,10 +2048,10 @@
TokenTypeEnum tokenTypeEnum = null;
if (type == CouponTypeEnum.freeCouponGive) {
tokenTypeEnum = TokenTypeEnum.freeCoupon;
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
} else if (type == CouponTypeEnum.rebatePercentCoupon) {
tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
- tips = configService.get("give_rebate_percent_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
} else {
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
}
@@ -2068,7 +2069,7 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get("app_down_link"));
+ configService.get(ConfigKeyEnum.appDownLink.getKey()));
return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
}
@@ -2118,7 +2119,7 @@
while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey()));
UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
@@ -2607,7 +2608,7 @@
// 婵�娲绘暟閲�
boolean result = false;
- int limitNum = Integer.parseInt(configService.get("free_coupon_activate_num"));
+ int limitNum = Integer.parseInt(configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey()));
Integer state = couponActivate.getState();
int count = couponActivate.getCount();
--
Gitblit v1.8.0