删除老版本通知

admin

2019-07-30 a57f0c5c9e818173305df3cfb6801fef8af475c6

删除老版本通知

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -211,13 +211,12 @@


    @Resource

    private AccountMessageService accountMessageService;

	


    @Resource

    private MaskKeyService maskKeyService;

	


    @Resource

    private UserTaoLiJinDetailService userTaoLiJinDetailService;

	


    private static final String PASSWORD_MAX_ERROR = "password_max_error";

    private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -774,8 +773,8 @@
        data.put("canExtract", canExtract);

        data.put("extractErrorMsg", errorMsg);



        data.put("minMoney", minMoney);//单笔最低

        data.put("maxMoney", maxMoney);//单笔最高

        data.put("minMoney", minMoney);// 单笔最低

        data.put("maxMoney", maxMoney);// 单笔最高

        data.put("maxDayCount", maxDayCount);

        data.put("bindingAccountList", gson.toJson(filterBindingAccount(bindingAccountList)));



@@ -1082,7 +1081,7 @@
     * @param type

     * @param out

     */

    @RequestSerializableByKey(key="uid")

    @RequestSerializableByKey(key = "uid")

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

    public void extractMoneyNew(AcceptData acceptData, long uid, BigDecimal money, String vcode,

            HttpServletRequest request, int type, PrintWriter out) {

@@ -1199,7 +1198,7 @@
        } else if (etype == 111) {

            out.print(JsonUtil.loadFalseResult("更换了手机号后7天内不允许提现"));

        } else if (etype == 110) {

            out.print(JsonUtil.loadFalseResult(Constant.znxConfig.getExtractWrongMsg()));

            out.print(JsonUtil.loadFalseResult("有维权订单尚未扣款"));

        }



    }

@@ -1347,7 +1346,7 @@
        // count>0 有消息

        int count = accountMessageService.getCanOpenCount(uid);

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

		


        ThreadUtil.run(new Runnable() {

            @Override

            public void run() {

@@ -1362,8 +1361,9 @@
    }



    @RequestMapping("collectionGoods")

    public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType, PrintWriter out) {

        if (goodsType ==  null) {

    public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType,

            PrintWriter out) {

        if (goodsType == null) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

        }

        CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId, goodsType);

@@ -1372,13 +1372,13 @@
                out.print(JsonUtil.loadFalseResult(""));

                return;

            }

			


            if (goodsType == Constant.SOURCE_TYPE_JD) {

                JDGoods jdGoods = JDApiUtil.queryGoodsDetail(auctionId);

                if (jdGoods == null) {

                    jdGoods = JDApiUtil.getGoodsDetail(auctionId);

                }

				


                if (jdGoods == null) {

                    out.print(JsonUtil.loadFalseResult(1, "商品已下架"));

                } else {

@@ -1394,14 +1394,14 @@
                if (pddGoods == null) {

                    out.print(JsonUtil.loadFalseResult(1, "商品已下架"));

                    return;

                } 
                }

                try {

                    collectionGoodsV2Service.addPDDCollection(uid, pddGoods);

                    out.print(JsonUtil.loadTrueResult("收藏成功"));

                } catch (CollectionGoodsException e) {

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

                }

				


            } else {

                try {

                    TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

@@ -1439,14 +1439,15 @@
     * @param out

     */

    @RequestMapping("collectionGoodsJp")

    public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType, PrintWriter out) {

    public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType,

            PrintWriter out) {



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

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(""));

            return;

        }

		
        if (goodsType ==  null) {



        if (goodsType == null) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

        }



