albertshaw 8 lat temu
rodzic
commit
0c427a9ec7

+ 40 - 13
src/main/java/com/goafanti/achievement/bo/AchievementOrderListBo.java

@@ -1,5 +1,6 @@
 package com.goafanti.achievement.bo;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -9,67 +10,77 @@ import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class AchievementOrderListBo {
-	private String	id;
+	private String		id;
 
 	/**
 	 * 编号
 	 */
-	private Integer	serialNumber;
+	private Integer		serialNumber;
 
 	/**
 	 * 科技成果ID
 	 */
-	private String	achievementId;
+	private String		achievementId;
 
 	/**
 	 * 购买时间
 	 */
-	private Date	createTime;
+	private Date		createTime;
 
 	/**
 	* (0, "未支付"),(1, "已支付"),(2, "支付中"),(3, "完成"),(9, "取消"),(10, "无效")
 	*/
-	private Integer	status;
+	private Integer		status;
 
 	/**
 	* 实际支付金额
 	*/
-	private Double	paymentValue;
+	private Double		paymentValue;
 
 	/**
 	* 支付方式
 	*/
-	private String	paymentType;
+	private String		paymentType;
 
 	/**
 	* 支付流水号
 	*/
-	private String	paymentId;
+	private String		paymentId;
 
 	/**
 	* 支付时间
 	*/
-	private Date	paymentTime;
+	private Date		paymentTime;
 
 	/**
 	 * 科技成果名称
 	 */
-	private String	name;
+	private String		name;
 
 	/**
 	 * 科技需求编号
 	 */
-	private Integer	achievementSerialNumber;
+	private Integer		achievementSerialNumber;
 
 	/**
 	 * 科技成果删除标记
 	 */
-	private Integer	deletedSign;
+	private Integer		deletedSign;
 
 	/**
 	 * 科技成果审核状态
 	 */
-	private Integer	auditStatus;
+	private Integer		auditStatus;
+
+	/**
+	 * 议价方式(0--面议,1--定价)
+	 */
+	private Integer		bargainingMode;
+
+	/**
+	 * 转让价格
+	 */
+	private BigDecimal	transferPrice;
 
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getDeletedSign() {
@@ -202,4 +213,20 @@ public class AchievementOrderListBo {
 
 	}
 
+	public Integer getBargainingMode() {
+		return bargainingMode;
+	}
+
+	public void setBargainingMode(Integer bargainingMode) {
+		this.bargainingMode = bargainingMode;
+	}
+
+	public BigDecimal getTransferPrice() {
+		return transferPrice;
+	}
+
+	public void setTransferPrice(BigDecimal transferPrice) {
+		this.transferPrice = transferPrice;
+	}
+
 }

+ 1 - 9
src/main/java/com/goafanti/achievement/bo/InputAchievementOrder.java

@@ -21,7 +21,7 @@ public class InputAchievementOrder {
 	private String	paymentId;
 
 	@Size(min = 0, max = 16, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
-	private Integer	paymentType;
+	private String	paymentType;
 
 	@Max(value = 6, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
@@ -78,12 +78,4 @@ public class InputAchievementOrder {
 		this.paymentId = paymentId;
 	}
 
-	public Integer getPaymentType() {
-		return paymentType;
-	}
-
-	public void setPaymentType(Integer paymentType) {
-		this.paymentType = paymentType;
-	}
-
 }

+ 6 - 3
src/main/java/com/goafanti/common/mapper/AchievementOrderMapperExt.xml

@@ -15,7 +15,8 @@
   		ao.create_time as createTime,ao.status,
   		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
   		ao.payment_time as paymentTime, a.name, a.serial_number as achievementSerialNumber,
-  		a.deleted_sign as deletedSign, a.audit_status as auditStatus
+  		a.deleted_sign as deletedSign, a.audit_status as auditStatus, a.bargaining_mode as bargainingMode
+  		a.transfer_price as transferPrice
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
   	where ao.deleted_sign = 0 
@@ -58,7 +59,8 @@
   		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
   		ao.payment_time as paymentTime, a.name, a.serial_number as achievementSerialNumber,
   		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ui.username,
-  		ao.uid, oi.unit_name as unitName
+  		ao.uid, oi.unit_name as unitName, a.bargaining_mode as bargainingMode
+  		a.transfer_price as transferPrice
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
   	left join user_identity ui on ui.uid = ao.uid
@@ -118,7 +120,8 @@
   		ao.payment_value as paymentValue, ao.payment_type as paymentType, ao.payment_id as paymentId,
   		ao.payment_time as paymentTime,  a.name, a.serial_number as achievementSerialNumber,
   		a.deleted_sign as deletedSign, a.audit_status as auditStatus, ao.uid,
-  		oi.unit_name as unitName, ui.username
+  		oi.unit_name as unitName, ui.username, a.bargaining_mode as bargainingMode
+  		a.transfer_price as transferPrice
   	from achievement_order ao
   	left join achievement a on a.id = ao.achievement_id
   	left join user_identity ui on ui.uid = ao.uid