冲突解决

yujian

2019-04-08 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java

@@ -17,10 +17,12 @@
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.UserLotteryRecord;

import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

import com.yeshi.fanli.entity.system.SystemCoupon;

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

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.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SystemCouponService;

@@ -30,6 +32,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;

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.Constant;

import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;

@@ -79,6 +82,10 @@


   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

	
   @Resource

   private UserLotteryRecordService userLotteryRecordService;

	




   /**

@@ -542,7 +549,7 @@


            // 已抽中的奖品

            List<UserSystemCoupon> list = userSystemCouponService.getUserCouponBySource(uid,

                  UserSystemCoupon.SOURCE_CHOUJIANG);

                  UserSystemCoupon.SOURCE_NEWBIES);

            

            if (list == null || list.size() == 0) {

               // 抽奖

@@ -572,7 +579,7 @@
                  prize = null;

               } else {

                  // 插入券信息

                  userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_CHOUJIANG);

                  userSystemCouponService.insertUserCoupon(uid, prize, UserSystemCoupon.SOURCE_NEWBIES);

               }

            }

            

@@ -643,4 +650,47 @@
      return prize;

   }



	
   /**

    * 获取抽奖次数- 天天抽奖励券

    * 
    * @param callback

    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "getDailyCount")

   public void getDailyCount(String callback, AcceptData acceptData, Long uid, PrintWriter out) {

      try {

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult( userLotteryRecordService.getLotteryCountDaily(uid)));

      } catch (UserLotteryRecordException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("信息获取失败"));

         e.printStackTrace();

      }

   }



   /**

    * 获取抽奖结果 - 天天抽奖励券`

    * 
    * 
    * 
    * @param callback

    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "getDailyResult")

   public void getDailyResult(String callback, AcceptData acceptData, Long uid, PrintWriter out) {

      try {

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult( userLotteryRecordService.executeLotteryDaily(uid)));

      } catch (UserLotteryRecordException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));

      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("抽奖失败"));

         e.printStackTrace();

      }

   }



}