yujian
2019-03-05 5a716cad22a28636ce3174db1f0e9ec2451e0860
邀请队员 福利券激活优化
3个文件已修改
14 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1042,7 +1042,7 @@
    
    @Transactional
    @Override
    public void activatedWelfareFreeCoupon(Long uid) {
    public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
        
        LogHelper.test("券激活:"+uid);
        if (uid == null) {
@@ -1080,7 +1080,9 @@
            
            // 消息推送
            try {
                UserInfo userInfo = userInfoService.selectByPKey(uid);
                UserInfo userInfo = new UserInfo();
                userInfo.setId(uid);
                userInfo.setNickName(fromNickName);
                
                userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
            } catch(Exception e) {
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -151,7 +151,7 @@
     * 激活福利免单券
     * @param uid
     */
    public void activatedWelfareFreeCoupon(Long uid);
    public void activatedWelfareFreeCoupon(Long uid, String from);
    /**
     * 更新券记录 ——匹配免单券
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -428,8 +428,12 @@
                                            if (threeSale.getState() != null && threeSale.getState() == true) {
                                                // 邀请成功 - 券激活生效
                                                LogHelper.test("doThreeSaleUserCouponJob-"+threeSale.getId());
                                                Long bossId = threeSale.getBoss().getId();
                                                userSystemCouponService.activatedWelfareFreeCoupon(bossId);
                                                // 下级昵称
                                                String workerNickName = threeSale.getWorker().getNickName();
                                                userSystemCouponService.activatedWelfareFreeCoupon(bossId, workerNickName);
                                            }
                                        }
                                        ThreeSaleCMQManager.getInstance()