From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
index 7022998..7c8b376 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.dao.mybatis.order.OrderRepairHistoryMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.money.ExtractCheckCompensate;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
@@ -147,7 +148,7 @@
@Resource
private ExtractCheckCompensateMapper extractCheckCompensateMapper;
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void repairOrder(String orderId) throws Exception {
// 姣旇緝CommonOrder涓嶵aoBaoOrder鐨勯浼版敹鐩�
@@ -391,10 +392,10 @@
}
// 淇敼璁㈠崟淇℃伅
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
private void updateOrderInfo(TaoBaoOrder taoBaoOrder, Long commonOrderId) throws Exception {
HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId);
- CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder);
+ CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder);
List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
.listByGoodsIdAndGoodsType(taoBaoOrder.getAuctionId() + "", newCommonOrder.getSourceType());
CommonOrderGoods cog = null;
@@ -432,7 +433,8 @@
CommonOrder commonOrder = commonOrderService.selectByPrimaryKey(newCommonOrder.getId());
if (hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_ZIGOU) {
- BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ BigDecimal fanliRate = hongBaoManageService.getFanLiRate(UserLevelEnum.daRen,
+ commonOrder.getCreateTime().getTime());
// 鍏嶅崟澶勭悊
boolean mianDan = false;
List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
@@ -442,7 +444,8 @@
if (commonOrder.getState() == CommonOrder.STATE_JS)
payMent = commonOrder.getSettlement();
if (payMent.compareTo(new BigDecimal(10)) < 0) {
- mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getSourceType(),commonOrder.getOrderNo());
+ mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getSourceType(),
+ commonOrder.getOrderNo());
}
}
@@ -519,7 +522,8 @@
}
} else if (hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {
- BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+ BigDecimal fanliRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
+ commonOrder.getCreateTime().getTime());
List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService
.listByOrderIdAndUid(commonOrder.getUserInfo().getId(), commonOrder.getOrderNo());
if (list != null && list.size() > 0) {
@@ -598,7 +602,7 @@
}
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
public void addOrder(CommonOrder commonOrder, int type, Long firstUid, Long secondUid) throws Exception {
// 澧炲姞commonOrder
commonOrder.setCreateTime(commonOrder.getThirdCreateTime());
@@ -637,7 +641,8 @@
// 娣诲姞绾㈠寘
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
- BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ BigDecimal fanliRate = hongBaoManageService.getFanLiRate(UserLevelEnum.daRen,
+ commonOrder.getCreateTime().getTime());
// 鏌ヨ鏄惁鏈夊厤鍗曡鍒�
BigDecimal mianDanMoney = null;
if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {
@@ -813,7 +818,8 @@
if (commonOrder.getState() == CommonOrder.STATE_SX || commonOrder.getState() == CommonOrder.STATE_WQ)
return;
// 鍒嗕韩璧�
- BigDecimal shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+ BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
+ commonOrder.getCreateTime().getTime());
HongBaoV2 hongBao = new HongBaoV2();
hongBao.setBeizhu("2019骞�7鏈堟壒閲忎慨鏀�");
@@ -960,7 +966,7 @@
return orderInfoMap.get(orderId);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public void repireFirstAndSecondLevel(String orderId) throws Exception {
repireFirstShare(orderId);
--
Gitblit v1.8.0