修复提现验证问题

Administrator

2018-11-30 2c479a66e7cb1df74f50ed798a2c3e2a0bc15322

修复提现验证问题

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -102,23 +102,16 @@
    @Resource

    private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;

    

	
	
	
	
    private final static String TODAY = "1";

    private final static String THREE = "2";

    private final static String AWEEK = "3";



    @RequestMapping(value = "getExtractList", method = RequestMethod.POST)

    public void getExtractList(int pageIndex, PrintWriter out) {

        List<Extract> extractList = extractService

                .getExtractList(pageIndex - 1);

        List<Extract> extractList = extractService.getExtractList(pageIndex - 1);

        int count = extractService.getCount();

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count

                / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count,

                totalPage);

        int totalPage = count % Constant.PAGE_SIZE == 0 ? count / Constant.PAGE_SIZE : count / Constant.PAGE_SIZE + 1;

        PageEntity pe = new PageEntity(pageIndex, Constant.PAGE_SIZE, count, totalPage);

        JSONObject data = new JSONObject();

        data.put("pe", pe);

        data.put("extractList", extractList);

@@ -139,8 +132,7 @@
        

        //TODO 需要邮箱发送短信验证

        

        AdminUser admin = (AdminUser) request.getSession().getAttribute(

                Constant.SESSION_ADMIN);

        AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);

        

        Integer integer = extractService.passExtract(id, admin);

        Extract extract = extractService.getExtractById(id);

@@ -148,20 +140,20 @@


        if (integer == null) {

            out.print(JsonUtil.loadTrueResult("通过"));

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]"

                    + admin.getName() + "通过了[id=" + id + "]的提现申请!"); // 同意之后成功

            LogHelper

                    .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "通过了[id=" + id + "]的提现申请!"); // 同意之后成功

        } else if (integer == 1) {

            

            out.print(JsonUtil.loadFalseResult("不存在该对象")); // 同意之后失败

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 同意提现id=" + id + "的提现申请不存在");

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 同意提现id=" + id + "的提现申请不存在");

            String title = "你的提现申请被驳回";

            String content = "非常遗憾，你的提现申请被驳回。我们通过核对发现你的账目明细有误，我们会在审计完成之后给你发通知消息。如有疑问请联系客服。";

            // xingePushController.pushSystemZnx(uid, title, content, out);

        } else {

            

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 同意提现id=" + id + "的提现申请状态异常");

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 同意提现id=" + id + "的提现申请状态异常");

            out.print(JsonUtil.loadFalseResult("该状态不等于不为初始状态"));

            String title = "你的提现申请不成功";

            String content = "请确保你的提现账户的隐私设置为 允许邮箱、手机号、会员名找到我。否则无法成功完成转账。如有疑问请联系客服。";

@@ -174,7 +166,8 @@
     * 方法说明: 通过提现请求  可jsonP方式

     * 

     * @param id

     * @param code 验证码

     * @param code

     *            验证码

     * @param out

     * @param request

     */

@@ -198,30 +191,27 @@
        /* 允许提现 操作  */

        Integer integer = extractService.passExtract(id, admin);

        

		
        Extract extract = extractService.getExtractById(id);

        long uid = extract.getUserInfo().getId();



        if (integer == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("通过"));

            

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]"

                    + admin.getName() + "通过了[id=" + id + "]的提现申请!"); // 同意之后成功

            LogHelper

                    .userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "通过了[id=" + id + "]的提现申请!"); // 同意之后成功

        } else if (integer == 1) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("不存在该对象"));

            

			
            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 同意提现id=" + id + "的提现申请不存在");

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 同意提现id=" + id + "的提现申请不存在");

            String title = "你的提现申请被驳回";

            String content = "非常遗憾，你的提现申请被驳回。我们通过核对发现你的账目明细有误，我们会在审计完成之后给你发通知消息。如有疑问请联系客服。";

            // xingePushController.pushSystemZnx(uid, title, content, out);

        } else {

            JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("该状态不等于不为初始状态"));

            

			
            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 同意提现id=" + id + "的提现申请状态异常");

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 同意提现id=" + id + "的提现申请状态异常");

            String title = "你的提现申请不成功";

            String content = "请确保你的提现账户的隐私设置为 允许邮箱、手机号、会员名找到我。否则无法成功完成转账。如有疑问请联系客服。";

            // xingePushController.pushSystemZnx(uid, title, content, out);

