Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev

hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java

@@ -54,10 +54,14 @@ public class OutRechargePriceController {
     @ApiOperation(value = "查询充值金额列表")
     public ResponseData getRechargePriceByList(
             @RequestParam(name = "platformId", required = true) Integer platformId,
-            @RequestParam(name = "companyId", required = true) Long companyId
+            @RequestParam(name = "companyId", required = false) Long companyId
     ) {
         try {
 
+            if (companyId == null) {
+                companyId = 23L;
+            }
+
             Map<String, Object> map;
 
             List<SecDictionary> secDictionaryList = commonService.mappingSysNameOl("OPERATOR_TYPE");

hai-service/pom.xml

@@ -351,6 +351,12 @@
             <artifactId>wechatpay-apache-httpclient</artifactId>
             <version>0.4.9</version>
         </dependency>
+<!--        华为云sdk-->
+        <dependency>
+            <groupId>com.huaweicloud.sdk</groupId>
+            <artifactId>huaweicloud-sdk-sis</artifactId>
+            <version>3.1.42</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

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<CreateOrderModel> createOrderModelList;
+
 }

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;
 
 
     /**

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;
     }