红包

yujian

2019-10-29 8032eaf875c964a3bdf7bd54bff6a728b3d93e20

红包

 fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java

@@ -53,7 +53,7 @@
        orderReward("返利奖励金", "http://img.flqapp.com/resource/money_detail/icon_order_reward.png", ""),

        repeatStatistic("重复统计返利/奖金扣除", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", ""),

        elmeFanli("饿了么返利到账", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", ""),

        redPackExchange("红包提现到余额", "http://img.flqapp.com/resource/money_detail/icon_score.png", ""),

        redPackExchange("红包提现到余额", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png", ""),

        extractAutoWX("自动提现", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),

        extractAutoWXRefund("自动提现失败", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),

        subsidy("额外补贴", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", "");


 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackExchangeServiceImpl.java

@@ -195,7 +195,7 @@
        

        // 退回红包

        try {

            redPackBalanceService.addRedPack(record.getUid(), record.getMoney(), RedPackDetailFactory.createExchange(record));

            redPackBalanceService.addRedPack(record.getUid(), record.getMoney(), RedPackDetailFactory.createExchangeReject(record));

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

            throw new RedPackExchangeException(1, "红包退回时出错");


 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java

@@ -133,7 +133,7 @@
        giveRecord.setState(RedPackGiveRecord.STATE_RECEIVE);

        // 领取人增加红包

        try {

            redPackBalanceService.addRedPack(uid, giveRecord.getAmount(), RedPackDetailFactory.createGiveOthers(giveRecord));

            redPackBalanceService.addRedPack(uid, giveRecord.getAmount(), RedPackDetailFactory.createGiveOthersReceive(giveRecord));

        } catch (Exception e) {

            throw new RedPackGiveRecordException(1, "红包领取失败");

        }        

@@ -144,6 +144,7 @@
        try {

            String identifyCode = StringUtil.Md5(RedPackDetailTypeEnum.giveOthers.name() + ":" + giveRecord.getId());

            RedPackDetail redPackDetail = redPackDetailService.getByIdentifyCode(identifyCode);

			
            RedPackDetail updateDetail = RedPackDetailFactory.createGiveOthersSucceed(redPackDetail.getId(), giveRecord);

            redPackDetailService.updateByPrimaryKeySelective(updateDetail);

        } catch (Exception e) {


 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java

@@ -192,8 +192,20 @@
                shop.setId(goods.getSellerId().toString());

                goodsInfo.setShopInfo(shop);

            }



        }

		
        if (Constant.IS_TEST) {

            // 添加标签

            List<ClientTextStyleVO> labels = goodsInfo.getLabels();

            if (labels == null) 
                labels = new ArrayList<>();

			
            labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

            goodsInfo.setLabels(labels);

        }

		
        return goodsInfo;

    }



@@ -276,6 +288,18 @@
            goodsInfo.setShopInfo(shop);

        }



        if (Constant.IS_TEST) {

            // 添加标签

            List<ClientTextStyleVO> labels = goodsInfo.getLabels();

            if (labels == null) 
                labels = new ArrayList<>();

			
            labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

            goodsInfo.setLabels(labels);

        }

		
        return goodsInfo;

    }



@@ -534,6 +558,7 @@
        if (isFreeShipping != null && isFreeShipping == 1) {

            goodsInfo.setBaoyou(true);

        }

		
        return goodsInfo;

    }



@@ -638,6 +663,18 @@
            goodsInfo.setShopInfo(shop);

        }



		
        if (Constant.IS_TEST) {

            // 添加标签

            List<ClientTextStyleVO> labels = goodsInfo.getLabels();

            if (labels == null) 
                labels = new ArrayList<>();

			
            labels.add(new ClientTextStyleVO("预售", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("爆款", "#FF2B4E"));

            labels.add(new ClientTextStyleVO("超级划算", "#FF2B4E"));

            goodsInfo.setLabels(labels);

        }

        return goodsInfo;

    }




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

@@ -668,6 +668,12 @@
            contentList = new ArrayList<>();

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

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("账户余额", COLOR_TITLE), contentList));

			
            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),

                    COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("备注", COLOR_TITLE), contentList));

			
            return new UserMsgVO("http://img.flqapp.com/resource/money_detail/icon_system.png",

                    dto.getTitle(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),

                    items);