@@ -240,10 +230,8 @@
     * @param request

     */

    @RequestMapping(value = "rejectExtract", method = RequestMethod.POST)

    public void rejectExtract(String callback ,long id, String reason, PrintWriter out,

            HttpServletRequest request) {

        AdminUser admin = (AdminUser) request.getSession().getAttribute(

                Constant.SESSION_ADMIN);

    public void rejectExtract(String callback, long id, String reason, PrintWriter out, HttpServletRequest request) {

        AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);

        

        Extract extract = extractService.getExtractById(id);

        long uid = extract.getUserInfo().getId();

@@ -254,21 +242,20 @@
            

            // 调用推送站内信给用户

            out.print(JsonUtil.loadTrueResult("拒绝"));

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]"

                    + admin.getName() + "拒绝了[id=" + id + "]的提现申请!拒绝原因是"

                    + reason);

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "拒绝了[id=" + id

                    + "]的提现申请!拒绝原因是" + reason);



            String title = "你的提现申请被驳回";

            String content = "非常遗憾，你的提现申请被驳回。我们通过核对发现你的账目明细有误，我们会在审计完成之后给你发通知消息。如有疑问请联系客服。";

            // xingePushController.pushSystemZnx(uid, title, content, out);

        } catch (ObjectStateException e) {

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 拒绝提现id=" + id + "的提现申请状态异常!"); //

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 拒绝提现id=" + id + "的提现申请状态异常!"); //

            

            out.print(JsonUtil.loadFalseResult(e.getMessage()));

        } catch (NotExistObjectException e) {

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 拒绝提现id=" + id + "的提现申请不存在!");

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 拒绝提现id=" + id + "的提现申请不存在!");

            

            out.print(JsonUtil.loadFalseResult(e.getMessage()));

        }

@@ -294,14 +281,12 @@
            return;

        } 

        

		
        /* 检验是否通过验证  */

        String codeType = (String)request.getSession().getAttribute(Constant.SESSION_EXTRACT_VERIFY_RESULT);

        if (!"1".equals(codeType)) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(3,"邮箱验证未通过"));

            return;

        }

		
        

        /* 拒绝提现 操作  */



@@ -314,21 +299,21 @@
            

            // 调用推送站内信给用户

            //out.print(JsonUtil.loadTrueResult("拒绝"));

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]"+ admin.getName() + 
                    "拒绝了[id=" + id + "]的提现申请!拒绝原因是"    + reason);

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]" + admin.getName() + "拒绝了[id=" + id

                    + "]的提现申请!拒绝原因是" + reason);



            String title = "你的提现申请被驳回";

            String content = "非常遗憾，你的提现申请被驳回。我们通过核对发现你的账目明细有误，我们会在审计完成之后给你发通知消息。如有疑问请联系客服。";

            // xingePushController.pushSystemZnx(uid, title, content, out);

        } catch (ObjectStateException e) {

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 拒绝提现id=" + id + "的提现申请状态异常!"); //

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 拒绝提现id=" + id + "的提现申请状态异常!"); //

            

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));

            

        } catch (NotExistObjectException e) {

            LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "][管理员:"

                    + admin.getName() + "] 拒绝提现id=" + id + "的提现申请不存在!");

            LogHelper.userInfo(

                    "[ip:" + IPUtil.getRemotIP(request) + "][管理员:" + admin.getName() + "] 拒绝提现id=" + id + "的提现申请不存在!");

            

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMessage()));

        }

