From ca0e816fe57482b8f43f22f7a0b6fe7c57a53f42 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 七月 2020 11:12:17 +0800
Subject: [PATCH] 拉新商品比例调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 29a897a..55c0781 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
@@ -320,7 +320,7 @@
if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
if (mianDan) {
try {
- userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
} catch (Exception e) {
e.printStackTrace();
throw new HongBaoException(12, "鍏嶅崟鍒搁��娆惧嚭閿�");
@@ -666,7 +666,7 @@
if (goods != null) {
try {
if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
- commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
+ commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))
mianDanMoney = payMent;
} catch (NumberFormatException e) {
throw new HongBaoException(10, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
@@ -679,7 +679,7 @@
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 璁剧疆鍏嶅崟鍒稿け鏁�
commonOrder.setPayment(new BigDecimal(0));// 璁㈠崟澶辨晥鍚庣殑浠樻閲戦璁剧疆涓�0
try {
- userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
} catch (Exception e) {
e.printStackTrace();
}
@@ -1168,4 +1168,10 @@
return hongBaoV2Mapper.listByOrderTradeId(tradeId);
}
+ @Override
+ public Integer getDirectBossUrankByPid(Long pid) {
+ return hongBaoV2Mapper.getDirectBossUrankByPid(pid);
+ }
+
+
}
--
Gitblit v1.8.0