曲目筛选

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumDetailSearch.java

@@ -42,16 +42,6 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
 
     private List<String> paymentTypes;
 
-    @ApiModelProperty(value = "曲谱类型(SINGLE:单曲，CONCERT:合奏)")
-    private MusicSheetTypeEnum musicSheetType;
-
-    public MusicSheetTypeEnum getMusicSheetType() {
-        return musicSheetType;
-    }
-
-    public void setMusicSheetType(MusicSheetTypeEnum musicSheetType) {
-        this.musicSheetType = musicSheetType;
-    }
 
     public Integer getRelatedNum() {
         return relatedNum;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -1,11 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.AccompanimentTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.MusicSortType;
-import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.base.util.StringUtil;
@@ -98,6 +93,17 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty("musicSheetId集合")
     private List<Long> musicSheetIdlist;
 
+
+    @ApiModelProperty(value = "曲谱类型(SINGLE:单曲，CONCERT:合奏)")
+    private MusicSheetTypeEnum musicSheetType;
+
+    public MusicSheetTypeEnum getMusicSheetType() {
+        return musicSheetType;
+    }
+
+    public void setMusicSheetType(MusicSheetTypeEnum musicSheetType) {
+        this.musicSheetType = musicSheetType;
+    }
     public List<Long> getMusicSheetIdlist() {
         return musicSheetIdlist;
     }

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

@@ -178,13 +178,13 @@ public class UserPaymentOrderServiceImpl  implements UserPaymentOrderService {
             newestPayment = new UserOrderPayment();
         }
 
-        newestPayment.setOrderNo(userOrder.getOrderNo());
-        newestPayment.setPaymentVendor(order.getPaymentVendor());
-        newestPayment.setPaymentChannel(order.getPaymentChannel());
-        newestPayment.setPaymentAppId(order.getPaymentAppId());
-        newestPayment.setPaymentNo(order.getOrderNo());
+        newestPayment.setOrderNo(order1.getOrderNo());
+        newestPayment.setPaymentVendor(order1.getPaymentVendor());
+        newestPayment.setPaymentChannel(order1.getPaymentChannel());
+        newestPayment.setPaymentAppId(order1.getPaymentAppId());
+        newestPayment.setPaymentNo(order1.getOrderNo());
         newestPayment.setTransNo(order.getTransNo());
-        newestPayment.setPayAmt(order.getPaymentCashAmount());
+        newestPayment.setPayAmt(order1.getActualPrice());
         newestPayment.setFeeAmt(order.getPaymentChannelFee());
         // 状态转换
         switch (order.getStatus()) {

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

@@ -125,6 +125,9 @@
     </select>
 
     <sql id="QueryInfo">
+        <if test="param.musicSheetType != null">
+            and t.music_sheet_type_ = #{param.musicSheetType}
+        </if>
         <if test="param.idAndName != null and param.idAndName != ''">
             and (t.id_ like concat('%',#{param.idAndName},'%') or
             t.music_sheet_name_ like concat('%',#{param.idAndName},'%') or
@@ -137,6 +140,7 @@
                 find_in_set(#{item},t.music_tag_)
             </foreach>
         </if>
+
         <if test="param.subjectIdList != null and param.subjectIdList.size() != 0">
             and(
             <foreach collection="param.subjectIdList" separator="or" item="item" open="(" close=")">

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/UserOrderController.java

@@ -359,8 +359,11 @@ public class UserOrderController extends BaseController {
 
         // 用户取消支付
 
+        UserPaymentOrderWrapper.OrderPayTypeResp orderPayTypeResp = userPaymentCoreService.orderPayType(payTypeReq);
 
-        return HttpResponseResult.succeed(userPaymentCoreService.orderPayType(payTypeReq));
+        // todo 测试固定v2
+        orderPayTypeResp.setPaymentVersion(EPaymentVersion.V2);
+        return HttpResponseResult.succeed(orderPayTypeResp);
     }