@@ -345,6 +330,14 @@
    public void checkExtract(String uid, PrintWriter out) {



        JSONObject data = new JSONObject();



        // 已到账的红包

        int count = hongBaoService.getCount(HongBao.STATE_YILINGQU);

        if (count == 0) {

            data.put("code", "1");

            out.print(data);

            return;

        }



        List<Integer> checked = extractService.checkExtract(uid);

        if (checked != null && checked.size() > 0) {

@@ -394,8 +387,8 @@
     * @param out

     */

    @RequestMapping(value = "getFinishRecordList")

    public void getFinishRecordList(String callback, Integer pageIndex,

            String key, String startTime, String endTime, PrintWriter out) {

    public void getFinishRecordList(String callback, Integer pageIndex, String key, String startTime, String endTime,

            PrintWriter out) {



        try {



@@ -423,8 +416,8 @@
            

            int pageSize = Constant.PAGE_SIZE;



            List<ExtractAuditRecord> auditList = extractAuditRecordService.getList(pageIndex, 
                    pageSize, key, startTime, endTime);

            List<ExtractAuditRecord> auditList = extractAuditRecordService.getList(pageIndex, pageSize, key, startTime,

                    endTime);



            int count = extractAuditRecordService.getCount(key, startTime, endTime);

            int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;

@@ -448,7 +441,6 @@
                    extractAuditRecord.setOrderNum((long)countByUid);

                }

                

				
                JSONObject data = new JSONObject();

                GsonBuilder gsonBuilder = new GsonBuilder();  

                gsonBuilder.serializeNulls(); //重点

@@ -460,15 +452,11 @@
                out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadTrueResult(data)));

            }

             



        } catch (Exception e) {

            e.printStackTrace();

            out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadFalseResult("操作异常")));

        }

    }



	
	


    /**

     * 查询客服个人提现审批记录信息

@@ -491,12 +479,13 @@


        try {

            

            //AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);

            // AdminUser admin = (AdminUser)

            // request.getSession().getAttribute(Constant.SESSION_ADMIN);

            //if (admin == null) {

            //    JsonUtil.printMode(out, callback,  JsonUtil.loadFalseResult("当前账户失效,请重新登陆"));

            // JsonUtil.printMode(out, callback,

            // JsonUtil.loadFalseResult("当前账户失效,请重新登陆"));

            //    return;

            //} 

			


            int pageSize = Constant.PAGE_SIZE;



@@ -513,16 +502,17 @@
                state = null;

            }

            

			
            // 查询当前人员的审核列表信息

            //Long adminId = admin.getId();

            //auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, pageSize, key,state, adminId, days);

            //count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, adminId,days);

			
            // auditList =

            // extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex,

            // pageSize, key,state, adminId, days);

            // count = extractAuditRecordService.getMyAuditedTimeSlotCount(key,

            // state, adminId,days);

            

            // 暂不区分账号，默认所有

             List<ExtractAuditRecord> auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, 
                     pageSize, key,state, null, days);

            List<ExtractAuditRecord> auditList = extractAuditRecordService.getMyAuditedTimeSlotList(pageIndex, pageSize,

                    key, state, null, days);

            if (auditList == null || auditList.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

                return;

@@ -534,7 +524,6 @@
                    record.setAdminUser(new AdminUser());

                }

            }

			
            

            int count = extractAuditRecordService.getMyAuditedTimeSlotCount(key, state, null, days);                

            int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;

@@ -562,9 +551,7 @@
     * @param out

     */

    @RequestMapping(value = "getMyAuditedCount")

    public void getMyAuditedCount(String callback, HttpServletRequest request,

            PrintWriter out) {



    public void getMyAuditedCount(String callback, HttpServletRequest request, PrintWriter out) {

        

        AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);

        

@@ -593,13 +580,14 @@
            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));

        }



	
    }

    

    /**

     * 客服任务页面展示数据：传入提现申请id 则显示当前申请，若无id则显示客服任务下第一个申请数据

     * 
     * @param callback

     * @param extractId 提现id

     * @param extractId

     *            提现id

     * @param request

     * @param out

     */

