From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderHongBaoMapMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderHongBaoMapMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderHongBaoMapMapper.java
index 61a24ad..f1ff8a8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderHongBaoMapMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/OrderHongBaoMapMapper.java
@@ -1,9 +1,19 @@
package com.yeshi.fanli.dao.mybatis.order;
+import java.math.BigDecimal;
+
+import org.apache.ibatis.annotations.Param;
+
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.order.OrderHongBaoMap;
public interface OrderHongBaoMapMapper extends BaseMapper<OrderHongBaoMap>{
-
+ /**
+ * 鑾峰彇濂栧姳閲戦
+ * @param orderNo
+ * @param uid
+ * @return
+ */
+ BigDecimal getCouponHongbaoByOrderNo(@Param("orderNo")String orderNo, @Param("uid")Long uid);
}
\ No newline at end of file
--
Gitblit v1.8.0