Merge remote-tracking branch 'origin/master'

doum

15 小时以前 11e35e0257e48667292b4f563ddf6ce02a3a22bb

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java

@@ -106,6 +106,9 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "关联的店铺不存在！");
            }
        }
        if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
            coupon.setMaxPrice(null);
        }
        if(coupon.getUseType() ==0){
            coupon.setValidDays(null);
        }else{