@@ -626,9 +614,10 @@
                }

                

                // 当前任务指定为该账户处理

                /*extract.setAdminId(admin.getId());

                extractService.updateByPrimaryKeySelective(extract);*/

				
                /*

                 * extract.setAdminId(admin.getId());

                 * extractService.updateByPrimaryKeySelective(extract);

                 */

                

                BigDecimal beforeMoney = null;

                List<ExtractAuditRecord>  records = extractAuditRecordService.getbyExtractId(extract.getId());

@@ -677,16 +666,17 @@
                        newTask = true;

                }

                

				
                if (extract == null) {

                    out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("暂无用户提现申请")));

                } else {

                    

                    if (newTask) {

                        // 当前任务指定为该账户处理

                        /*extract.setAdminId(admin.getId());

						
                        extractService.updateByPrimaryKeySelective(extract);*/

                        /*

                         * extract.setAdminId(admin.getId());

                         * 
                         * extractService.updateByPrimaryKeySelective(extract);

                         */

                    }

                    

                    BigDecimal beforeMoney = null;

@@ -698,7 +688,6 @@
                            beforeMoney = extractAuditRecord.getBeforeMoney();

                        }

                    }

					
                    

                    Long extractTime = extract.getExtractTime();

                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

@@ -719,7 +708,6 @@
                        surplusTime = DateUtil.dateDiff(formattodayTime,formatTime);

                    }

                        

					
                    data.put("extract", extract);

                    data.put("beforeMoney", beforeMoney);

                    data.put("surplusTime", surplusTime);

