admin
2018-12-18 6a04b2680d414714ce922f7d694224ff65202c67
删除HongBaoMessage相关代码
7个文件已修改
4个文件已删除
266 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/hongbao/HongBaoMessageDao.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoMessage.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoMessageServiceImpl.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoMessageService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -21,6 +21,10 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.wx.WXUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -64,7 +68,6 @@
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
@@ -82,10 +85,6 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.wx.WXUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -144,9 +143,6 @@
    @Resource
    private UserInfoService userInfoService;
    @Resource
    private HongBaoMessageService hongBaoMessageService;
    @Resource
    private ThreeSaleRankService threeSaleRankService;
@@ -618,7 +614,8 @@
        List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
        BigDecimal proportion = hongBaoManageService.getFanLiRate();
        for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {
            list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion.toString(), ""));
            list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),
                    proportion.toString(), ""));
        }
        Gson gson = JsonUtil.getApiCommonGson();
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -31,7 +31,6 @@
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -94,8 +93,7 @@
    @Resource
    private SystemService systemService;
    @Resource
    private HongBaoMessageService hongBaoMessageService;
    @Resource
    private ShamUserService shamUserService;
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -40,7 +40,6 @@
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
import com.yeshi.fanli.entity.bus.user.HongBaoMessage;
import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.MoneyRecord;
import com.yeshi.fanli.entity.bus.user.OrderItem;
@@ -67,7 +66,6 @@
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
@@ -133,9 +131,6 @@
    @Resource
    private SystemService systemService;
    @Resource
    private HongBaoMessageService hongBaoMessageService;
    @Resource
    private ShamUserService shamUserService;
@@ -1334,14 +1329,6 @@
        data.put("hongBao", GsonUtil.toJsonExpose(hbx));
        out.print(JsonUtil.loadTrueResult(data));
        LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "] 打开红包[id=" + hid + "]成功!");
    }
    @RequestMapping(value = "getHongBaoMessages", method = RequestMethod.POST)
    public void getHongBaoMessages(AcceptData acceptData, PrintWriter out) {
        List<HongBaoMessage> list = shamUserService.getManyData();
        JSONObject data = new JSONObject();
        data.put("list", list);
        out.print(JsonUtil.loadTrueResult(data));
    }
    @RequestMapping("findLostOrder")
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import javax.annotation.Resource;
@@ -32,7 +31,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -87,9 +85,6 @@
    @Resource
    private XcxMiniControllerUtil xcxMiniControllerUtil;
    @Resource
    private HongBaoMessageService hongBaoMessageService;
    @Resource
    private ShamUserService shamUserService;
