From a6f34b99ee20e528b766c8ed5a61bd9c5aa0e7ae Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 十一月 2019 18:10:33 +0800
Subject: [PATCH] 淘宝相似商品推荐接口优化，根据商品ID搜索商品基本信息优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
index 2c77ed6..b9d4cb8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
@@ -27,6 +27,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
@Service
public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {
@@ -62,6 +63,11 @@
@Transactional
@Override
public void addOrderSubsidy(InviteOrderSubsidy orderSubsidy) throws InviteOrderSubsidyException {
+ // 鏈哄埗2020骞寸敓鏁�
+ if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2020-01-01", "yyyy-MM-dd")) {
+ return;
+ }
+
if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())
|| orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)
throw new InviteOrderSubsidyException(1, "鏁版嵁涓嶅畬鏁�");
@@ -75,6 +81,9 @@
// 淇敼鐘舵��
InviteOrderSubsidy update = new InviteOrderSubsidy(old.getId());
update.setMoney(orderSubsidy.getMoney());
+ if (old.getState() == InviteOrderSubsidy.STATE_UNKNOWN) {// 鐘舵�佹湭纭畾涔嬪墠鎵嶅彲浠ユ洿鏀瑰師濮嬭ˉ璐磋祫閲�
+ update.setOriginalMoney(orderSubsidy.getOriginalMoney());
+ }
update.setState(orderSubsidy.getState());
update.setUpdateTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
@@ -147,10 +156,11 @@
rate = firstRate;
else
rate = secondRate;
- BigDecimal money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(totalMoney, rate),
+ BigDecimal money = MoneyBigDecimalUtil.div(MoneyBigDecimalUtil.mul(totalMoney, rate),
new BigDecimal(100));
InviteOrderSubsidy orderSubsidy = new InviteOrderSubsidy();
orderSubsidy.setMoney(money);
+ orderSubsidy.setOriginalMoney(money);
orderSubsidy.setUid(uid);
orderSubsidy.setOrderNo(orderId);
orderSubsidy.setSourceType(sourceType);
--
Gitblit v1.8.0