@@ -738,14 +726,18 @@
    

    /**

     * 查询用户历史提现记录

     * 
     * @param callback

     * @param pageIndex 页码

     * @param key 用户id

     * @param pageIndex

     *            页码

     * @param key

     *            用户id

     * @param request

     * @param out

     */

    @RequestMapping(value = "getByUidList")

    public void getByUidList(String callback, Integer pageIndex, Long uid, HttpServletRequest request, PrintWriter out) {

    public void getByUidList(String callback, Integer pageIndex, Long uid, HttpServletRequest request,

            PrintWriter out) {

        try {

            if (uid == null) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户不存在"));

@@ -784,11 +776,12 @@
        }

    }

    

	
    /**

     * 数量统计

     * 
     * @param callback

     * @param uid 用户id

     * @param uid

     *            用户id

     * @param request

     * @param out

     */

@@ -824,18 +817,18 @@
        }

    }

    

	
    /**

     * 根据用户id查询相应订单列表

     * 

     * @param callback

     * @param pageIndex

     * @param key  用户id

     * @param key

     *            用户id

     * @param out

     */

    @RequestMapping(value = "getOrderRecordList")

    public void getOrderRecordList(String callback, Integer pageIndex,  Integer pageSize, Long key,

            String startTime, String endTime, PrintWriter out) {

    public void getOrderRecordList(String callback, Integer pageIndex, Integer pageSize, Long key, String startTime,

            String endTime, PrintWriter out) {



        try {

            

@@ -843,7 +836,6 @@
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未获取到用户id"));

                return;

            }

			
        

            if (!StringUtil.isNullOrEmpty(endTime)) {

                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

@@ -860,13 +852,11 @@
            if(pageSize == null)

                pageSize = Constant.PAGE_SIZE;

            

			
            List<HongBao> list = hongBaoService.selectOrderByUid(pageIndex, pageSize, key, startTime, endTime);

            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户无订单记录"));

                return;

            } 

			
            

            Map<String, List<TaoBaoWeiQuanOrder>> wq = new HashMap<String, List<TaoBaoWeiQuanOrder>>();

            for (HongBao hongBao :list) {

@@ -877,8 +867,6 @@
                    wq.put(orderId, weiQuanList);

                }

            }

			
			
            

            /*  验证网络:   */

            StringBuffer auctionIdBuf = new StringBuffer();

@@ -897,14 +885,11 @@
                // 单笔收益金额

                BigDecimal money = hongBao.getMoney();

                

				
                map.put("getTime",getTime);

                

                // 子订单号

                String orderItemId = "";

                map.put("orderItemId",orderItemId);

				
				
                

                /*  订单状态判断：1 订单已付款   2、订单已结算   4、订单失效    */

                if (state == HongBao.STATE_SHIXIAO) {

@@ -937,7 +922,6 @@
                    map.put("orderState",2); // 订单结算

                }

                

			
                /* 订单返利状态： 2未到账  3已到账   4已失效  */

                

                if (HongBao.STATE_YILINGQU == state ) {

@@ -948,8 +932,6 @@
                    map.put("moneyState",4);  // 已失效

                }

                

				
				
                /* 订单类型：1系统红包  2、自购订单  3、邀请订单  4 分享订单  */ 

                int rebateSource = 0;

                if (type == HongBao.TYPE_HUODONG || type == HongBao.TYPE_XINREN ) {

@@ -958,9 +940,8 @@
                } else if(type == HongBao.TYPE_JINGDONG ||type == HongBao.TYPE_TAOBAO) {

                    //  自购订单   

                    rebateSource = 2;

                } else if (type == HongBao.TYPE_YAOQING ||  type == HongBao.TYPE_YIJI || 
                           type == HongBao.TYPE_ERJI || type == HongBao.TYPE_SHARE_ERJI || 
                           type == HongBao.TYPE_SHARE_YIJI) {

                } else if (type == HongBao.TYPE_YAOQING || type == HongBao.TYPE_YIJI || type == HongBao.TYPE_ERJI

                        || type == HongBao.TYPE_SHARE_ERJI || type == HongBao.TYPE_SHARE_YIJI) {

                    // 邀请人自购订单+邀请人分享订单

                    rebateSource = 3;

                } else if (type == HongBao.TYPE_SHARE_GOODS) {

@@ -968,7 +949,6 @@
                    rebateSource = 4;

                }

                map.put("rebateSource",rebateSource);

				
                

                // 获取订单信息

                Map<String, Object> inMap = getOrderItem(hongBao);

@@ -993,7 +973,6 @@
                // 红包对应订单号

                if (StringUtil.isNullOrEmpty(itemOrderId))

                    orderItem.setOrderId(orderId);

				
                

                Long auctionId = orderItem.getAuctionId();

                if (auctionId != null) {

@@ -1039,8 +1018,6 @@
                listmap.add(map);

            }

            

			
			
            /*  验证网络: 获取商品链接 图片链接   */

            List<TaoBaoGoodsBrief> goodsBriefList = null;

            if (auctionIdBuf != null && auctionIdBuf.length() > 0) {

@@ -1082,8 +1059,6 @@
                

            }

            

			
			
            int count = hongBaoService.countOrderByUid(key, startTime, endTime);

            int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);

