消息返回修改

admin

2019-02-28 4e938ce8cf18ebb12c102e7c18c1ca16fe1b15a8

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

@@ -1,17 +1,16 @@
package com.yeshi.fanli.controller.client;



import java.io.PrintWriter;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.DateUtil;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.accept.AcceptData;

@@ -21,10 +20,12 @@
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.UserSystemCouponException;

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

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

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

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

@@ -44,6 +45,9 @@
@Controller

@RequestMapping("api/v1/user/coupon")

public class UserCouponController {



   @Resource(name = "taskExecutor")

   private TaskExecutor executor;



   @Resource

   private ConfigService configService;

@@ -72,6 +76,8 @@
   @Resource

   private CommonOrderCountService commonOrderCountService;



   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

   

   // 最大抽奖次数

   private static int MAX_COUNT = 5;

@@ -120,6 +126,26 @@
         data.put("result_list", JsonUtil.getApiCommonGson().toJson(resultList));



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

			
         // 更新福利中心未读数量

         if (page == 1) {

            executor.execute(new Runnable() {

               @Override

               public void run() {

                  UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

                  // 未读券是否大于0

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

                     userInfoExtra.setCouponNews(0);

                     try {

                        userInfoExtraService.saveUserInfoExtra(userInfoExtra);

                     } catch (UserInfoExtraException e) {

                        e.printStackTrace();

                     }

                  }

						
               }

            });

         }



      } catch (UserSystemCouponException e) {

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

@@ -134,21 +160,23 @@
    * @param acceptData

    * @param page

    * @param uid

    * @param auctionId 商品id

    * @param out

    */

   @RequestMapping(value = "getGoodsCouponList", method = RequestMethod.POST)

   public void getGoodsCouponList(AcceptData acceptData, Long uid, PrintWriter out) {

   public void getGoodsCouponList(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {

      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("用户未登录"));

         return;

      }

      

      try {

         List<UserSystemCouponVO> resultList = UserSystemCouponService.getGoodsCouponList(uid);

         List<UserSystemCouponVO> resultList = UserSystemCouponService.getGoodsCouponList(uid, auctionId);

         

         if (resultList == null ) {

            resultList =new ArrayList<UserSystemCouponVO>();

         }

			
         

         JSONObject dataTip = new JSONObject();

         dataTip.put("content", configService.get("free_coupon_tip"));

@@ -470,29 +498,8 @@
               if (hasPrize.equals(prize)) {

                  prize = null;

               } else {

					
                  SystemCoupon coupon= systemCouponService.getCouponByType(prize);

						
                  String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date());

                  SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");

                  Date endTime = format.parse(endDay);

						
                  int stateActivated = 1;

                  if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {

                     stateActivated = 0;

                  }

						
                  UserSystemCoupon userCoupon = new UserSystemCoupon();

                  userCoupon.setUid(uid);

                  userCoupon.setSource(UserSystemCoupon.SOURCE_CHOUJIANG);

                  userCoupon.setSystemCoupon(coupon);

                  userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);

                  userCoupon.setStateActivated(stateActivated);

                  userCoupon.setStartTime(new Date());

                  userCoupon.setEndTime(endTime);

                  userCoupon.setCreateTime(new Date());

                  userCoupon.setUpdateTime(new Date());

                  userSystemCouponService.insertSelective(userCoupon);

                  // 插入券信息

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

               }

            }

            

@@ -569,13 +576,6 @@
      return prize;

   }

   

	
	
   public static void main(String[] args) {

      long result = (1 + Math.round(Math.random() * (9)));

      System.out.println(result);

   }





   /**

    * 获取抽奖结果

@@ -626,7 +626,6 @@
            }

            userInfoExtra.setLotteryNewbies(count);

            userInfoExtraService.saveUserInfoExtra(userInfoExtra);

				
         } else {

            count = lotteryNewbies; // 剩余次数

         }