小黄条

yujian

2019-12-10 c8041ec0544bf122e6819e6bf698997ccbf30aaf

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

@@ -20,7 +20,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

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

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;

@@ -31,6 +30,7 @@
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.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

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

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

@@ -78,7 +78,8 @@
   @Resource

   private UserLotteryRecordService userLotteryRecordService;

   



   @Resource

   private UserVIPInfoService userVIPInfoService;



   /**

    * 用户券列表查询

@@ -119,13 +120,11 @@
            changeJump = true;

         }

         

         long count = 0;

         long count = UserSystemCouponService.countCouponOld(uid);

         List<UserSystemCouponVO> resultList = UserSystemCouponService

               .getUserCouponVOList((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE, uid, changeJump);



         if (resultList != null && resultList.size() > 0) {

            count = UserSystemCouponService.countUserCouponList(uid);

         } else if (resultList == null) {

          if (resultList == null) {

            resultList = new ArrayList<UserSystemCouponVO>();

         }



@@ -144,14 +143,11 @@
                  UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

                  // 未读券是否大于0

                  if (userInfoExtra != null && userInfoExtra.getCouponNews() > 0) {

                     userInfoExtra.setCouponNews(0);

                     try {

                        userInfoExtraService.saveUserInfoExtra(userInfoExtra);

                     } catch (UserInfoExtraException e) {

                        e.printStackTrace();

                     }

                     UserInfoExtra extra = new UserInfoExtra();

                     extra.setId(userInfoExtra.getId());

                     extra.setCouponNews(0);

                     userInfoExtraService.updateByPrimaryKeySelective(extra);

                  }



               }

            });

         }

@@ -291,13 +287,18 @@
         return;

      }



      if (userVIPInfoService.isVIP(uid)) {

         out.print(JsonUtil.loadFalseResult("超级会员不可使用奖励券"));

         return;

      }

		
      if (goodsType == null || goodsType > 3 || goodsType < 1) {

         goodsType = Constant.SOURCE_TYPE_TAOBAO;

      }

      

      try {

         UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType);

         JSONObject data = commonOrderService.getRewardJumpInfo(orderNo);

         UserSystemCouponService.useOrderCoupon(uid, cid, orderNo, goodsType, acceptData);

         JSONObject data = commonOrderService.getRewardJumpInfo(orderNo, goodsType);

         out.print(JsonUtil.loadTrueResult(data));

      } catch (UserSystemCouponException e) {

         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

@@ -367,7 +368,7 @@
    * @param uid

    * @param out

    */

   @RequestMapping(value = "getLotteryCount")

   // @RequestMapping(value = "getLotteryCount")

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

      try {

         // 1、已登录系统

@@ -422,7 +423,7 @@
    * @param uid

    * @param out

    */

   @RequestMapping(value = "getLotteryResult")

   // @RequestMapping(value = "getLotteryResult")

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



      try {

@@ -548,7 +549,7 @@
    * @param uid

    * @param out

    */

   @RequestMapping(value = "getDailyCount")

   // @RequestMapping(value = "getDailyCount")

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

      try {

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

@@ -567,7 +568,7 @@
    * @param uid

    * @param out

    */

   @RequestMapping(value = "getDailyResult")

   // @RequestMapping(value = "getDailyResult")

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

      try {

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