bugfix

src/main/java/com/caimei/modules/coupon/web/CmCouponController.java

@@ -307,11 +307,11 @@ public class CmCouponController extends BaseController {
         String wwwServer = Global.getConfig("wwwServer");
         product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, wwwServer));
         //展示全部可用普通优惠券,不包含已领取兑换优惠券
-        List<CmCoupon> ordinaryCoupons = cmCouponService.findClubCouponList(product, 1);
+        List<CmCoupon> ordinaryCoupons = cmCouponService.findClubCouponList(product, 2);
         //展示全部可用兑换优惠券
         List<CmCoupon> redeemCoupons = cmCouponService.findNotRedeemedCoupon(product);
         //展示全部可用价值优惠券
-        List<CmCoupon> moneyCoupons = cmCouponService.findClubCouponList(product, 2);
+        List<CmCoupon> moneyCoupons = cmCouponService.findClubCouponList(product, 1);
         model.addAttribute("product", product);
         model.addAttribute("ordinaryCoupons", ordinaryCoupons);
         model.addAttribute("redeemCoupons", redeemCoupons);

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

@@ -454,7 +454,7 @@
 		  LEFT JOIN cm_coupon cc ON a.couponId = cc.id
 		  LEFT JOIN cm_coupon_redemption_code ccrc ON a.id = ccrc.clubCouponId
 		WHERE
-		  cc.delFlag = 0
+		  	  if(moneyCouponFlag=2,cc.delFlag = 0,cc.id>0)
 		  AND a.delFlag = 0
 		  AND a.userId = #{userId}
 		  AND a.status = 1

src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptForm.jsp

@@ -431,14 +431,14 @@
                 <br/>
                 <span>购买时间：${vo.receiptDate}</span>
                 <span>优惠券类型：
-                    <c:if test="${vo.couponType eq '0'}">活动券</c:if>
-                    <c:if test="${vo.couponType eq '1'}">品类券</c:if>
-                    <c:if test="${vo.couponType eq '2'}">活动券</c:if>
-                    <c:if test="${vo.couponType eq '3'}">店铺券</c:if>
+                    <c:if test="${vo.couponInfo.couponType eq '0'}">活动券</c:if>
+                    <c:if test="${vo.couponInfo.couponType eq '1'}">品类券</c:if>
+                    <c:if test="${vo.couponInfo.couponType eq '2'}">活动券</c:if>
+                    <c:if test="${vo.couponInfo.couponType eq '3'}">店铺券</c:if>
                 </span>
-                <span>满减金额：${vo.couponAmount}</span>
+                <span>满减金额：${vo.couponInfo.couponAmount}</span>
                 <span>购买金额：${vo.receiptAmount}</span>
-                <span>交易号：${vo.mbOrderId}</span>
+                <span>交易号：${vo.couponInfo.mbOrderId}</span>
             </div>
         </div>
     </c:if>