bugfix

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

@@ -149,6 +149,9 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
         if (null == cmCoupon.getVipFlag()){
             cmCoupon.setVipFlag(0);
         }
+        if(null==cmCoupon.getMoneyCouponFlag()){
+            cmCoupon.setMoneyCouponFlag(2);
+        }
         super.save(cmCoupon);
         List<Integer> associateIds = cmCouponDao.findByCouponId(cmCoupon.getId());
         if (0 == cmCoupon.getCouponType()) {

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

@@ -62,11 +62,13 @@ public class CmCouponController extends BaseController {
     }
 
 
-
     @RequiresPermissions("coupon:cmCoupon:view")
     @RequestMapping(value = {"list", ""})
     public String list(CmCoupon cmCoupon, HttpServletRequest request, HttpServletResponse response, Model model) {
         cmCoupon.setCouponsMode("0");
+        if (null == cmCoupon.getMoneyCouponFlag()) {
+            cmCoupon.setMoneyCouponFlag(2);
+        }
         Page<CmCoupon> page = cmCouponService.findPage(new Page<CmCoupon>(request, response), cmCoupon);
         model.addAttribute("page", page);
         if (0 == cmCoupon.getCouponType()) {
@@ -81,10 +83,10 @@ public class CmCouponController extends BaseController {
         } else if (3 == cmCoupon.getCouponType()) {
             //店铺券
             return "modules/coupon/couponShopList";
-        } else if(4 == cmCoupon.getCouponType()){
+        } else if (4 == cmCoupon.getCouponType()) {
             //新用户券
             return "modules/coupon/couponNewUserList";
-        }else if (1 == cmCoupon.getMoneyCouponFlag()){
+        } else if (1 == cmCoupon.getMoneyCouponFlag()) {
             //价值优惠券
             return "modules/coupon/cmMoneyCouponList";
         }
@@ -165,7 +167,7 @@ public class CmCouponController extends BaseController {
     }
 
     /**
-     *  开启优惠券
+     * 开启优惠券
      */
     @RequestMapping("open")
     public String open(CmCoupon cmCoupon, RedirectAttributes redirectAttributes) {
@@ -270,6 +272,7 @@ public class CmCouponController extends BaseController {
 
     /**
      * 价值优惠券保存
+     *
      * @param cmCoupon
      * @param redirectAttributes
      * @return
@@ -301,11 +304,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, 1);
         //展示全部可用兑换优惠券
         List<CmCoupon> redeemCoupons = cmCouponService.findNotRedeemedCoupon(product);
         //展示全部可用价值优惠券
-        List<CmCoupon> moneyCoupons = cmCouponService.findClubCouponList(product,2);
+        List<CmCoupon> moneyCoupons = cmCouponService.findClubCouponList(product, 2);
         model.addAttribute("product", product);
         model.addAttribute("ordinaryCoupons", ordinaryCoupons);
         model.addAttribute("redeemCoupons", redeemCoupons);