From 272dd3d0b174046ca24fbafacba5ffcf8aae9a08 Mon Sep 17 00:00:00 2001
From: 199901012 <hurui@shinwoten.com>
Date: Sat, 27 Mar 2021 14:39:46 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cweb/controller/HighCouponController.java   | 2 +-
 .../src/main/java/com/hai/dao/HighCouponCodeMapperExt.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java b/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java
index a8a21463..ea7dd28c 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java
@@ -72,7 +72,7 @@ public class HighCouponController {
             BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(regionId);
             if (bsCompany != null) {
                 Map<String, Object> map = new HashMap<>();
-                map.put("companyId", bsCompany.getRegionId());
+                map.put("companyId", bsCompany.getId());
                 map.put("merchantId", merchantId);
                 map.put("couponName", couponName);
                 map.put("couponType", couponType);
diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponCodeMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighCouponCodeMapperExt.java
index 26528ae3..2eb92a88 100644
--- a/hai-service/src/main/java/com/hai/dao/HighCouponCodeMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighCouponCodeMapperExt.java
@@ -14,7 +14,7 @@ public interface HighCouponCodeMapperExt {
     @Insert({
             "<script>",
             "insert into high_coupon_code (coupon_id, merchant_id, ",
-            "order_id, sales_code, ",
+            "child_order_id, sales_code, ",
             "sales_end_time, use_end_time, ",
             "create_time, receive_time, ",
             "consume_time, `status`, ",
@@ -24,7 +24,7 @@ public interface HighCouponCodeMapperExt {
             "<foreach collection='list' item='item' index='index' separator=','>",
                 "(#{item.couponId,jdbcType=BIGINT}, " +
                 "#{item.merchantId,jdbcType=BIGINT}," +
-                "#{item.orderId,jdbcType=BIGINT}, " +
+                "#{item.childOrderId,jdbcType=BIGINT}, " +
                 "#{item.salesCode,jdbcType=VARCHAR}, ",
                 "#{item.salesEndTime,jdbcType=TIMESTAMP}," +
                 "#{item.useEndTime,jdbcType=TIMESTAMP}, ",