Merge branch 'fix-1002761' into 'master'

fix1002761

See merge request rays/pcloud-book!670

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -684,6 +684,10 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
     public RightsSetting getRightsSettingGiftCoupons(Long rightsSettingId, Long wechatUserId) {
         RightsSetting rightsSetting=new RightsSetting();
         rightsSetting.setId(rightsSettingId);
+        RightsSettingTitle  rightsSettingTitle4Gift = rightsSettingTitleMapper.getByRightSettingIdAndType(rightsSettingId,RightsNowItemType.GIFT_COUPON_PACKAGE.value);
+        if (null != rightsSettingTitle4Gift){
+            rightsSetting.setGiftCouponPackageTitle(rightsSettingTitle4Gift);
+        }
         fillGiftCouponPack(rightsSetting);
         fillUserGiftReceiveStatus(rightsSetting,wechatUserId);
         return rightsSetting;

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/mapper/RightsSettingTitleMapper.java

@@ -2,6 +2,7 @@ package com.pcloud.book.rightsSetting.mapper;
 
 import com.pcloud.book.rightsSetting.entity.RightsSettingTitle;
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 
@@ -18,4 +19,6 @@ public interface RightsSettingTitleMapper {
     void batchUpdate(List<RightsSettingTitle> rightsSettingTitles);
 
     List<RightsSettingTitle> getByRightSettingId(Long rightsSettingId);
+
+    RightsSettingTitle getByRightSettingIdAndType(@Param("rightsSettingId") Long rightsSettingId, @Param("type") Integer type);
 }
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingTitleMapper.xml

@@ -129,4 +129,15 @@
     rights_setting_id = #{rightsSettingId}
   </select>
 
+  <select id="getByRightSettingIdAndType" resultMap="BaseResultMap" parameterType="map">
+    select
+    <include refid="baseSql"/>
+    from
+    rights_setting_title
+    where
+    rights_setting_id = #{rightsSettingId}
+    and
+    rights_setting_now_type = #{type}
+  </select>
+
 </mapper>
\ No newline at end of file