双12活动添加,邀请码发布修改，爬单新规则添加

admin

2019-12-06 cd637932a970e7935b17d41568fe89c92775bccc

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

@@ -26,7 +26,6 @@
import com.aliyun.openservices.ons.api.transaction.LocalTransactionExecuter;

import com.aliyun.openservices.ons.api.transaction.TransactionProducer;

import com.aliyun.openservices.ons.api.transaction.TransactionStatus;

import com.google.gson.Gson;

import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;

import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;

import com.yeshi.fanli.dto.mq.user.body.UserSystemCouponUseMQMsg;

@@ -75,6 +74,7 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -179,6 +179,9 @@
   

   @Resource(name = "producer")

   private Producer producer;

	
   @Resource

   private UserVIPInfoService userVIPInfoService;



   



@@ -1877,18 +1880,20 @@
               jumpBtn.put("params", jumpLink);

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

            } else if (CouponTypeEnum.rebatePercentCoupon == type) {

               // 可使用、 可赠送

               userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);



               // 订单列表

               jumpLink.put("state", "2"); // 已收货

               jumpLink.put("showNav", false); // 不显示上方统计信息

               jumpLink.put("type", "1"); // 返利订单

               jumpLink.put("title", "返利订单"); // 标题名

               jumpLink.put("goodsType", "0"); // 订单来源

               jumpBtn = new HashMap<String, Object>();

               jumpBtn.put("params", jumpLink);

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

               if (userVIPInfoService.isVIP(uid)) { // 会员只可赠送

                  userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);

               } else {// 可使用 可赠送

                  userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);

						 
                  jumpLink.put("state", "2"); // 已收货

                  jumpLink.put("showNav", false); // 不显示上方统计信息

                  jumpLink.put("type", "1"); // 返利订单

                  jumpLink.put("title", "返利订单"); // 标题名

                  jumpLink.put("goodsType", "0"); // 订单来源

                  jumpBtn = new HashMap<String, Object>();

                  jumpBtn.put("params", jumpLink);

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

               }

            }

         } else if (UserSystemCoupon.STATE_IN_USE == state && give) {

            userCouponVO.setCouponEffect("赠送中");