From 4f29967f7eb1817ddd0eb631d95547c74e1877c6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 09:24:36 +0800
Subject: [PATCH] 奖励券使用加入订单类型区分
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 9fe5b0c..6bace89 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -684,7 +684,7 @@
@Transactional
@Override
- public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {
+ public void useOrderCoupon(Long uid, Long id, String orderNo, Integer goodsType) throws UserSystemCouponException, Exception {
if (id == null) {
throw new UserSystemCouponException(1, "鍒竔d涓嶅瓨鍦�");
@@ -738,7 +738,7 @@
// 鏉′欢: A:蹇呴』鏄繑鍒╄鍗� 銆丅:蹇呴』宸茬粡澶勪簬宸插埌璐︾姸鎬�
if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) {
- Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);
+ Order order = orderService.findOrderByOrderIdAndType(orderNo, goodsType);
if (order == null)
return;
@@ -760,12 +760,13 @@
hongBaoV2.setUserInfo(new UserInfo(uid));
hongBaoV2.setPreGetTime(new Date());
hongBaoV2.setGetTime(new Date());
+
hongBaoV2Service.insertSelective(hongBaoV2);
// 2.鎻掑叆鍏宠仈
orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
- // 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
+ // 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓 // TODO
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,
new UserInfo(uid));
userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
@@ -787,6 +788,7 @@
// 鎻掑叆浣跨敤鍒歌褰�
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
+ couponRecord.setGoodSource(goodsType);
couponRecord.setOrderNo(orderNo);
couponRecord.setUserSystemCoupon(userSystemCoupon);
couponRecord.setCouponType(systemCoupon.getType().name());
--
Gitblit v1.8.0