bug fixes

src/main/java/com/caimei/modules/coupon/dao/CmCouponDao.java

@@ -47,4 +47,11 @@ public interface CmCouponDao extends CrudDao<CmCoupon> {
     void insertRedemptionCode(CmCouponRedemptionCode code);
 
     List<CmCouponRedemptionCode> findRedemptionCode(CmCouponRedemptionCode redemptionCode);
+
+    /**
+     * 查询已兑换数量
+     * @param couponId
+     * @return
+     */
+    Integer findQuantityRedeemed(String couponId);
 }

src/main/java/com/caimei/modules/coupon/service/CmCouponService.java

@@ -65,15 +65,21 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
         Date date = new Date();
         couponList.forEach(coupon -> {
             setCouponStatus(coupon, date);
-            if (2 == coupon.getCouponType()) {
-                //用户专享劵
-                CmCouponClub couponClub = cmCouponDao.findCouponClub(coupon.getId());
-                if (couponClub == null) {
-                    coupon.setClaimStatus("1");
-                } else {
-                    coupon.setClaimStatus("2");
+            if ("1".equals(coupon.getCouponsMode())) {
+                //兑换码券
+                Integer num = cmCouponDao.findQuantityRedeemed(coupon.getId());
+                coupon.setCodeNum(num);
+            } else {
+                if (2 == coupon.getCouponType()) {
+                    //用户专享劵
+                    CmCouponClub couponClub = cmCouponDao.findCouponClub(coupon.getId());
+                    if (couponClub == null) {
+                        coupon.setClaimStatus("1");
+                    } else {
+                        coupon.setClaimStatus("2");
+                    }
+                    coupon.setCouponClub(couponClub);
                 }
-                coupon.setCouponClub(couponClub);
             }
         });
         return couponPage;

src/main/resources/mappings/modules/coupon/CmCouponMapper.xml

@@ -390,5 +390,9 @@
 		ORDER BY
 		  addTime DESC
 	</select>
+
+	<select id="findQuantityRedeemed" resultType="integer">
+		SELECT COUNT(id) FROM cm_coupon_redemption_code WHERE couponId = #{couponId} AND status = 2
+	</select>
 	
 </mapper>

src/main/webapp/WEB-INF/views/modules/coupon/redemptionCodeCouponList.jsp

@@ -96,7 +96,9 @@
                     <font color="#FF6600">已失效</font>
                 </c:if>
             </td>
-            <td></td>
+            <td>
+                ${cmCoupon.codeNum}
+            </td>
             <td>
                 <fmt:formatDate value="${cmCoupon.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
             </td>