Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysCouponCodeServiceImpl.java

@@ -157,7 +157,6 @@ public class SysCouponCodeServiceImpl extends BaseServiceImpl<Long, SysCouponCod
             SysCouponCode couponCode = new SysCouponCode();
             BeanUtils.copyProperties(sysCouponCode, couponCode);
             couponCode.setCode(String.valueOf(idGeneratorService.generatorId("coupon")));
-            couponCode.setTenantId(tenantId);
             couponCodes.add(couponCode);
         }
         sysCouponCodeDao.batchInsert(couponCodes);

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

@@ -145,6 +145,7 @@
 
 	<select id="countWithUserAndCoupon" resultType="int">
 		SELECT COUNT(id_) FROM sys_coupon_code WHERE user_id_=#{userId} AND coupon_id_=#{couponId}
+		                                         AND usage_status_  <![CDATA[ <> ]]> 2
 	</select>
 
 	<sql id="querySysCouponUseListCondition">

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

@@ -159,7 +159,7 @@
                  coupon_id_
              FROM
                  sys_coupon_code
-             WHERE user_id_ = #{userId}
+             WHERE usage_status_  <![CDATA[ <> ]]> 2 AND user_id_ = #{userId}
              GROUP BY coupon_id_) AS b
             ON a.id_ = b.coupon_id_
         WHERE issuance_type_ = 0