From 18acc34c92da0992e775a811155872cbc912e8df Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Wed, 21 Jun 2023 14:23:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hai-service/pom.xml                           |  6 +++
 .../model/combine/CombineOrderModel.java      | 40 +++++++++++++++++++
 .../com/hai/order/service/OrderService.java   |  3 +-
 .../order/service/impl/OrderServiceImpl.java  |  4 +-
 4 files changed, 51 insertions(+), 2 deletions(-)

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

From 6630061cfeff3cc2103c7d52dd87536f2785d084 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 26 Jun 2023 11:34:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=9D=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cweb/controller/OutRechargePriceController.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java b/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java
index b010541a..83f18061 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/OutRechargePriceController.java
+++ b/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");