Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/resources/config/mybatis/SysCouponIssueRecordMapper.xml

@@ -152,7 +152,7 @@
             create_time_,
             update_time_,
             tenant_id_,
-            IFNULL(b.couponNum,0) AS canBeGetNum
+            a.`limit_exchange_num_` - IFNULL(b.couponNum,0) AS canBeGetNum
         FROM
             sys_coupon AS a
                 LEFT JOIN
@@ -168,7 +168,7 @@
           AND status_ = 1
           AND tenant_id_ = #{tenantId}
           AND a.`limit_exchange_num_` > IFNULL(b.couponNum, 0)
-          AND NOW() >= start_date_
+          AND NOW() >= end_date_
           AND (
                     stock_count_ > consume_num_
                 OR stock_count_ = - 1