fanli/src/main/java/com/yeshi/fanli/dao/hongbao/HongBaoMessageDao.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoMessage.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoMessageServiceImpl.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ShamUserServiceImpl.java
@@ -1,15 +1,11 @@
package com.yeshi.fanli.service.impl.user;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javax.annotation.Resource;
import net.sf.json.JSONArray;
import org.hibernate.HibernateException;
import org.hibernate.SQLQuery;
@@ -20,13 +16,12 @@
import com.yeshi.fanli.dao.mybatis.user.ShamUserMapper;
import com.yeshi.fanli.dao.user.ShamUserDao;
import com.yeshi.fanli.entity.bus.user.HongBaoMessage;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
import net.sf.json.JSONArray;
@Service
public class ShamUserServiceImpl implements ShamUserService {
@@ -66,35 +61,7 @@
        });
    }
    
    @SuppressWarnings("unchecked")
    public List<HongBaoMessage> getManyData() {
        
        return (List<HongBaoMessage>) dao.excute(new HibernateCallback<List<HongBaoMessage>>() {
            public List<HongBaoMessage> doInHibernate(Session session)
                    throws HibernateException {
                SQLQuery query = session.createSQLQuery("SELECT * FROM yeshi_ec_sham_user ORDER BY RAND()").addEntity(ShamUser.class);
                query.setFirstResult(0);
                query.setMaxResults(Constant.PAGE_SIZE);
                List<ShamUser> list = query.list();
                List<HongBaoMessage> hbmList=new ArrayList<HongBaoMessage>();
                if(list.size()>0){
                    HongBaoMessage hbm = null;
                    DecimalFormat df = new DecimalFormat("######0.00");
                    for (ShamUser shamUser : list) {
                        hbm=new HongBaoMessage();
                        hbm.setName(shamUser.getName());
                        hbm.setPicUrl(shamUser.getPicUrl());
                        double random = (Math.random()+0.01)*20;
                        String format = df.format(random);
                        hbm.setContent("悄悄领取了"+format+"元红包");
                        hbmList.add(hbm);
                    }
                }
                return hbmList;
            }
        });
    }
    @Transactional
    public void delete(final long id) {
        dao.excute(new HibernateCallback() {
@@ -106,53 +73,7 @@
        });
    }
    @SuppressWarnings("unchecked")
    public List<HongBaoMessage> findShamThreeSaleInfo() {
        return (List<HongBaoMessage>) dao.excute(new HibernateCallback<List<HongBaoMessage>>() {
            public List<HongBaoMessage> doInHibernate(Session session)
                    throws HibernateException {
                SQLQuery query = session.createSQLQuery("SELECT * FROM yeshi_ec_sham_user ORDER BY RAND()").addEntity(ShamUser.class);
                query.setFirstResult(0);
                query.setMaxResults(5);
                List<ShamUser> list = query.list();
                List<HongBaoMessage> hbmList=new ArrayList<HongBaoMessage>();
                if(list.size()>0){
                    HongBaoMessage hbm = null;
                    DecimalFormat df = new DecimalFormat("######0.00");
                    for (ShamUser shamUser : list) {
                        String name = shamUser.getName();
                        if(name != null){
                            if(name.length() > 2){
                                name = Utils.getStarString(name,1,name.length()-1);
                            }else{
                                name = name.substring(0, 1)+"**"+name.substring(name.length()-1);
                            }
                        }
                        shamUser.setName(name);
                        hbm=new HongBaoMessage();
                        hbm.setName(shamUser.getName());
                        hbm.setPicUrl(shamUser.getPicUrl());
                        double random = (Math.random()+100)*10;
                        String format = df.format(random);
                        hbm.setContent(format+"");
                        hbmList.add(hbm);
                    }
                }
                Collections.sort(hbmList, new Comparator<HongBaoMessage>() {
                    public int compare(HongBaoMessage o1, HongBaoMessage o2) {
                        double o1m = Double.parseDouble(o1.getContent());
                        double o2m = Double.parseDouble(o2.getContent());
                        double m=o1m-o2m;
                        return m<0?1:-1;
                    }
                });
                return hbmList;
            }
        });
    }
    @Override
    public int deleteByPrimaryKey(Long id) {
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoMessageService.java
File was deleted
fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java
@@ -3,7 +3,6 @@
import java.math.BigDecimal;
import java.util.List;
import com.yeshi.fanli.entity.bus.user.HongBaoMessage;
import com.yeshi.fanli.entity.bus.user.ShamUser;
/**
@@ -18,11 +17,9 @@
    public List<ShamUser> getAll();
    public List<HongBaoMessage> getManyData();
    public void delete(long id);
    public List<HongBaoMessage> findShamThreeSaleInfo();
    public List<ShamUser> findShamUserList(int sum);
    
fanli/src/main/java/com/yeshi/fanli/util/ShamHongBaoUtil.java
@@ -2,7 +2,6 @@
import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -15,10 +14,8 @@
import org.apache.commons.httpclient.methods.PostMethod;
import org.springframework.stereotype.Component;
import com.yeshi.fanli.entity.bus.user.HongBaoMessage;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -37,9 +34,6 @@
    
    @Resource
    private UserInfoService userInfoService;
    @Resource
    private HongBaoMessageService hongBaoMessageService;
    
    public void addShamUserInfo(){
        List<ShamUser> list =shamUserService.getAll();
@@ -70,23 +64,6 @@
            e.printStackTrace();
        }
        
    }
    private void addHongBaoMessage(){
        List<ShamUser> all = shamUserService.getAll();
        List<HongBaoMessage> list = new ArrayList<HongBaoMessage>();
        HongBaoMessage message;
        DecimalFormat df = new DecimalFormat("######0.00");
        for (ShamUser shamUser : all) {
            message = new HongBaoMessage();
            message.setName(shamUser.getName());
            message.setPicUrl(shamUser.getPicUrl());
            double random = (Math.random()+0.01)*20;
            String format = df.format(random);
            message.setContent("悄悄领取了"+format+"元红包");
            list.add(message);
        }
        hongBaoMessageService.add(list);
    }
    
    public void addShamUser(String pid) throws Exception{
@@ -135,7 +112,11 @@
    }
    private static HttpMethod getPostMethod(String pid) {
         PostMethod post = new PostMethod( "http://cgi.find.qq.com/qqfind/buddy/search_v3" ); //recommendDetails voteGoods recommendReplys makePublic replys
        PostMethod post = new PostMethod("http://cgi.find.qq.com/qqfind/buddy/search_v3"); // recommendDetails
                                                                                            // voteGoods
                                                                                            // recommendReplys
                                                                                            // makePublic
                                                                                            // replys
         NameValuePair num = new NameValuePair( "num" , "100" );
         NameValuePair page = new NameValuePair( "page" , "0" );
         NameValuePair sessionid = new NameValuePair( "sessionid" , "0" );
@@ -153,9 +134,10 @@
         NameValuePair hdistrict = new NameValuePair( "hdistrict" , "0" );
         NameValuePair online = new NameValuePair( "online" , "0" );
         NameValuePair ldw = new NameValuePair( "ldw" , "814539287" );
         post.setRequestHeader("Cookie", "RK=7dVSTqdaSf; pt2gguin=o0424539852; ptisp=ctc; ptcz=555762bb1a6cef860451fe47677c82eaf80a1388eee045b8cf2d546ed1c96534; _qpsvr_localtk=tk70; pgv_info=ssid=s852802188; pgv_pvid=9584824304; uin=o424539852; skey=Z9PWyiIOuI; itkn=2002088896");
         post.setRequestBody( new NameValuePair[] {num,page,sessionid,agerg,sex,firston,video,country,province,city,
                 district,hcountry,hprovince,hcity,hdistrict,online,ldw});
        post.setRequestHeader("Cookie",
                "RK=7dVSTqdaSf; pt2gguin=o0424539852; ptisp=ctc; ptcz=555762bb1a6cef860451fe47677c82eaf80a1388eee045b8cf2d546ed1c96534; _qpsvr_localtk=tk70; pgv_info=ssid=s852802188; pgv_pvid=9584824304; uin=o424539852; skey=Z9PWyiIOuI; itkn=2002088896");
        post.setRequestBody(new NameValuePair[] { num, page, sessionid, agerg, sex, firston, video, country, province,
                city, district, hcountry, hprovince, hcity, hdistrict, online, ldw });
        return post;
    }