Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -20,10 +20,7 @@ import com.yonge.cooleshow.biz.dal.dto.activity.ActivityTeacherQuery;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.ActivityPlanSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.EQueryOp;
-import com.yonge.cooleshow.biz.dal.enums.MK;
-import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.enums.activity.ActivityRankingMethodEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo;
@@ -666,6 +663,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         orderCreateRes.setGoodType(orderCreateRes.getGoodType());
         orderCreateRes.setBizId(activityPlanPayDto.getActivityId());
         orderCreateRes.setGoodNum(1);
+        orderCreateRes.setSourceType(SourceTypeEnum.PLATFORM);
         orderCreateRes.setOriginalPrice(activityPlan.getRegistrationPrice());
         orderCreateRes.setExpectPrice(activityPlan.getRegistrationPrice());
         return HttpResponseResult.succeed(orderCreateRes);

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

@@ -805,6 +805,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         orderCreateRes.setExpectPrice(courseGroup.getCoursePrice());
         orderCreateRes.setGoodNum(courseGroup.getCourseNum());
         orderCreateRes.setGoodType(GoodTypeEnum.LIVE);
+        orderCreateRes.setSourceType(SourceTypeEnum.TEACHER);
 
         HttpResponseResult<OrderCreateRes> httpResponseResult = new HttpResponseResult<>();
         httpResponseResult.setData(orderCreateRes);

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

@@ -1093,6 +1093,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         orderCreateRes.setExpectPrice(scheduleDto.getCoursePrice());
         orderCreateRes.setGoodNum(scheduleDto.getCourseNum());
         orderCreateRes.setGoodType(GoodTypeEnum.PRACTICE);
+        orderCreateRes.setSourceType(SourceTypeEnum.TEACHER);
         HttpResponseResult<OrderCreateRes> httpResponseResult = new HttpResponseResult<>();
         httpResponseResult.setData(orderCreateRes);
         log.info("buyPracticeCourse  return {}", httpResponseResult);

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

@@ -114,6 +114,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
         orderCreateRes.setCouponAmount(couponAmount);
         orderCreateRes.setExpectPrice(detail.getSalePrice());
+        orderCreateRes.setSourceType(SourceTypeEnum.PLATFORM);
         return HttpResponseResult.succeed(orderCreateRes);
     }
 

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

@@ -924,6 +924,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     if (!musicSheet.getSourceType().getCode().equals(SourceTypeEnum.PLATFORM.getCode())) {
                         orderCreateRes.setMerchId(musicSheet.getUserId());
                     }
+                    orderCreateRes.setSourceType(musicSheet.getSourceType());
 
 
                     orderCreateRes.setBizId(musicSheet.getId());
@@ -938,6 +939,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     if (Objects.isNull(album)) {
                         throw new BizException("无效的专辑信息");
                     }
+                    orderCreateRes.setSourceType(SourceTypeEnum.PLATFORM);
 
                     orderCreateRes.setRes(true);
                     orderCreateRes.setMerchId(0L);

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

@@ -75,6 +75,7 @@ public class PianoRoomBuyRecordServiceImpl extends ServiceImpl<PianoRoomBuyRecor
         orderCreateRes.setBizContent("琴房时长包购买-" + detail.getTimes() + "分");
         orderCreateRes.setGoodNum(1);
         orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
+        orderCreateRes.setSourceType(SourceTypeEnum.PLATFORM);
         orderCreateRes.setExpectPrice(detail.getSalePrice());
         return HttpResponseResult.succeed(orderCreateRes);
     }

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

@@ -364,6 +364,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
             // 计算优惠券金额
             if (StringUtils.isNotEmpty(orderReq.getCouponId())) {
+                if (createRes.getSourceType() != null && !createRes.getSourceType().equals(SourceTypeEnum.PLATFORM)) {
+                    return HttpResponseResult.failed("优惠券不可用");
+                }
 
                 couponOrderWrapper = couponInfoService.queryUserOrderCouponInfo(orderReq.getUserId(),
                         CouponInfoQuery.CouponOrderQuery.builder()

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

@@ -130,6 +130,7 @@ public class VideoLessonPurchaseRecordServiceImpl extends ServiceImpl<VideoLesso
         orderCreateRes.setActualPrice(purchaseRecord.getPayMoney());//实际价格
         orderCreateRes.setGoodNum(lessonGroup.getLessonCount());
         orderCreateRes.setGoodType(GoodTypeEnum.VIDEO);
+        orderCreateRes.setSourceType(SourceTypeEnum.TEACHER);
         HttpResponseResult<OrderCreateRes> httpResponseResult = new HttpResponseResult<>();
         httpResponseResult.setData(orderCreateRes);
         log.info("buyVideoCourse  return {}", httpResponseResult);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/res/OrderCreateRes.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.vo.res;
 
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -46,6 +47,17 @@ public class OrderCreateRes {
     // 透传订单类型
     private OrderTypeEnum orderType;
 
+    // 商品来源
+    private SourceTypeEnum sourceType;
+
+    public SourceTypeEnum getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(SourceTypeEnum sourceType) {
+        this.sourceType = sourceType;
+    }
+
     public Long getRewardId() {
         return rewardId;
     }