1.添加券规则判断

src/main/java/com/ctrip/fun/golf/service/basic/VoucherService.java

@@ -758,15 +758,25 @@ public class VoucherService {
         		if(!StringUtils.isEmpty(voucherItemDTO.getConditionJson()) && VoucherTypeEnum.COURSE.getValue() == voucherItemDTO.getType()){
         			String conditionJson = voucherItemDTO.getConditionJson();
         			VoucherTypeEnum voucherTypeEnum = VoucherTypeEnum.valueOf(voucherItemDTO.getType());
-        	        if (conditionJson != null && conditionJson.contains("value")) {
+        	        if (conditionJson != null) {
         	        	if(voucherItemDTO.getMultiple()==0){
-        		            if (voucherTypeEnum != null && voucherTypeEnum.isCourseRuleConditionBean()) {
+        		            if (conditionJson.contains("value") && voucherTypeEnum != null && voucherTypeEnum.isCourseRuleConditionBean()) {
         		                AbstractRuleConditionBean ruleConditionBean = JsonUtil.readValue(
         		                		conditionJson, CourseRuleConditionBean.class);
         		                if(!StringUtils.isEmpty(ruleConditionBean.getValue())){
         		                	CourseProduct courseProduct = courseProductDao.findById(Integer.parseInt(ruleConditionBean.getValue()));
             		                voucherItemDTO.setCourseID(courseProduct.getCourseId().toString());
         		                }
+        		            } else if(conditionJson.contains("conditionList")) {
+        		            	MultipleCourseConditionBean bean = (MultipleCourseConditionBean)  JsonUtil.readValue(conditionJson, MultipleCourseConditionBean.class);
+        						
+								List<ConditionMultipleElement>  list = bean.getConditionList();
+								StringBuffer amountArray = new StringBuffer();
+								for(ConditionMultipleElement element :list){
+									amountArray.append(element.getMultiAmount()+" / ¥ ");
+								}
+								voucherItemDTO.setMultiAmount(amountArray.toString().substring(0,amountArray.length()-5));
+								
         		            }
         	        	}
         	        }