From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
index 7303b65..e04a6c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
@@ -320,7 +320,7 @@
if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
if (mianDan) {
try {
- userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
} catch (Exception e) {
e.printStackTrace();
throw new HongBaoException(12, "鍏嶅崟鍒搁��娆惧嚭閿�");
@@ -666,7 +666,7 @@
if (goods != null) {
try {
if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
- commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
+ commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))
mianDanMoney = payMent;
} catch (NumberFormatException e) {
throw new HongBaoException(10, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
@@ -679,7 +679,7 @@
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 璁剧疆鍏嶅崟鍒稿け鏁�
commonOrder.setPayment(new BigDecimal(0));// 璁㈠崟澶辨晥鍚庣殑浠樻閲戦璁剧疆涓�0
try {
- userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
} catch (Exception e) {
e.printStackTrace();
}
@@ -868,8 +868,10 @@
shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
commonOrder.getCreateTime().getTime());
+ UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
+
// 鍒ゆ柇璁㈠崟鍒嗕韩娲诲姩鏄惁寮�鍚�
- if ("1".equalsIgnoreCase(configService.get(ConfigKeyEnum.shareGoodsActivityOpen.getKey()))) {
+ if ("1".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.shareGoodsActivityOpen.getKey(),user.getSystem()))) {
// 娌℃湁璁㈠崟锛屽苟涓旀槸娓犻亾ID鏉ョ殑锛屽苟涓�
UserExtraTaoBaoInfo taoBaoExtraInfo = userExtraTaoBaoInfoService
.getByUid(commonOrder.getUserInfo().getId());
@@ -916,7 +918,7 @@
hongBao.setPreGetTime(new Date(TimeUtil.convertToTimeTemp(
calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-25", "yyyy-M-dd")));
}
- UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
+
if (user == null)
throw new UserAccountException(1001, "鐢ㄦ埛涓嶅瓨鍦�/琚皝绂�");
hongBao.setUrank(user.getRank());
--
Gitblit v1.8.0