@@ -1098,25 +1073,24 @@
    

            out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadTrueResult(data)));

            



        } catch (Exception e) {

            e.printStackTrace();

            out.print(JsonUtil.loadFalseResult(e.getMessage()));

        }

    }

    

	
    /**

     * 根据用户id查询相应订单列表

     * 

     * @param callback

     * @param pageIndex

     * @param key  用户id

     * @param key

     *            用户id

     * @param out

     */

    @RequestMapping(value = "getOrderList")

    public void getOrderList(String callback, Integer pageIndex,  Integer pageSize, Long key,

            String startTime, String endTime, PrintWriter out) {

    public void getOrderList(String callback, Integer pageIndex, Integer pageSize, Long key, String startTime,

            String endTime, PrintWriter out) {



        try {

            

@@ -1124,7 +1098,6 @@
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未获取到用户id"));

                return;

            }

			
        

            if (!StringUtil.isNullOrEmpty(endTime)) {

                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

@@ -1141,14 +1114,11 @@
            if(pageSize == null)

                pageSize = Constant.PAGE_SIZE;

            

			
            List<HongBao> list = hongBaoService.selectOrderByUid(pageIndex, pageSize, key, startTime, endTime);

            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("该用户无订单记录"));

                return;

            } 

			
		
            

            /*  验证网络:   */

            StringBuffer auctionIdBuf = new StringBuffer();

@@ -1170,7 +1140,6 @@
                // 单笔收益金额

                BigDecimal money = hongBao.getMoney();

                

				
                map.put("getTime",getTime);

                map.put("orderItemId",orderItemId);

                

@@ -1190,7 +1159,6 @@
                    map.put("orderState",0); //订单已付款-已结算

                }

                

				
                if (HongBao.STATE_YILINGQU == state ) {

                    map.put("moneyState",3);  //已到账

                } else if (HongBao.STATE_BUKELINGQU == state || HongBao.STATE_KELINGQU == state) {

@@ -1199,10 +1167,10 @@
                    map.put("moneyState",4);  // 已失效

                }

                

				
				
                /* 1-淘宝订单 2-京东订单 3-活动红包 4-新人红包 5.邀请好友红包(布心街的) 6.一级分销红包

                    7.二级分销红包 20-分享商品订单 */ 
                /*

                 * 1-淘宝订单 2-京东订单 3-活动红包 4-新人红包 5.邀请好友红包(布心街的) 6.一级分销红包 7.二级分销红包

                 * 20-分享商品订单

                 */

                int rebateSource = 0;

                if (type == HongBao.TYPE_HUODONG || type == HongBao.TYPE_XINREN ) {

                    

@@ -1252,7 +1220,6 @@
                if (StringUtil.isNullOrEmpty(itemOrderId))

                    orderItem.setOrderId(orderId);

                

				
                Long auctionId = orderItem.getAuctionId();

                if (auctionId == null) {

                    if (!StringUtil.isNullOrEmpty(orderId)) {

@@ -1285,9 +1252,6 @@
                    }

                }

                

				
				
				
                map.put("orderItem",orderItem);

                

                // 收货时间

@@ -1297,7 +1261,6 @@
                

                listmap.add(map);

            }

			
            

            int count = hongBaoService.countOrderByUid(key, startTime, endTime);

            int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;

@@ -1313,13 +1276,11 @@
    

            out.print(JsonUtil.loadJSONP(callback,JsonUtil.loadTrueResult(data)));

            



        } catch (Exception e) {

            e.printStackTrace();

            out.print(JsonUtil.loadFalseResult(e.getMessage()));

        }

    }

	
    

    public Map<String,Object> getOrderItem(HongBao hongBao) {

        

@@ -1329,7 +1290,6 @@
        Long thirdCreateTime = new Long(0);

        

        Map<String,Object> map = new HashMap<String,Object>(); 

		
        

        Integer type = hongBao.getType();

        if (type == null) {

@@ -1370,7 +1330,6 @@
                

            }

            

			
        } else if (type == HongBao.TYPE_YIJI || type == HongBao.TYPE_ERJI || type == HongBao.TYPE_YAOQING

                || type == HongBao.TYPE_SHARE_ERJI || type == HongBao.TYPE_SHARE_YIJI) {

            /*    邀请订单    分销红包对应的最上级红包  */

@@ -1383,7 +1342,6 @@
                Map<String, Object> map2 = getOrderItem(phongbao);

                return map2;

            }

			
            

        } else if (type == HongBao.TYPE_SHARE_GOODS) {

            /*    分享订单      */

@@ -1428,7 +1386,6 @@
        return map;

        

    }

	
    

    /**

     * 校验用户资金是否异常