fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -186,14 +186,16 @@ for (IntegralTaskClassVO taskClassVO : list) { UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey(); UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid); if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) { JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate", Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())); taskClassVO.setJumpDetail(jumpDetailV2); // 邀请好友：是否激活邀请码 if (uniqueKey == UniqueKeyEnum.inviteTeam) { UserInfoExtraVO extraVO = userInfoExtraService.getInfoExtraVOByUid(uid); if (extraVO == null || StringUtil.isNullOrEmpty(extraVO.getInviteCode())) { JumpDetailV2 jumpDetailV2 = jumpDetailV2Service.getByTypeCache("invite_activate", Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())); taskClassVO.setJumpDetail(jumpDetailV2); } } String progress = taskClassVO.getProgress(); fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
@@ -65,21 +65,21 @@ */ List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId); // /** // * 查询兑换的券 // * @param uid // * @param source // * @return // */ // List<UserSystemCoupon> countIncludeExchange(@Param("uid") Long uid, @Param("source") String source); // // // /** // * 查询排出兑换的券 // * @param uid // * @param source // * @return // */ // List<UserSystemCoupon> countNotIncludeExchange(@Param("uid") Long uid, @Param("source") String source); // /** * 查询兑换的券 * @param uid * @param source * @return */ List<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("list") List<String> list); /** * 查询排出兑换的券 * @param uid * @param source * @return */ List<UserSystemCoupon> getIncludeNotExchange(@Param("uid") Long uid,@Param("list") List<String> list); } fanli/src/main/java/com/yeshi/fanli/mapping/user/UserSystemCouponMapper.xml
@@ -157,4 +157,19 @@ AND (usc_state_activate = 0 OR usc_state_activate is null) </select> <select id="getIncludeExchange" resultMap="BaseResultMap"> SELECT * FROM yeshi_ec_user_system_coupon WHERE usc_state_activate = 1 AND usc_state = 1 AND usc_uid = #{uid} AND usc_source in <foreach collection="list" item="item" open="(" close=")" separator=",">#{item}</foreach> </select> <select id="getIncludeNotExchange" resultMap="BaseResultMap"> SELECT * FROM yeshi_ec_user_system_coupon WHERE usc_state_activate = 1 AND usc_state = 1 AND usc_uid = #{uid} AND usc_source not in <foreach collection="list" item="item" open="(" close=")" separator=",">#{item}</foreach> </select> </mapper> fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -2140,17 +2140,27 @@ } // @Override // public boolean countIncludeExchange(Long uid) { // // // } // // // @Override // public boolean countNotIncludeExchange(Long uid) { // // // } @Override public boolean getIncludeExchange(Long uid) { List<String> list = new ArrayList<String>(); list.add(UserSystemCoupon.SOURCE_EXCHANGE); list.add(UserSystemCoupon.SOURCE_GIVE); List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, list); if (listCoupon == null || listCoupon.size() == 0) return false; return true; } @Override public boolean getIncludeNotExchange(Long uid) { List<String> list = new ArrayList<String>(); list.add(UserSystemCoupon.SOURCE_EXCHANGE); list.add(UserSystemCoupon.SOURCE_GIVE); List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid, list); if (listCoupon == null || listCoupon.size() == 0) return false; return true; } } fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -253,4 +253,18 @@ */ public void updateCounponInvalid(List<UserSystemCoupon> list); /** * 兑换 * @param uid * @return */ public boolean getIncludeExchange(Long uid); /** * 非兑换 * @param uid * @return */ public boolean getIncludeNotExchange(Long uid); }
