From 3d92fcd729376c584a07d5f23b8e06f81fbcbcde Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 b5801de..1e03ab2 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
@@ -36,6 +36,7 @@
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;
@@ -57,6 +58,7 @@
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;
@@ -133,6 +135,9 @@
@Resource
private InviteOrderSubsidyService inviteOrderSubsidyService;
+
+ @Resource
+ private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;
@Resource
private UserVIPInfoService userVIPInfoService;
@@ -2062,6 +2067,21 @@
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);
@@ -2104,9 +2124,8 @@
stateMap.put("content", stateContent);
stateMap.put("fontColor", stateFontColor);
order.setAccountState(stateMap);
-
hongbaoInfo = hongBaoState_Str + hongbaoInfo;
-
+
Map<String, String> hongBaoMap = new HashMap<String, String>();
hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
--
Gitblit v1.8.0