Merge branch 'cloud_teacher_active_2021_09' of http://git.dayaedu.com/yonge/mec into online1

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

@@ -71,16 +71,13 @@
 		<if test="memo != null">
 			memo_ = #{memo},
 		</if>
-		<if test="subjectId != null">
-			subject_id_ = #{subjectId},
-		</if>
 		<if test="speed != null">
 			speed_ = #{speed},
 		</if>
 		<if test="examSongId != null">
 			exam_song_id_ = #{examSongId},
 		</if>
-			xml_url_ = #{xmlUrl},mp3_url_ = #{mp3Url}, update_time_ = NOW()
+			subject_id_ = #{subjectId},xml_url_ = #{xmlUrl},mp3_url_ = #{mp3Url}, update_time_ = NOW()
 	</set>WHERE id_ = #{id}
 	</update>
 	<update id="batchDel">
@@ -102,13 +99,10 @@
 				<if test="item.speed != null">
 					speed_ = #{item.speed},
 				</if>
-				<if test="item.subjectId != null">
-					subject_id_ = #{item.subjectId},
-				</if>
 				<if test="item.examSongId != null">
 					exam_song_id_ = #{item.examSongId},
 				</if>
-				xml_url_ = #{item.xmlUrl},mp3_url_ = #{item.mp3Url}, update_time_ = NOW()
+				subject_id_ = #{item.subjectId},xml_url_ = #{item.xmlUrl},mp3_url_ = #{item.mp3Url}, update_time_ = NOW()
 			</set> WHERE id_ = #{item.id}
 		</foreach>
 	</update>

mec-student/src/main/java/com/ym/mec/student/controller/SysCouponCodeController.java

@@ -10,13 +10,10 @@ import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-
 @RequestMapping("sysCouponCode")
 @Api(tags = "优惠券明细")
 @RestController
@@ -53,14 +50,4 @@ public class SysCouponCodeController extends BaseController {
 		}
 		return succeed(sysCouponCodeService.exchangeCouponTest(sysUser.getId(), couponId, paymentOrderId, exchangeNum));
 	}
-
-	@ApiOperation("获取用户待使用的优惠券")
-	@PostMapping(value = "queryCouponPage")
-	public HttpResponseResult queryCouponPage(BigDecimal amount){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
-		return succeed(sysCouponCodeService.queryCouponPage(amount,sysUser.getId()));
-	}
 }