其他消息表结构修改

admin

2019-02-27 e260d06750811a6be0ad1abb85634ced13cc7d94

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -31,6 +31,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

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

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

@@ -95,6 +96,9 @@
   

   @Resource

   private UserInfoExtraService userInfoExtraService;

	
   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   // 券失效图片

   public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";

@@ -134,6 +138,49 @@
      return userSystemCouponMapper.countUserCouponList(uid);

   }



   @Override

   public void insertUserCoupon(Long uid, String couponType,String source)throws UserSystemCouponException,Exception{

		
      if (couponType == null || uid == null) {

         throw new UserSystemCouponException(1, "参数不正确");

      } 
		
      SystemCoupon coupon= systemCouponService.getCouponByType(couponType);

      if (coupon == null) {

         throw new UserSystemCouponException(1, "券类型不正确");

      } 
		
      int stateActivated = 1;

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

         // 福利券状态

         long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid);

         // 没有下级队员 --待激活

         if (countSuccess == 0) {

            stateActivated = 0;

         }

      }

		
      // 结束日期

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

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

      Date endTime = format.parse(endDay);

		
      UserSystemCoupon userCoupon = new UserSystemCoupon();

      userCoupon.setUid(uid);

      userCoupon.setSource(source);

      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());

      // 插入数据库

      insertSelective(userCoupon);

   }



	
	
   @Override

   public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)

         throws UserSystemCouponException, Exception {

@@ -201,17 +248,19 @@
            Map<String, Object> jumpLink = new HashMap<String, Object>();

            

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

				
            // 邀请队员界面

            if (userInfoExtra != null && userInfoExtra.getInviteCode() != null

                  && userInfoExtra.getInviteCode().trim().length() > 0) {

					
               jumpLink.put("url", configService.get("invite_activation_success_url" +"?alert=ture"));

               // 邀请激活成功界面

               jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true");

            } else {



               // 激活邀请码界面

               jumpLink.put("url", configService.get("invite_activation_url"));

            }

            

            jumpBtn.put("params", jumpLink);

            jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));

            jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));



         } else if (stateActivated == 1) {

            // 显示规则

@@ -272,7 +321,6 @@
                  differentDays = 0;

               }

            }



            // 剩余天数

            Map<String, Object> remainDays = new HashMap<String, Object>();

            remainDays.put("content", "还剩" + differentDays + "天过期");