Browse Source

Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
	src/main/java/com/goafanti/common/mapper/DemandMapper.xml
anderx 8 years ago
parent
commit
551e3e9cf9

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

@@ -1245,12 +1245,14 @@
 		    a.create_time as createTime, a.release_status as releaseStatus, 
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    ui.username as iOwnerName, ui.province, ui.city, ui.area, u.email as iOwnerEmail,
+
 		    ui.id_number as iOwnerIdNumber, u.mobile as iOwnerMobile,j.easemob_name as easemobName
+
     from achievement a
     left join user_identity ui on a.owner_id = ui.uid
     left join jpush_easemob_account j on a.owner_id=j.uid
     left join user u on u.id = a.owner_id
-    where a.id = #{id,jdbcType=VARCHAR}
+  where a.id = #{id,jdbcType=VARCHAR}
   </select>
   
    <select id="selectOrgOwnerDetail" parameterType="java.lang.String" resultType="com.goafanti.achievement.bo.AchievementOrgOwnerDetailBo">

+ 1 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -72,6 +72,7 @@
 				where order_status != 4 and order_status != 0
 				group by  commodity_id ) t2 on d.id=t.commodity_id 
     where d.id =  #{id,jdbcType=VARCHAR}
+
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from demand

+ 7 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -353,6 +353,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					active.setPayForLast(false);
 				}
 				boolean flag = true;
+				if (tOrder.getCommodityType() == CommodityType.DEMAND_PROVIDE.getTypeCode()) { //需求订单
+					if(tOrder.getOrderStatus() == OrderState.INTENTION.getCode()
+							|| tOrder.getIntentionStatus() == IntentionSate.WAIT_SELLER_CONFIRM.getCode()
+							|| tOrder.getTradingStatus() == TradingState.WAIT_FOR_TRADE.getCode()){
+						flag = false;
+					}
+				}
 				if (tOrder.getOrderStatus() == OrderState.CANCELLED.getCode())
 					flag = false;
 				if (tOrder.getIntentionStatus() == IntentionSate.SELLER_REFUSE.getCode()

File diff suppressed because it is too large
+ 0 - 6
src/main/webapp/WEB-INF/views/common.html