邀请判断修改

admin

2019-03-05 fcd45222f5577403ae7b23c20323fb2cce75a553

邀请判断修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -1713,7 +1713,7 @@
        JSONObject invite = new JSONObject();

        JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");

        invite.put("jumpDetail", jumpDetail);

        invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");

        invite.put("picture", configService.get("home_invite_banner"));



        if ("ios".equalsIgnoreCase(acceptData.getPlatform())

                && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {


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

@@ -425,7 +425,7 @@
        String wxUnionId = weiXinUser.getUnionid();

        UserInfo find = getUserByLoginTypeAndOpenId(Constant.WEIXIN, wxUnionId, Constant.APPID);



        if (find == null) {

        if (find == null||find.getState()==UserInfo.STATE_DELETE||find.getState()==UserInfo.STATE_DELETE_OUT_OF_DATE) {

            find = new UserInfo();

            find.setAppId(Constant.APPID);

            find.setWxUnionId(weiXinUser.getUnionid());


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

@@ -1065,9 +1065,11 @@
        

        for (UserSystemCoupon userSystemCoupon: list) {

            // 激活

            userSystemCoupon.setStateActivated(1);

            userSystemCoupon.setUpdateTime(new Date());

            userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);

            UserSystemCoupon update=new UserSystemCoupon();

            update.setId(userSystemCoupon.getId());

            update.setStateActivated(1);

            update.setUpdateTime(new Date());

            userSystemCouponMapper.updateByPrimaryKeySelective(update);

            

            Integer state = userSystemCoupon.getState();

            if (UserSystemCoupon.STATE_OVERDUE == state) {