From 941271bb52d26e484e2fe9c82d19bd9f94b84838 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 29 六月 2020 16:38:33 +0800 Subject: [PATCH] 拉新与免单JOB修改 --- fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java index 10ff0a0..d3b6cda 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java @@ -293,7 +293,7 @@ BigDecimal money = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, buyerLevel); // 鍏嶅崟澶勭悊 boolean mianDan = false; - List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, + List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(), commonOrder.getOrderNo()); if (orderList != null && orderList.size() == 1) {// 鍙湁1涓鍗曟墠鍙備笌鍏嶅崟 BigDecimal payMent = commonOrder.getPayment(); @@ -316,7 +316,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, "鍏嶅崟鍒搁��娆惧嚭閿�"); @@ -518,7 +518,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, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊"); @@ -531,7 +531,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(); } -- Gitblit v1.8.0