From 309a22d0624e8fec46f4b6722ed6135fe0a2ea3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 15:43:51 +0800
Subject: [PATCH] 免单商品的红包处理
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 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 1914eb8d..43f9f66 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
@@ -31,7 +31,6 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
@@ -56,6 +55,8 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -124,6 +125,12 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
@Override
public int insert(HongBaoV2 record) {
@@ -505,6 +512,23 @@
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ // 鍏嶅崟澶勭悊
+ boolean mianDan = false;
+ if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
+ commonOrder.getOrderNo());
+ if (orderList != null && orderList.size() == 1) {// 鍙湁1涓鍗曟墠鍙備笌鍏嶅崟
+ BigDecimal payMent = commonOrder.getPayment();
+ if (commonOrder.getState() == CommonOrder.STATE_JS)
+ payMent = commonOrder.getSettlement();
+
+ if (payMent.compareTo(new BigDecimal(10)) < 0) {
+ mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getOrderNo());
+ fanliRate = new BigDecimal(100);
+ }
+ }
+ }
+
HongBaoV2 hongBao = new HongBaoV2(hongBaoOrder.getHongBaoV2().getId());
hongBao.setUpdateTime(new Date());
// 鏇存敼鐘舵�佷笌璧勯噾
@@ -685,6 +709,34 @@
throws HongBaoException {
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ // 鏌ヨ鏄惁鏈夊厤鍗曡鍒�
+ boolean mianDan = false;
+ if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
+ commonOrder.getOrderNo());
+ if (orderList != null && orderList.size() == 1) {// 鍙湁1涓鍗曟墠鍙備笌鍏嶅崟
+ BigDecimal payMent = commonOrder.getPayment();
+ if (commonOrder.getState() == CommonOrder.STATE_JS)
+ payMent = commonOrder.getSettlement();
+
+ CommonOrderGoods goods = commonOrderGoodsMapper
+ .selectByPrimaryKey(commonOrder.getCommonOrderGoods().getId());
+ if (goods != null) {
+
+ try {
+ mianDan = userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
+ commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()));
+ if (mianDan)
+ fanliRate = new BigDecimal(100);
+ } catch (NumberFormatException e) {
+ throw new HongBaoException(10, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
+ } catch (Exception e) {
+ throw new HongBaoException(11, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
+ }
+ }
+ }
+ }
+
HongBaoV2 hongBao = new HongBaoV2();
hongBao.setUserInfo(commonOrder.getUserInfo());
hongBao.setCreateTime(new Date());
@@ -733,7 +785,7 @@
}
UserInfo boss = threeSaleSerivce.getBoss(user.getId());
- if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥
+ if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && !mianDan) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥,鍏嶅崟涓嶆敮鎸佸绾у垎閿�
// 鎻掑叆涓�绾у瓙绾㈠寘
BigDecimal firstRate = hongBaoManageService
--
Gitblit v1.8.0