yujian
2019-01-30 878a63654c6909e8122115b89dac50c64375490f
队员失效删除通知消息
4个文件已修改
57 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
@@ -35,6 +35,14 @@
     */
    int deleteExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
    
    /**
     * 失效
     * @param bossId
     * @param workerId
     * @return
     */
    List<ThreeSale> getExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
    /**
     * 查询一度队员集合
fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml
@@ -433,4 +433,8 @@
      LIMIT 1
    </select>
    
    <select id="getExpireRecord" resultMap="BaseResultMap">
         SELECT * FROM `yeshi_ec_threesale`
         WHERE expire = 1 AND boss_id = #{bossId} AND worker_id = #{workerId}
    </select>
</mapper>
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -10,9 +10,6 @@
import javax.annotation.Resource;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
@@ -32,10 +29,14 @@
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@Service
public class ThreeSaleSerivceImpl implements ThreeSaleSerivce {
@@ -60,6 +61,11 @@
    
    @Resource
    private UserInviteMsgNotificationService userInviteMsgNotificationService;
    @Resource
    private  MsgInviteDetailService msgInviteDetailService;
    public UserInfo getBoss(final long uid) {
        return (UserInfo) dao.excute(new HibernateCallback<UserInfo>() {
@@ -113,8 +119,15 @@
            threeSale.setWorker(inviteeUser);
            threeSaleMapper.insertSelective(threeSale);
            
            // 删除已失效关系
            threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
            List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), inviteeUser.getId());
            if (listExpire != null && listExpire.size() > 0) {
                // 删除失效
                for (ThreeSale saleExpire: listExpire) {
                    msgInviteDetailService.deleteByThreeSale(saleExpire);
                }
                // 删除已失效关系
                threeSaleMapper.deleteExpireRecord(inviter.getId(), inviteeUser.getId());
            }
            
            //创建通知
            userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
@@ -148,6 +161,16 @@
                        
                        // 删除已失效关系
                        threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
                        List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
                        if (listExpire != null && listExpire.size() > 0) {
                            // 删除历史通知
                            for (ThreeSale saleExpire: listExpire) {
                                msgInviteDetailService.deleteByThreeSale(saleExpire);
                            }
                            // 删除已失效关系
                            threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
                        }
                        
                        userInviteMsgNotificationService.inviteScan(inviter.getId(), threeSale);
                        // threeSaleSerivce.bind(invitee, inviter);
@@ -632,9 +655,19 @@
            threeSale.setUpdateTime(java.lang.System.currentTimeMillis());
            threeSaleMapper.insertSelective(threeSale);
            
        }
        List<ThreeSale> listExpire = threeSaleMapper.getExpireRecord(inviter.getId(), invitee.getId());
        if (listExpire != null && listExpire.size() > 0) {
            // 删除历史通知
            for (ThreeSale saleExpire: listExpire) {
                msgInviteDetailService.deleteByThreeSale(saleExpire);
            }
            // 删除已失效关系
            threeSaleMapper.deleteExpireRecord(inviter.getId(), invitee.getId());
        }
        // 邀请消息
        userInviteMsgNotificationService.inviteSuccess(inviter.getId(), threeSale);
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java
@@ -54,7 +54,7 @@
    public UserInfoExtra getUserInfoExtra(Long uid);
    /**
     * 获取用户邀请码
     * 获取用户邀请码,若没有且存在队员关系 那么自动生成邀请码
     * @param uid
     * @return
     * @throws UserInfoExtraException