Merge remote-tracking branch 'origin/master'

admin

2018-12-13 31e20de104e0428ca51c91609c18cccb64229e02

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java

@@ -2,6 +2,7 @@


import java.io.PrintWriter;

import java.math.BigDecimal;

import java.text.DecimalFormat;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

@@ -24,6 +25,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

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

import com.yeshi.fanli.util.annotation.RequestNoSignValidate;



import org.yeshi.utils.JsonUtil;



@Controller

@@ -54,6 +56,8 @@
                return;

            }

            

            DecimalFormat format = new DecimalFormat("0.00");

			
            List<RankInfo> rankingsList = new ArrayList<RankInfo>();

            for (UserRankings userRankings: userRankingsList) {

                

@@ -61,7 +65,9 @@
                rankInfo.nickName = userRankings.getNickName();

                rankInfo.portrait = userRankings.getPortrait();

                rankInfo.showId = userRankings.getShowId();

                rankInfo.reward = userRankings.getTradeReward();

				
                rankInfo.reward = format.format(userRankings.getTradeReward());

				
                rankingsList.add(rankInfo);

            }



@@ -94,7 +100,8 @@
                        if (userInfo != null) {

                            

                            RankInfo rankInfo = new RankInfo();

                            rankInfo.reward = rewardMoney;

							
                            rankInfo.reward = format.format(rewardMoney);

                            rankInfo.nickName =  userInfo.getNickName();

                            rankInfo.portrait = userInfo.getPortrait();

                            rankInfo.showId = userRankings.getShowId();

@@ -156,6 +163,8 @@
                return;

            }

            

            DecimalFormat format = new DecimalFormat("0.00");

			
            List<RankInfo> rankingsList = new ArrayList<RankInfo>();

            for (UserRankings userRankings: userRankingsList) {

                

@@ -163,7 +172,9 @@
                rankInfo.nickName = userRankings.getNickName();

                rankInfo.portrait = userRankings.getPortrait();

                rankInfo.showId = userRankings.getShowId();

                rankInfo.reward = userRankings.getTradeReward();

				
                rankInfo.reward = format.format(userRankings.getTradeReward());

				
                rankingsList.add(rankInfo);

            }

            

@@ -201,6 +212,8 @@
                return;

            }

            

            DecimalFormat format = new DecimalFormat("0.00");

			
            List<RankInfo> rankingsList = new ArrayList<RankInfo>();

            for (UserRankings userRankings: userRankingsList) {

                

@@ -208,7 +221,7 @@
                rankInfo.nickName = userRankings.getNickName();

                rankInfo.portrait = userRankings.getPortrait();

                rankInfo.showId = userRankings.getShowId();

                rankInfo.reward = userRankings.getShareReward();

                rankInfo.reward = format.format(userRankings.getShareReward());

                rankingsList.add(rankInfo);

            }

            

@@ -227,20 +240,6 @@
        }

    }



    public static void main(String[] args) {

//        Calendar calendar = Calendar.getInstance();

//        calendar.setTime(new Date());//把当前时间赋给日历

//        calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天

//		
//        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); //设置时间格式

//        String defaultStartDate = sdf.format(calendar.getTime());    //格式化前一天

//        System.out.println(defaultStartDate);

//		
        String uid = "12364";

        String index = uid.substring(0, 1);

        String end = uid.substring(uid.length()-1, uid.length());

        System.out.println(index+ "***" + end);

    }

    

    public List<RankInfo> listSort (List<RankInfo> list) {



@@ -269,5 +268,5 @@
    public String nickName;// 昵称

    public String portrait; // 头像

    public String showId; // 展示id

    public BigDecimal reward;// 奖金

    public String reward;// 奖金

}


 fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java

@@ -80,6 +80,7 @@
        }

    }



    @CacheEvict(value = "config", allEntries = true)

    public void update(Config config) {

        config.setCreatetime(new Date().getTime() + "");

        configDao.update(config);


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

@@ -655,9 +655,6 @@
                                    goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());

                                

                                    goodsState = 0;

                                    if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {

                                        goodsBrief.setState(1); // 已抢光

                                    }

                                    

                                    CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);

                                    upadeteCommonGoods.setState(goodsState);

@@ -677,6 +674,10 @@


                if (goodsBrief == null) {

                    goodsBrief = TaoBaoUtil.convert(commonGoods);

                } 
				
                if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {

                    goodsBrief.setState(1); // 已抢光

                } 



                // 改变图片尺寸

@@ -725,6 +726,9 @@
            throw new UserShareGoodsRecordException(1, "分享记录不存在");

        }

        

        shareRecord.setShareState(1);// 分享生效

        updateByPrimaryKeySelective(shareRecord);

        // 更新商品为已分享

        userGoodsStorageService.updateShareState(shareId);

    }

}


 fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java

@@ -711,34 +711,27 @@
//            g2d.drawString("返利券提醒您", 312, 1118 + 40);



            g2d.setColor(new Color(102, 102, 102));

            g2d.drawString("长按识别二维码免费领券", 312, 1142);

            g2d.drawString("长按识别二维码免费领券", 312, 1150);

            

            g2d.setColor(new Color(102, 102, 102));

            g2d.drawString("共", 1000, 1142);

            g2d.drawString("共", 1000, 1150);

            

            

            g2d.setColor(new Color(229, 0, 93));

            g2d.drawString(goodsList.size()+"", 1055, 1142);

            g2d.drawString(goodsList.size()+"", 1055, 1150);

            

            

            g2d.setColor(new Color(102, 102, 102));

            g2d.drawString("个商品", 1090, 1142);

            g2d.drawString("个商品", 1090, 1150);

            

            // 提示语

            BufferedImage tips = ImageIO

                    .read(ImageUtil.class.getClassLoader().getResourceAsStream("image/share/tips1.png"));

            tips = zoomInImage(tips,850, 65);

            //g2d.setColor(new Color(255, 250, 250));

            g2d.drawImage(tips, 312,1180, null);



            g2d.drawImage(tips, 312,1190, null);



            g2d.dispose();



            // OutputStream out = new ByteArrayOutputStream(); new

            // FileOutputStream(new File(targetPath));

            // ImageIO.write(targetImg, "JPEG", out);

            // out.flush();

            // out.close();

            ByteArrayOutputStream aos = new ByteArrayOutputStream();

            ImageIO.write(targetImg, "JPEG", aos);

            InputStream is = new ByteArrayInputStream(aos.toByteArray());