多球场抵用券 下单抵用业务修改

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/ConditionMultipleElement.java

 package com.ctrip.fun.common.vo.basic;
 
+import java.math.BigDecimal;
+
 public class ConditionMultipleElement {
     private String productIdList;
     private String resourceIdList;
     
-    private int multiAmount;
+    private BigDecimal multiAmount;
 
 
 	public String getProductIdList() {
@@ -23,11 +25,11 @@ public class ConditionMultipleElement {
 		this.resourceIdList = resourceIdList;
 	}
 
-	public int getMultiAmount() {
+	public BigDecimal getMultiAmount() {
 		return multiAmount;
 	}
 
-	public void setMultiAmount(int multiAmount) {
+	public void setMultiAmount(BigDecimal multiAmount) {
 		this.multiAmount = multiAmount;
 	}
     

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/MultipleCourseConditionBean.java

 package com.ctrip.fun.common.vo.basic;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -71,6 +72,33 @@ public class MultipleCourseConditionBean {
         return false;
     }
     
+    public BigDecimal getEnableAmount(CourseRuleConditionBaseBean t){
+    	if(isEnableUse(t)){
+            for(ConditionMultipleElement multiCondition : conditionList){
+            	String productIds = multiCondition.getProductIdList();
+            	if (StringUtils.hasText(productIds)) {
+                    String[] productIdArray = productIds.split(",");
+                    for (String s : productIdArray) {
+                        if (StringUtils.hasText(s) && s.equals(t.getProductId())) {
+                            return multiCondition.getMultiAmount();
+                        }
+                    }
+                }
+            	String resourceIds = multiCondition.getResourceIdList();
+            	if (StringUtils.hasText(resourceIds)) {
+                    String[] resourceIdArray = resourceIds.split(",");
+                    for (String s : resourceIdArray) {
+                        if (StringUtils.hasText(s) && s.equals(t.getResourceId()+"")) {
+                        	return multiCondition.getMultiAmount();
+                        }
+                    }
+                }
+            }
+    		
+    	}
+		return new BigDecimal(0.00);
+    }
+    
     
 	public Integer getType() {
 		return type;

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherItemDTO.java

@@ -32,12 +32,16 @@ public class VoucherItemDTO implements Serializable {
     private int sendToUserType;
     private String description;
     private String remark;
+    private String uid;
 
     private String typeString; // 对应type的名称
 
     private String usedString; // 是否已使用的文字说明
 
     private String subTitle; // 副名称显示
+    
+    private int multiple;
+    private String multiAmount;
 
     public void doExecuteNullField() {
         if (description == null) {
@@ -210,4 +214,28 @@ public class VoucherItemDTO implements Serializable {
         this.sendToUserType = sendToUserType;
     }
 
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public int getMultiple() {
+		return multiple;
+	}
+
+	public void setMultiple(int multiple) {
+		this.multiple = multiple;
+	}
+
+	public String getMultiAmount() {
+		return multiAmount;
+	}
+
+	public void setMultiAmount(String multiAmount) {
+		this.multiAmount = multiAmount;
+	}
+
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/VoucherRuleMultiEnum.java

@@ -11,9 +11,9 @@ import java.util.Map;
  * @version 1.0.0
  */
 public enum VoucherRuleMultiEnum {
-    EXECUTE_RULE(0, "否"),
+	FALSE(0, "否"),
 
-    CREATE_RULE(1, "是");
+	YES(1, "是");
 
     private int value;
     private String msg;