'提交代码'

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

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}, ",