Antiloveg 8 years ago
parent
commit
7b1c54cd3d

+ 2 - 1
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1079,11 +1079,12 @@
   		a.bargaining_mode as bargainingMode, a.technical_scene as technicalScene, a.breakthrough,
   		a.patent_case as patentCase, a.awards, a.team_des as teamDes, 
   		a.parameter, a.tech_plan_url as techPlanUrl, a.business_plan_url as businessPlanUrl,
-  		ai.id as achievementInterestId
+  		ai.id as achievementInterestId, ao.id as achievementOrderId, ao.status as orderStatus
   	from achievement a
   	left join user_identity ui on ui.uid = a.owner_id
   	left join organization_identity oi on oi.uid = a.owner_id
   	left join achievement_interest ai on ai.achievement_id = a.id and ai.uid = #{0}
+  	left join achievement_order ao on ao.achievement_id = a.id and ao.uid = #{0}
   	where a.id = #{1}
   </select>
   

+ 27 - 0
src/main/java/com/goafanti/portal/bo/AchievementDetailBo.java

@@ -94,6 +94,33 @@ public class AchievementDetailBo extends AchievementSearchListBo {
 	 */
 	private String achievementInterestId;
 	
+	/**
+	 * 订单ID
+	 */
+	private String achievementOrderId;
+	
+	/**
+	 * 订单状态
+	 */
+	private Integer orderStatus;
+	
+	
+	public String getAchievementOrderId() {
+		return achievementOrderId;
+	}
+
+	public void setAchievementOrderId(String achievementOrderId) {
+		this.achievementOrderId = achievementOrderId;
+	}
+	
+	@JsonFormat(shape = Shape.STRING)
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
 
 	public String getAchievementInterestId() {
 		return achievementInterestId;