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/HongBaoV2ServiceImpl.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 4ce8b28..50950ef 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
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -107,6 +108,7 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+ @Lazy
@Resource
private UserSystemCouponService userSystemCouponService;
@@ -143,6 +145,7 @@
return hongBaoV2Mapper.selectByPrimaryKey(id);
}
+
@Transactional
@Override
public int addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException {
@@ -169,6 +172,7 @@
hasUpdate = true;
}
}
+
/**
* 閫氱煡鐢ㄦ埛鐨勮繑鍒╂儏鍐�
*/
@@ -310,7 +314,7 @@
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
if (mianDan)
hongBao.setMoney(commonOrder.getPayment());
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS||commonOrder.getState() == CommonOrder.STATE_WQ) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
@@ -432,6 +436,7 @@
firstHongbao.setType(HongBaoV2.TYPE_YIJI);
firstHongbao.setVersion(2);
firstHongbao.setState(hongBao.getState());
+ firstHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
firstHongbao.setMoney(
@@ -445,6 +450,9 @@
} else if (hongBao.getState() == HongBaoV2.STATE_BUKELINGQU) {
firstHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));
+ }else if(hongBao.getState() == HongBaoV2.STATE_SHIXIAO)
+ {
+ firstHongbao.setMoney(new BigDecimal(0));
}
hongBaoV2Mapper.insertSelective(firstHongbao);
// 鐢ㄦ埛閫氱煡
@@ -480,6 +488,7 @@
secondHongbao.setType(HongBaoV2.TYPE_ERJI);
secondHongbao.setVersion(2);
secondHongbao.setState(hongBao.getState());
+ secondHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
secondHongbao.setMoney(MoneyBigDecimalUtil.mul(hongBao.getMoney(),
secondRate.divide(new BigDecimal(100))));
@@ -538,7 +547,7 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS||commonOrder.getState() == CommonOrder.STATE_WQ) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
@@ -586,7 +595,7 @@
}
// 浠ュ疄闄呮敹鍏ヤ负鍑嗚绠楅浼版敹鐩�
- if (CommonOrder.STATE_JS == commonOrder.getState()) {
+ if (CommonOrder.STATE_JS == commonOrder.getState()||CommonOrder.STATE_WQ == commonOrder.getState()) {
childUpdate.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), rate.divide(new BigDecimal(100))));
if (commonOrder.getThirdCreateTime().getTime() > TimeUtil.convertToTimeTemp("2019-04-16",
@@ -686,7 +695,7 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS||CommonOrder.STATE_WQ == commonOrder.getState()) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
@@ -707,6 +716,7 @@
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
hongBao.setUrank(user.getRank());
+ hongBao.setOrderType(commonOrder.getSourceType());
hongBaoV2Mapper.insertSelective(hongBao);
// 娣诲姞绾㈠寘涓庤鍗曠殑鏄犲皠
HongBaoOrder hongBaoOrder = new HongBaoOrder();
@@ -748,6 +758,7 @@
firstHongbao.setType(HongBaoV2.TYPE_YIJI);
firstHongbao.setVersion(2);
firstHongbao.setState(hongBao.getState());
+ firstHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
firstHongbao.setMoney(
@@ -800,6 +811,7 @@
secondHongbao.setType(HongBaoV2.TYPE_ERJI);
secondHongbao.setVersion(2);
secondHongbao.setState(hongBao.getState());
+ secondHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
secondHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
@@ -890,7 +902,7 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), shareRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS||commonOrder.getState() == CommonOrder.STATE_WQ) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), shareRate.divide(new BigDecimal(100))));
@@ -903,6 +915,7 @@
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
hongBao.setUrank(user.getRank());
hongBao.setUserInfo(user);
+ hongBao.setOrderType(commonOrder.getSourceType());
hongBaoV2Mapper.insertSelective(hongBao);
// 鎻掑叆绾㈠寘涓庤鍗曟槧灏�
HongBaoOrder hongBaoOrder = new HongBaoOrder();
@@ -941,7 +954,7 @@
child.setState(HongBaoV2.STATE_BUKELINGQU);
child.setMoney(MoneyBigDecimalUtil.mul(commonOrder.getEstimate(),
firstLevelRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS||commonOrder.getState() == CommonOrder.STATE_WQ) {
child.setState(HongBaoV2.STATE_KELINGQU);
child.setMoney(MoneyBigDecimalUtil.mul(commonOrder.geteIncome(),
firstLevelRate.divide(new BigDecimal(100))));
@@ -956,6 +969,7 @@
child.setUrank(boss.getRank());
child.setVersion(2);
child.setCreateTime(new Date());
+ child.setOrderType(commonOrder.getSourceType());
if (child.getMoney().compareTo(new BigDecimal(0)) > 0) {
hongBaoV2Mapper.insertSelective(child);
// 娣诲姞閫氱煡
@@ -1080,6 +1094,13 @@
}
@Override
+ public List<HongBaoV2> listChildrenByIds(List<Long> idList) {
+ if (idList == null || idList.size() == 0)
+ return null;
+ return hongBaoV2Mapper.listChildrenByIds(idList);
+ }
+
+ @Override
public List<Long> getUidByNear30DayShareSucceed() {
return hongBaoV2Mapper.getUidByNear30DayShareSucceed();
}
@@ -1128,4 +1149,10 @@
return hongBaoV2List.get(0);
return null;
}
+
+ @Override
+ public List<HongBaoV2> listByIds(List<Long> idList) {
+ return hongBaoV2Mapper.listByIds(idList);
+ }
+
}
--
Gitblit v1.8.0