update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -67,6 +67,8 @@ public class SysMusicScore {
 	
 	private String renderFrom;
 	
+	private boolean enableEvaluation;
+	
 	/**  */
 	private java.util.Date updateTime;
 	
@@ -160,6 +162,14 @@ public class SysMusicScore {
 		this.renderFrom = renderFrom;
 	}
 
+	public boolean isEnableEvaluation() {
+		return enableEvaluation;
+	}
+
+	public void setEnableEvaluation(boolean enableEvaluation) {
+		this.enableEvaluation = enableEvaluation;
+	}
+
 	public ClientTypeEnum getClientType() {
 		return clientType;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -304,6 +304,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             	continue;
             }
             Map<String, Object> payment = Payment.queryPayment(payingOrder.getTransNo());
+            LOGGER.info("订单[{}]交易主动查询接口返回：{}", payingOrder.getTransNo(), payment);
+            
             Map<String, String> rpMap = new HashMap<>();
             rpMap.put("merOrderNo", payingOrder.getOrderNo());
             rpMap.put("orderNo", payingOrder.getTransNo());
@@ -314,8 +316,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             }
             if (status.equals("succeeded")) {
                 rpMap.put("tradeState", "1");
-            }
-            if (status.equals("failed") || (DateUtil.minutesBetween(DateUtil.addHours(payingOrder.getUpdateTime(), 2), date) > 0)) {
+            }else if (status.equals("failed") || (DateUtil.minutesBetween(DateUtil.addHours(payingOrder.getUpdateTime(), 2), date) > 0)) {
                 rpMap.put("tradeState", "0");
             }
 

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -27,6 +27,7 @@
 		<result column="order_" property="order" />
 		<result column="rank_ids_" property="rankIds" />
 		<result column="render_from_" property="renderFrom" />
+		<result column="enable_evaluation_" property="enableEvaluation" />
 		<result column="subject_id_" property="subjectId" />
 		<result column="client_type_" property="clientType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="update_time_" property="updateTime" />
@@ -46,10 +47,10 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,metronome_url_,create_user_id_,order_,
-		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,show_flag_)
+		                             update_time_,create_time_,client_type_,rank_ids_,render_from_,enable_evaluation_,show_flag_)
 		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		       #{speed},#{url},#{metronomeUrl},#{createUserId},#{order},NOW(),NOW(),#{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		       #{rankIds},#{renderFrom},#{showFlag})
+		       #{rankIds},#{renderFrom},#{enableEvaluation},#{showFlag})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -65,6 +66,9 @@
 		<if test="renderFrom != null">
 			render_from_ = #{renderFrom},
 		</if>
+		<if test="enableEvaluation != null">
+			enable_evaluation_ = #{enableEvaluation},
+		</if>
 		<if test="order != null">
 			order_ = #{order},
 		</if>