diff --git a/hai-service/pom.xml b/hai-service/pom.xml
index e080c043..0b1e7d7f 100644
--- a/hai-service/pom.xml
+++ b/hai-service/pom.xml
@@ -351,6 +351,12 @@
wechatpay-apache-httpclient
0.4.9
+
+
+ com.huaweicloud.sdk
+ huaweicloud-sdk-sis
+ 3.1.42
+
org.springframework
spring-test
diff --git a/hai-service/src/main/java/com/hai/order/model/combine/CombineOrderModel.java b/hai-service/src/main/java/com/hai/order/model/combine/CombineOrderModel.java
index 783854af..116b40a5 100644
--- a/hai-service/src/main/java/com/hai/order/model/combine/CombineOrderModel.java
+++ b/hai-service/src/main/java/com/hai/order/model/combine/CombineOrderModel.java
@@ -1,4 +1,44 @@
package com.hai.order.model.combine;
+import com.hai.order.model.CreateOrderModel;
+
+import java.util.List;
+
public class CombineOrderModel {
+ /**
+ * 公司id
+ */
+ private Long companyId;
+ /**
+ * 用户id
+ */
+ private Long userId;
+
+ /**
+ * 用户名称
+ */
+ private String userName;
+
+ /**
+ * 用户手机号
+ */
+ private String userPhone;
+
+ /**
+ * 用户优惠券关系id
+ */
+ private Long memDiscountId;
+
+ /**
+ * 支付积分(金币)
+ */
+ private Integer payGold;
+
+ /**
+ * 支付密码
+ */
+ private String payPwd;
+
+ List createOrderModelList;
+
}
diff --git a/hai-service/src/main/java/com/hai/order/service/OrderService.java b/hai-service/src/main/java/com/hai/order/service/OrderService.java
index 0ddf6f3a..71125209 100644
--- a/hai-service/src/main/java/com/hai/order/service/OrderService.java
+++ b/hai-service/src/main/java/com/hai/order/service/OrderService.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.hai.entity.HighChildOrder;
import com.hai.entity.HighOrder;
import com.hai.order.model.CreateOrderModel;
+import com.hai.order.model.combine.CombineOrderModel;
import com.hai.order.type.OrderRefundOpUserType;
import java.util.List;
@@ -37,7 +38,7 @@ public interface OrderService {
*/
HighOrder createOrder(CreateOrderModel createOrderModel) throws Exception;
- JSONObject createOrderCombine(CreateOrderModel createOrderModel) throws Exception;
+ JSONObject createOrderCombine(CombineOrderModel combineOrderModel) throws Exception;
/**
diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
index a511bf9a..a9c00111 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java
@@ -21,6 +21,7 @@ import com.hai.goods.service.GoodsSkuService;
import com.hai.order.model.CreateOrderChildModel;
import com.hai.order.model.CreateOrderModel;
import com.hai.order.model.RefundPriceModel;
+import com.hai.order.model.combine.CombineOrderModel;
import com.hai.order.service.*;
import com.hai.order.topic.OrderTopic;
import com.hai.order.type.*;
@@ -131,6 +132,7 @@ public class OrderServiceImpl implements OrderService {
rollbackFor = Exception.class)
@Cached(cacheType = CacheType.REMOTE, name="order:", key = "#createOrderModel.orderNo", expire = 3600*24*30) // 缓存一个月
public HighOrder createOrder(CreateOrderModel createOrderModel) throws Exception {
+
HighDiscountUserRel discountUserRel = null;
// 使用优惠券
@@ -543,7 +545,7 @@ public class OrderServiceImpl implements OrderService {
@Override
- public JSONObject createOrderCombine(CreateOrderModel createOrderModel) throws Exception {
+ public JSONObject createOrderCombine(CombineOrderModel combineOrderModel) throws Exception {
return null;
}