From 8f4a68065574a7ef1f9e8b53902d1f081ec69aab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 三月 2020 10:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java
index 993bdc0..d6bbb8b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMapServiceImpl.java
@@ -1,6 +1,8 @@
package com.yeshi.fanli.service.impl.order;
+import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import javax.annotation.Resource;
@@ -11,12 +13,16 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.order.OrderHongBaoMap;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
+import com.yeshi.fanli.service.inter.order.OrderService;
@Service
public class OrderHongBaoMapServiceImpl implements OrderHongBaoMapService {
@Resource
private OrderHongBaoMapMapper orderHongBaoMapMapper;
+
+ @Resource
+ private OrderService orderService;
@Override
public void addOrderHongBaoMap(HongBaoV2 hongBao, Order order) {
@@ -30,4 +36,20 @@
map.setOrder(order);
orderHongBaoMapMapper.insertSelective(map);
}
+
+ @Override
+ public BigDecimal getCouponHongbaoByOrderNo(String orderNo, Long uid) {
+ return orderHongBaoMapMapper.getCouponHongbaoByOrderNo(orderNo, uid);
+ }
+
+ @Override
+ public OrderHongBaoMap selectByOrderIdAndSourceType(String orderId, int sourceType) {
+ Order order = orderService.findOrderByOrderIdAndType(orderId, sourceType);
+ if (order != null) {
+ List<OrderHongBaoMap> mapList = orderHongBaoMapMapper.listByOrderId(order.getId());
+ if (mapList != null && mapList.size() > 0)
+ return mapList.get(0);
+ }
+ return null;
+ }
}
--
Gitblit v1.8.0