From eb856c050d5c20c69ba490046f597b1f993a06da Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Tue, 25 Aug 2020 15:53:58 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
index ce3828f..e1498d6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
@@ -1,6 +1,8 @@
package com.kidgrow.oprationcenter.service;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.ISuperService;
@@ -21,7 +23,7 @@
* @param params
* @return
*/
- PageResult<ProductOrder> findList(Map<String, Object> params);
+ PageResult<ProductOrder> findList(Map<String, Object> params,@LoginUser SysUser sysUser);
/**
@@ -36,5 +38,18 @@
* @return
*/
ResultBody updateEnabled(Map<String, Object> params);
+
+ /**
+ * 删除指定orderid下的套餐数据
+ * @param orderId
+ * @return
+ */
+ int delProductDetail(Long orderId);
+ /**
+ * 用户充值(创建订单,增加充值记录,冲套餐)
+ * @param params
+ * @return
+ */
+ boolean saveProductDetail(Map<String,Object> params,SysUser sysUser);
}
--
Gitblit v1.8.0