Merge branch 'dev_1_3_4_20220825'

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

@@ -92,7 +92,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         BigDecimal couponAmount = BigDecimal.ZERO;
         // 获取活动的优惠信息
         ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.VIP,
-                                                                          orderReqInfo.getUserId());
+                                                                          orderReqInfo.getRecomUserId());
         if (activityPlanVo != null) {
             for (ActivityPlanRewardDto activityPlanRewardDto : activityPlanVo.getActivityRewardList()) {
                 if (activityPlanRewardDto.getActivityReward().getUnit().getCode().equals(detail.getPeriod().getCode())) {
@@ -109,7 +109,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         orderCreateRes.setGoodNum(1);
         orderCreateRes.setOriginalPrice(detail.getOriginalPrice());
         orderCreateRes.setCouponAmount(couponAmount);
-        orderCreateRes.setExpectPrice(detail.getOriginalPrice());
+        orderCreateRes.setExpectPrice(detail.getSalePrice());
         return HttpResponseResult.succeed(orderCreateRes);
     }
 
@@ -230,6 +230,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
                 }
             }
         }
+        memberPriceVo.setList(memberPriceSettingsVos);
         return memberPriceVo;
     }
 

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

@@ -814,7 +814,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     }
 
     private void saveActivityRecord(UserOrderDetailVo orderDetailVo) {
-        if (orderDetailVo.getActivityId() == null || orderDetailVo.getActivityId() == 0) {
+        if (orderDetailVo.getActivityId() == null || orderDetailVo.getActivityId() == 0 || orderDetailVo.getRecomUserId() == null) {
             return;
         }
         ActivityRegistration activityRegistration = new ActivityRegistration();

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

@@ -117,12 +117,12 @@
 	<select id="selectActivityShare" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo">
         select
         <include refid="baseColumns"/>
-        from activity_plan ap
-        left join activity_evaluation ae on ap.id_ = ae.activity_id_
+        from activity_plan t
+        left join activity_evaluation ae on t.id_ = ae.activity_id_
         <where>
-            activity_state_ = 1 and activity_start_ &lt;= now() and activity_end_ &gt;= now()
+            activity_state_ = 1 and activity_start_ &lt;= now() and activity_end_ &gt;= now() and activity_type_ = 'SHARE'
             <if test="type != null and type != ''">
-                and #{type} = ap.share_type_
+                and #{type} = t.share_type_
             </if>
             <if test="userId != null">
                 and ae.music_sheet_id_ = #{userId}

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

@@ -56,6 +56,7 @@
         , ar.create_by_ as "activityReward.createBy"
         , ar.update_time_ as "activityReward.updateTime"
         , ar.update_by_ as "activityReward.updateBy"
+        , ar.discount_price_ as "activityReward.discountPrice"
     </sql>
 
     <select id="queryActivityPlanReward" resultType="com.yonge.cooleshow.biz.dal.dto.ActivityPlanRewardDto">