From 7506a36913607608777d0312e2d13cd1cba2ff5e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 16:59:33 +0800
Subject: [PATCH] 免单券相关修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index 43f9f66..ec9ddea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -710,7 +710,7 @@
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
// 鏌ヨ鏄惁鏈夊厤鍗曡鍒�
- boolean mianDan = false;
+ BigDecimal mianDanMoney = null;
if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {
List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
commonOrder.getOrderNo());
@@ -724,17 +724,21 @@
if (goods != null) {
try {
- mianDan = userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
- commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()));
- if (mianDan)
- fanliRate = new BigDecimal(100);
+ if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
+ commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
+ mianDanMoney = payMent;
} catch (NumberFormatException e) {
throw new HongBaoException(10, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
} catch (Exception e) {
+ e.printStackTrace();
throw new HongBaoException(11, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
}
}
}
+ } else if (commonOrder.getState() == CommonOrder.STATE_SX) {//璁剧疆澶辨晥
+// userSystemCouponService.updateS
+
+
}
HongBaoV2 hongBao = new HongBaoV2();
@@ -754,9 +758,14 @@
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
+
} else {
throw new HongBaoException(3, "缁存潈璁㈠崟涓嶈兘鍒涘缓绾㈠寘");
}
+
+ if (mianDanMoney != null)
+ hongBao.setMoney(mianDanMoney);
+
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
hongBao.setUrank(user.getRank());
hongBaoV2Mapper.insertSelective(hongBao);
@@ -785,7 +794,7 @@
}
UserInfo boss = threeSaleSerivce.getBoss(user.getId());
- if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && !mianDan) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥,鍏嶅崟涓嶆敮鎸佸绾у垎閿�
+ if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && mianDanMoney==null) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥,鍏嶅崟涓嶆敮鎸佸绾у垎閿�
// 鎻掑叆涓�绾у瓙绾㈠寘
BigDecimal firstRate = hongBaoManageService
--
Gitblit v1.8.0