@@ -1454,9 +1455,9 @@


        if (find == null) {

            if (goodsType == Constant.SOURCE_TYPE_JD) {

				


            } else if (goodsType == Constant.SOURCE_TYPE_PDD) {

				


            } else {

                try {

                    TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

@@ -1565,14 +1566,16 @@
    }



    @RequestMapping("deleteCollectionGoods")

    public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType, PrintWriter out) {

    public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType,

            PrintWriter out) {

        if (type != null && type == 1) {

            clearConllectionGoods(acceptData, uid, out);

        } else {

            if (!StringUtil.isNullOrEmpty(ids)) {

                Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {

                    try {

                        collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr), goodsType);

                        collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),

                                goodsType);

                    } catch (Exception e) {

                        e.printStackTrace();

                    }

@@ -2142,18 +2145,15 @@
            if (mySettings.getNoInvitationBonus() == null) {

                mySettings.setNoInvitationBonus(0);

            }

			


            if (mySettings.getOpenSpreadHongBao() == null) {

                if(userTaoLiJinDetailService.countDetail(uid) > 0) {

                if (userTaoLiJinDetailService.countDetail(uid) > 0) {

                    mySettings.setOpenSpreadHongBao(1);

                } else {

                    mySettings.setOpenSpreadHongBao(0);

                }

            }

            data.put("moduleState", mySettings);

			
			
			


            int welfareCenterNews = 0;

            String invitCode = null;

@@ -2235,9 +2235,9 @@
        }

    }



	
    /**

     * 用户更换头像

     * 
     * @param acceptData

     * @param fileList

     * @param uid

@@ -2245,22 +2245,23 @@
     * @param out

     */

    @RequestMapping(value = "uploadPortrait")

    public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request, PrintWriter out) {

    public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request,

            PrintWriter out) {

        try {

            if (uid == null) {

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

                return;

            }

			


            if (file == null) {

                out.print(JsonUtil.loadFalseResult("上传文件不能为空"));

                return;

            }

			


            userInfoService.uploadPortrait(file, uid);

			


            out.print(JsonUtil.loadTrueResult("保存成功"));

			


        } catch (UserInfoException e) {

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

            try {

@@ -2284,9 +2285,10 @@
            }

        }

    }

	


    /**

     * 更换昵称

     * 
     * @param acceptData

     * @param nickName

     * @param uid

@@ -2307,14 +2309,14 @@
                out.print(JsonUtil.loadFalseResult("昵称过长"));

                return;

            }

			
            if(maskKeyService.examineContent(nickName)) {



            if (maskKeyService.examineContent(nickName)) {

                out.print(JsonUtil.loadFalseResult("不能包含敏感词汇"));

                return;

            }

			


            userInfoService.saveUserInfo(nickName, uid);

			


            out.print(JsonUtil.loadTrueResult("保存成功"));

        } catch (UserInfoException e) {

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


 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -25,7 +25,6 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

@@ -48,7 +47,6 @@
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

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

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

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

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

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

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

@@ -95,9 +93,6 @@


    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private UserOrderMsgNotificationService userOrderMsgNotificationService;

@@ -189,20 +184,17 @@
                                money, goodsCount, state);

                        break;

                    case HongBaoV2.TYPE_SHARE_GOODS:

                        userNotificationService.orderShareStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,

                                null, money);

					
                        userOrderMsgNotificationService.orderShareStatistic(uid, orderId,orderType, commonOrder.getPayment(),

                                money, goodsCount, state);

                        break;

                    case HongBaoV2.TYPE_YIJI:

                        userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,

                                MsgOrderDetail.STATE_FK, null, money);

					
                        userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(),

                                money, goodsCount, state);

                        break;

                    case HongBaoV2.TYPE_ERJI:

                        userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,

                                MsgOrderDetail.STATE_FK, null, money);

					
                        userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(),

                                money, goodsCount, state);

                        break;


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -54,7 +54,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

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

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

@@ -72,9 +71,6 @@


    @Resource

    private UserInfoMapper userInfoMapper;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;

@@ -391,20 +387,10 @@


            // 站内信+推送

            UserInfo user = userInfoMapper.selectByPKey(uid);

            try {

                userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                        userGoodsCount.get(uid), user.getMyHongBao(), money);

            } catch (Exception e) {

                try {

                    LogHelper.errorDetailInfo(e);

                } catch (Exception e1) {

                    e1.printStackTrace();

                }

            }



            // 新版通知

            userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),hongBaoOrder.getCommonOrder().getSourceType(),

                    userGoodsCount.get(uid), money, user.getMyHongBao());

            userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                    hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao());

        }

        // 通知免单到账

        try {

@@ -661,8 +647,8 @@
                long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                        minDate, maxDate);



                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,

                        (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,

                        (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());



                // 增加资金

                userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);

@@ -676,18 +662,9 @@
                }

            }



            // 发送推送

            try {

                // 提成到账消息通知

                userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,

                        invitemoney);

            } catch (Exception e) {

                e.printStackTrace();

            }



            // 新版通知

            userMoneyMsgNotificationService.inviteOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(), inviteGoodsCount, invitemoney,

                    userInfoMapper.selectByPKey(uid).getMyHongBao());

            userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),

                    inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());



            for (String orderId : drawBackOrders)

                taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

@@ -760,8 +737,8 @@
                long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                        CommonOrder.STATE_SX, minDate, maxDate);



                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,

                        (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                        (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

                // 添加资金

                userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -775,18 +752,9 @@
                }

            }



            // 发送推送

            try {

                // 提成到账消息通知

                userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,

                        sharemoney);

            } catch (Exception e) {

                e.printStackTrace();

            }



            // 新版通知

            userMoneyMsgNotificationService.shareOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(), shareGoodsCount, sharemoney,

                    userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

            userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

                    shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



            for (String orderId : drawBackOrders)

                taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -39,7 +39,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -62,9 +61,6 @@


    @Resource

    private UserMoneyDetailMapper userMoneyDetailMapper;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private CommonOrderMapper commonOrderMapper;

@@ -263,8 +259,6 @@
            // 新版通知

            userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId,Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,

                    userInfoMapper.selectByPKey(uid).getMyHongBao());



            userNotificationService.weiQuanFanli(uid, orderId, drawBackMoney);

        }

    }



@@ -435,11 +429,8 @@
                }

            }

            userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



            userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,drawBackMoney,

                    userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



            userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney);

        }

    }




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

@@ -30,10 +30,10 @@
import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

@@ -48,18 +48,14 @@
    private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;

    @Resource

    private UserInfoMapper userInfoMapper;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private UserAccountBindingHistoryService userAccountBindingHistoryService;



    @Resource

    private UserMoneyDetailMapper userMoneyDetailMapper;



    @Resource

    private UserMoneyService userMoneyService;

    @Resource

    private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



    public List<BindingAccount> getBindingAccountByUid(long uid) {

        return bindingAccountMapper.selectByUid(uid);

@@ -172,9 +168,7 @@


        // 扣款

        userMoneyService.subUserMoney(uid, money, userMoneyDetail);



        userNotificationService.alipayAccountValidRight(uid, money, account);



        userMoneyMsgNotificationService.alipayAccountValid(history);

    }



    private void transferAlipayWithVerify(String account, String name)


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

@@ -58,12 +58,10 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;



import net.sf.json.JSONObject;

@@ -109,9 +107,6 @@


    @Resource

    private PushService pushService;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private UserMoneyDetailMapper userMoneyDetailMapper;

@@ -224,13 +219,6 @@
        extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);

        // 新版资金详情



        try {

            userNotificationService.extractWrong(user.getId(), find,

                    TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));

        } catch (Exception e) {

            e.printStackTrace();

        }



        // 新版通知

        userMoneyMsgNotificationService.extractFail(find, reason);

    }

@@ -303,7 +291,6 @@
        // 减去账户资金

        userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);



        userNotificationService.extractApply(extract.getUserInfo().getId());

        // 添加新版通知

        userMoneyMsgNotificationService.extractApplay(extract);



@@ -470,10 +457,6 @@
            userMoneyService.addUserMoney(user.getId(), extract.getMoney(), userMoneyDetail);



            try {



                userNotificationService.extractTransferFail(user.getId(),

                        TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



                LogHelper.userInfo("支付宝转账失败:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

                        + extract.getName() + ",所转金额：" + extract.getMoney() + ",失败原因" + extract.getReason() + "]");



@@ -511,9 +494,6 @@
        extractMapper.updateByPrimaryKeySelective(updateExtract);



        try {

            userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,

                    TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



            LogHelper.userInfo("支付宝转账成功:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

                    + extract.getName() + ",所转金额：" + extract.getMoney() + "]");

        } catch (Exception e) {


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

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java

File was deleted