合并

MrShi

19 小时以前 297734ace4c05848b28a792fa89f38bee67be3c1

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

@@ -76,10 +76,19 @@
                || coupon.getType()==null
                ||coupon.getLimitPrice()==null
                ||coupon.getPrice()==null
                ||coupon.getUseType() ==null
                ||coupon.getNum()==null
              /*  ||coupon.getIntegral()==null*/
                ||coupon.getStartDate()==null
                ||(coupon.getUseType() ==0 &&(
                    coupon.getStartDate()==null
                ||coupon.getEndDate()==null
                  ))
                ||(coupon.getUseType() ==1 &&(
                    coupon.getValidDays()==null
                    || coupon.getValidDays()<=0
                  ))
              /*  ||coupon.getIntegral()==null*/
//                ||coupon.getStartDate()==null
//                ||coupon.getEndDate()==null
//                ||coupon.getValidDays()==null

        ){
@@ -97,6 +106,12 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "关联的店铺不存在！");
            }
        }
        if(coupon.getUseType() ==0){
            coupon.setValidDays(null);
        }else{
            coupon.setStartDate(null);
            coupon.setEndDate(null);
        }
        coupon.setApplyIds("");
        if(Constants.equalsInteger(coupon.getApplyType(),Constants.TWO) && coupon.getApplyIdList()!=null){
            coupon.setApplyIds(coupon.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(",")));//使用对象编码集合