Merge remote-tracking branch 'origin/div' into div

admin

2020-04-26 91d0826fffcc79d5869b15fffe4392399d23f0b1

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/msg/UserAccountMsgNotificationServiceImpl.java

@@ -47,8 +47,8 @@
    }

    

    @Override

    public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2) {

        saveDetail( MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1,targetNum2));

    public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2, boolean teamPass) {

        saveDetail( MsgAccountDetailFactory.vipPreUpgrade(uid, originalName, upName, days, targetNum1,targetNum2, teamPass));

    }

    

    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java

@@ -171,7 +171,7 @@
        // 验证是否满足升级高级会员

        if (doneZiGou >= limitZiGou7) {

            try {

                twoProcess(uid, limitZiGou7, null);

                twoProcess(uid, limitZiGou7, null, false);

            } catch (UserVIPPreInfoException e) {



            }

@@ -235,7 +235,7 @@
        // 验证是否满足升级高级会员

        if (doneFirst >= limitFirst7 && doneSecond >= limitSecond7) {

            try {

                twoProcess(uid, limitFirst7, limitSecond7);

                twoProcess(uid, limitFirst7, limitSecond7, true);

            } catch (UserVIPPreInfoException e) {



            }

@@ -252,12 +252,12 @@
     * @param secondTeam

     */

    @Transactional(rollbackFor = Exception.class)

    private void twoProcess(Long uid, long limit1, Long limit2) throws UserVIPPreInfoException {

    private void twoProcess(Long uid, long limit1, Long limit2, boolean teamPass) throws UserVIPPreInfoException {

        String item = null;

        if (limit2 == null) {

            item = "返利+分享订单";

        } else {

        if (teamPass) {

            item = "直接+间接粉丝";

        } else {

            item = "返利+分享订单";

        }



        Date upgradeTime = new Date();

@@ -285,7 +285,7 @@
                registerTime = userInfoRegister.getCreateTime();

            }

            int daysBetween = TimeUtil.getDayDifferenceCount(registerTime, upgradeTime);

            userAccountMsgNotificationService.vipPreUpgrade(uid, "快省达人", "高级会员", daysBetween, limit1, limit2);

            userAccountMsgNotificationService.vipPreUpgrade(uid, "快省达人", "高级会员", daysBetween, limit1, limit2, teamPass);



            // 直接粉丝升级提醒

            ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java

@@ -49,8 +49,9 @@
     * @param days

     * @param targetNum1

     * @param targetNum2

     * @param teamPass true通过队员验证升级

     */

    public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2);

    public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2, boolean teamPass);



    /**

     * 超级会员升级成功


 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java

@@ -199,15 +199,15 @@
     * @param beizu

     * @return

     */

    public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, 
             Long targetNum2) {

    public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days,  long targetNum1, 
             Long targetNum2, boolean teamPass) {

        if (uid == null || originalName == null || upName == null)

            return null;

        

        List<CommonMsgItemVO> listMsg = new ArrayList<>();

        List<ClientTextStyleVO> contentList = new ArrayList<>();

        contentList.add(new ClientTextStyleVO("恭喜你！有效", ClientTextStyleVO.COLOR_CONTENT));

        if (targetNum2 == null) {

        if (teamPass) {

            contentList.add(new ClientTextStyleVO("直接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));

            contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

            contentList.add(new ClientTextStyleVO("人，有效间接粉丝已达", ClientTextStyleVO.COLOR_CONTENT));