yujian
2019-04-15 7b2202cbaadf70983f1bfe147a9910d0f37840f2
天天抽奖代码优化
2个文件已修改
16 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/src/main/java/org/yeshi/utils/StringUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserLotteryRecordServiceImpl.java
@@ -19,11 +19,13 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserLotteryRecordException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -313,13 +315,14 @@
            throw new UserLotteryRecordException(2,  "抽奖次数不足");
        } 
        
        String prize = "";
        String prize = null;
        // 今日天天抽奖-已抽中拥有券数量
        int todayHas = userSystemCouponService.countTodatyUserCouponBySource(uid, UserSystemCoupon.SOURCE_DAILY_REBATE);
        
        if (todayHas == 0) {
            // 抽奖
            prize = getLotteryPrizeDaily(count);
            LogHelper.test(uid + "中奖结果:" + prize);
            try {
                int num = 0;
                if ("rebateCoupon".equals(prize)) {
@@ -327,8 +330,11 @@
                } else if ("doubleCoupon".equals(prize)) {
                    num = 2;
                } 
                // 插入奖励券
                if (num > 0) {
                userSystemCouponService.randomRewardCoupon(num, uid, UserSystemCoupon.SOURCE_DAILY_REBATE);
                }
                
            } catch (UserSystemCouponException e) {
                throw new UserLotteryRecordException(1, "抽奖失败");
@@ -345,9 +351,11 @@
        updateRecord.setUpdateTime(new Date());
        userLotteryRecordMapper.updateByPrimaryKeySelective(updateRecord);
        
        if (prize == null || prize.trim().length() == 0) {
        LogHelper.test(uid + "返回H5中奖结果:" + prize);
        if (StringUtil.isNullOrEmpty(prize)) {
            prize = "NoPrize";
        }
        LogHelper.test(uid + "返回H5中奖结果处理空值:" + prize);
        
        Map<String,Object> map = new HashMap<String, Object>();
        map.put("count", count);
@@ -379,7 +387,7 @@
            }
        } else {
            long result = (1 + Math.round(Math.random() * (9)));
            if (result <= 2) {
            if (result <= 3) {
                prize = rebateCoupon;
            } else if (result <= 5) {
                prize = doubleCoupon; 
utils/src/main/java/org/yeshi/utils/StringUtil.java
@@ -67,7 +67,7 @@
     * @return
     */
    public static boolean isNullOrEmpty(String text) {
        if (text == null || text.length() == 0 || text.equalsIgnoreCase("null")) {
        if (text == null || text.trim().length() == 0 || text.equalsIgnoreCase("null")) {
            return true;
        }
        return false;