Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -229,7 +229,6 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
 
         for (ActivityPlanRewardDto activityPlanRewardDto : activityPlan.getActivityRewardList()) {
             for (MemberPriceSettingsVo memberPriceSettingsVo : memberPriceSettingsVos) {
-                memberPriceSettingsVo.setDiscount(YesOrNoEnum.NO);
                 if (memberPriceSettingsVo.getPeriod().getCode().equals( activityPlanRewardDto.getActivityReward().getUnit().getCode())) {
                     memberPriceSettingsVo.setDiscount(YesOrNoEnum.YES);
                     memberPriceSettingsVo.setDiscountPrice(activityPlanRewardDto.getActivityReward().getDiscountPrice());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -312,7 +312,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                 couponAmount = createRes.getCouponAmount();
             }
             if (couponAmount.compareTo(createRes.getExpectPrice()) > 0 ){
-                couponAmount = createRes.getActualPrice();
+                couponAmount = createRes.getExpectPrice();
             }
             createRes.setActualPrice(createRes.getExpectPrice().subtract(couponAmount).setScale(2, RoundingMode.HALF_UP));
             createRes.setCouponAmount(couponAmount);

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -144,6 +144,8 @@
 
     <select id="selectAlbumDetailPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
         select distinct <include refid="Base_Column_List"/>
+        ,su.username_ as addName
+        ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
             where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
@@ -153,6 +155,7 @@
         ,amr.sort_number_ as albumSortNumber
         from music_sheet t
         left join album_music_relate amr on t.id_ = amr.music_sheet_id_
+        left join sys_user su on t.create_by_ = su.id_
         <where>
             <if test="param.idAndName != null and param.idAndName != ''">
                 and (t.id_ like concat('%',#{param.idAndName},'%') or

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MemberPriceSettingsController.java

@@ -32,7 +32,7 @@ public class MemberPriceSettingsController extends BaseController {
 	@GetMapping("/detail/{id}")
 	@ApiOperation(value = "详情", notes = "传入id")
 	public HttpResponseResult<MemberPriceSettingsVo> detail(@PathVariable("id") Long id) {
-		return succeed(memberPriceSettingsService.detail(id));
+		return succeed(memberPriceSettingsService.detail(id)); 
 	}
 
 	@PostMapping("/list")