albertshaw 8 years ago
parent
commit
a36a7225bb

+ 33 - 50
src/main/java/com/goafanti/achievement/bo/InputAchievementOrder.java

@@ -8,35 +8,28 @@ import com.goafanti.common.constant.ErrorConstants;
 
 public class InputAchievementOrder {
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String id;
-	
+	private String	id;
+
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String	achievementId;
 
 	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	intentionMoney;
-	
-	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	contractMoney;
-	
-	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	commission;
-	
-	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer	serviceMoney;
-	
+	private Double	paymentValue;
+
+	@Size(min = 0, max = 45, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String	paymentId;
+
+	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private Integer	paymentType;
+
 	@Max(value = 6, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer	status;
-	
+
 	@Size(min = 0, max = 128, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private String comment;
-	
-	
+	private String	comment;
+
 	public String getId() {
 		return id;
 	}
@@ -53,54 +46,44 @@ public class InputAchievementOrder {
 		this.achievementId = achievementId;
 	}
 
-	public Integer getIntentionMoney() {
-		return intentionMoney;
-	}
-
-	public void setIntentionMoney(Integer intentionMoney) {
-		this.intentionMoney = intentionMoney;
-	}
-
-	public Integer getContractMoney() {
-		return contractMoney;
+	public Integer getStatus() {
+		return status;
 	}
 
-	public void setContractMoney(Integer contractMoney) {
-		this.contractMoney = contractMoney;
+	public void setStatus(Integer status) {
+		this.status = status;
 	}
 
-	public Integer getCommission() {
-		return commission;
+	public String getComment() {
+		return comment;
 	}
 
-	public void setCommission(Integer commission) {
-		this.commission = commission;
+	public void setComment(String comment) {
+		this.comment = comment;
 	}
 
-	public Integer getServiceMoney() {
-		return serviceMoney;
+	public Double getPaymentValue() {
+		return paymentValue;
 	}
 
-	public void setServiceMoney(Integer serviceMoney) {
-		this.serviceMoney = serviceMoney;
+	public void setPaymentValue(Double paymentValue) {
+		this.paymentValue = paymentValue;
 	}
 
-	public Integer getStatus() {
-		return status;
+	public String getPaymentId() {
+		return paymentId;
 	}
 
-	public void setStatus(Integer status) {
-		this.status = status;
+	public void setPaymentId(String paymentId) {
+		this.paymentId = paymentId;
 	}
 
-	public String getComment() {
-		return comment;
+	public Integer getPaymentType() {
+		return paymentType;
 	}
 
-	public void setComment(String comment) {
-		this.comment = comment;
+	public void setPaymentType(Integer paymentType) {
+		this.paymentType = paymentType;
 	}
-	
-	
 
 }

+ 3 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementOrderServiceImpl.java

@@ -147,6 +147,9 @@ public class AchievementOrderServiceImpl extends BaseMybatisDao<AchievementOrder
 			}
 			aol.setRecordTime(recordTime);
 			achievementOrderLogMapper.insert(aol);
+			if (AchievementOrderStatus.PAYED == AchievementOrderStatus.getStatus(achievementOrder.getStatus())) {
+				achievementOrder.setPaymentTime(recordTime);
+			}
 		}
 		return achievementOrderMapper.updateByPrimaryKeySelective(achievementOrder);
 	}