From a38cc332973adbd296c37f64c2b2ca1a6ffb5c41 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:23:53 +0800
Subject: [PATCH] 删除订单补贴欠款相关代码
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 46 +++++++++++++---------------------------------
1 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index c56c1c9..cca39aa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -37,7 +37,6 @@
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.jd.JDOrderItem;
-import com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
@@ -60,7 +59,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
@@ -137,9 +135,6 @@
@Resource
private InviteOrderSubsidyService inviteOrderSubsidyService;
-
- @Resource
- private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;
@Resource
private UserVIPInfoService userVIPInfoService;
@@ -595,13 +590,14 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData, hongBao);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData,
+ hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
- acceptData, hongBao);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip, acceptData,
+ hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
- acceptData, hongBao);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip, acceptData,
+ hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
acceptData, hongBao);
@@ -627,7 +623,8 @@
* @param signList
*/
private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
- List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao) throws Exception {
+ List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao)
+ throws Exception {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -726,10 +723,10 @@
}
// 浣跨敤濂栧姳鍒� 閲戦棰濋檺鍒�
- if (hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) > 0){
+ if (hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) > 0) {
return;
}
-
+
// 鏄惁鍙娇鐢ㄥ鍔卞埜
if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
&& HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {
@@ -2043,7 +2040,6 @@
orderStateMap.put("fontColor", "#666666");
order.setOrderState(orderStateMap);
-
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
@@ -2074,23 +2070,6 @@
order.setOrderOrigin("3");
order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
signList.add(CommonOrder.TYPE_INVITE);
-
- // 绾㈠寘鍔犱笂琛ヨ创閲戦
- InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderNo,
- sourceType);
- if (orderSubsidy != null && orderSubsidy.getMoney() != null) {
- BigDecimal subsidyMoney = orderSubsidy.getMoney();
- // 缁存潈閲戦
- InviteOrderSubsidyDebt subsidyDebt = inviteOrderSubsidyDebtService
- .getBySourceId(orderSubsidy.getId());
- if (subsidyDebt != null && subsidyDebt.getOriginMoney() != null) {
- subsidyMoney = subsidyMoney.subtract(subsidyDebt.getOriginMoney());
- }
- // 鏈�缁堣ˉ璐�
- if (subsidyMoney.compareTo(new BigDecimal(0)) > 0) {
- hongBao = hongBao.add(subsidyMoney);
- }
- }
}
order.setSignList(signList);
@@ -2135,7 +2114,8 @@
order.setAccountState(stateMap);
Map<String, String> hongBaoMap = new HashMap<String, String>();
- hongBaoMap.put("content", hongBaoState_Str + "鏀剁泭 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ hongBaoMap.put("content",
+ hongBaoState_Str + "鏀剁泭 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
@@ -2179,7 +2159,7 @@
text = "鍏嶅崟涓�";
} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
text = "宸插厤鍗�";
- }
+ }
}
break;
}
--
Gitblit v1.8.0