fanli-server.git

parent: c0163bdd | 补丁 | 提交 | show whitespace

admin

2019-10-17 70cfe5f0c05b8ba31550dcabc45301aaa9bad64f

提现审核修改，删除唯品会SDK

5个文件已修改

4个文件已删除

	fanli/libs/osp-sdk-1.0.jar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/libs/vop-sdk-1.0.jar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/webapp/WEB-INF/lib/osp-sdk.jar	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/webapp/WEB-INF/lib/vop-sdk.jar	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 fanli/libs/osp-sdk-1.0.jar

Binary files differ

 fanli/libs/vop-sdk-1.0.jar

Binary files differ

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

@@ -106,7 +106,6 @@
    @Resource

    private UserInfoExtraService userInfoExtraService;

    



    /**

     * 

     * 方法说明: 通过提现请求 可jsonP方式

@@ -396,6 +395,11 @@
                AdminUser adminUser = record.getAdminUser();

                if (adminUser == null) {

                    record.setAdminUser(new AdminUser());

                }

                // 查询用户备注信息

                UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());

                if (extra != null) {

                    record.getExtract().getUserInfo().setStateDesc(extra.getMark());

                }



                int warnLevel = 0;

@@ -850,8 +854,8 @@
                    innerList.put("name", "驳回数");

                }



                List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year,

                        startTime, endTime);

                List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year, startTime,

                        endTime);

                if (dateType != 3) {

                    innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

                } else {

@@ -935,8 +939,8 @@
            JSONObject innerList = new JSONObject();

            innerList.put("name", "总计");



            List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,

                    startTime, endTime);

            List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, startTime,

                    endTime);



            if (dateType != 3) {

                innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

@@ -1020,12 +1024,11 @@
            Gson gson = new Gson();

            List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);





            JSONObject innerList = new JSONObject();

            innerList.put("name", "总计");



            List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,

                    startTime, endTime);

            List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, startTime,

                    endTime);



            if (dateType != 3) {

                innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));

@@ -1070,7 +1073,8 @@
            response.reset();

            response.setContentType("application/octet-stream");

            String fileName= URLDecoder.decode(filepath,"utf-8");

            response.addHeader("Content-Disposition","attachment;"+ "filename=\"" +URLEncoder.encode(fileName, "utf-8") + "\"");

            response.addHeader("Content-Disposition",

                    "attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\"");

            

            StringBuilder sb = new StringBuilder();

            for(String t:list){

@@ -1093,7 +1097,6 @@
        }

    }

    

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

    public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

        if (file == null) {

@@ -1112,8 +1115,6 @@
            out.print(JsonUtil.loadFalseResult("上传失败"));

        }

    }

	
	
    

    @RequestMapping(value = "preAutoUser")

    public void preAutoUser(String callback, Integer pageIndex, Integer pageSize, PrintWriter out) {


 fanli/src/main/java/com/yeshi/fanli/job/order/taobao/UpdateOrderJob.java

@@ -322,9 +322,9 @@
    // 每15分钟爬取一次

    @Scheduled(cron = "0 0/15 * * * ? ")

    public void pullCommonOrder() {

        LogHelper.job("正在执行15min订单爬取");

        if (!Constant.IS_TASK)

            return;

        LogHelper.job("正在执行15min订单爬取");

        long currentTime = System.currentTimeMillis() - 1000 * 60;

        String h = TimeUtil.getGernalTime(currentTime, "HH");

        String m = TimeUtil.getGernalTime(currentTime, "mm");


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

@@ -173,7 +173,7 @@
            doJDOrderJob();// 京东订单处理

            doPDDOrderJob();// 拼多多订单处理

            doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新

            // doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加

            doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加

            // doPlaceOrderIntegralJob();// 下单赠送金币任务

            // doDouYinDeviceActiveJob();// 抖音设备激活广告监测

        }

@@ -722,7 +722,6 @@
                    }

                }

            });



    }



    /**

@@ -792,8 +791,9 @@
                                                if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",

                                                        "yyyyMMdd")) {

                                                    if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 一级返利小于0.01

//                                                        integralTaskRecordService.firstRebateOrderRewardBoss(threeSale.getBoss().getId(),

//                                                                hongBaoV2.getUserInfo().getId(), null);

                                                        integralTaskRecordService.firstRebateOrderRewardBoss(

                                                                threeSale.getBoss().getId(),

                                                                hongBaoV2.getUserInfo().getId(), null);

                                                        LogHelper.test("自购-一级用户-" + threeSale.getBoss().getId()

                                                                + "-hongBaoId:" + hongBaoV2.getId());

                                                    }

@@ -809,8 +809,9 @@
                                                    if (threeSale.getSucceedTime() > TimeUtil

                                                            .convertToTimeTemp("20190901", "yyyyMMdd")) {

                                                        if (secondLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 二级返利小于0.01

//                                                            integralTaskRecordService.firstRebateOrderRewardBossSuper(threeSale.getBoss().getId(),

//                                                                    hongBaoV2.getUserInfo().getId(), null);

                                                            integralTaskRecordService.firstRebateOrderRewardBossSuper(

                                                                    threeSale.getBoss().getId(),

                                                                    hongBaoV2.getUserInfo().getId(), null);

                                                            LogHelper.test("自购-二级用户-" + threeSale.getBoss().getId()

                                                                    + "-hongBaoId:" + hongBaoV2.getId());

                                                        }

@@ -864,8 +865,9 @@
                                                if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",

                                                        "yyyyMMdd")) {

                                                    if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 一级返利小于0.01

//                                                        integralTaskRecordService.firstSharerOrderRewardBoss(threeSale.getBoss().getId(),

//                                                                hongBaoV2.getUserInfo().getId(), null);

                                                        integralTaskRecordService.firstSharerOrderRewardBoss(

                                                                threeSale.getBoss().getId(),

                                                                hongBaoV2.getUserInfo().getId(), null);

                                                        LogHelper.test("分享-一级用户-" + threeSale.getBoss().getId()

                                                                + "-hongBaoId:" + hongBaoV2.getId());

                                                    }

@@ -874,9 +876,8 @@
                                        }

                                    }

                                }

                                // HongBaoRecieveCMQManager.getInstance()

                                // .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL,

                                // key);

                                HongBaoRecieveCMQManager.getInstance()

                                        .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);

                            } catch (Exception e) {

                                try {

                                    LogHelper.errorDetailInfo(e);


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

@@ -89,6 +89,26 @@
        int state = 0;

        if (order.getValidCode() < 16) {

            state = CommonOrder.STATE_SX;

            String stateDesc = null;

            if (order.getValidCode() == 4)

                stateDesc = "京东帮主订单";

            else if (order.getValidCode() == 5)

                stateDesc = "账号异常";

            else if (order.getValidCode() == 6)

                stateDesc = "赠品类目";

            else if (order.getValidCode() == 7)

                stateDesc = "校园订单";

            else if (order.getValidCode() == 8)

                stateDesc = "企业订单";

            else if (order.getValidCode() == 9)

                stateDesc = "团购订单";

            else if (order.getValidCode() == 10)

                stateDesc = "专用发票";

            else if (order.getValidCode() == 11)

                stateDesc = "乡村推广员";

            else if (order.getValidCode() == 13)

                stateDesc = "违规订单";

            commonOrder.setStateDesc(stateDesc);

        } else if (order.getValidCode() == 16) {

            state = CommonOrder.STATE_FK;

        } else if (order.getValidCode() == 17) {


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -821,7 +821,7 @@
        Collections.sort(orderList, orderCM);

        String sts = "";

        for (TaoBaoOrder order : orderList) {

            sts += order.getTradeId();

            sts += (order.getTradeId() + "-" + order.getSpecialId() + "-" + order.getRelationId());

        }

        return StringUtil.Md5(sts);

    }


 fanli/src/main/webapp/WEB-INF/lib/osp-sdk.jar

Binary files differ

 fanli/src/main/webapp/WEB-INF/lib/vop-sdk.jar

Binary files differ

			@@ -106,7 +106,6 @@
			@Resource
			private UserInfoExtraService userInfoExtraService;


			/**
			*
			* 方法说明: 通过提现请求可jsonP方式
			@@ -396,6 +395,11 @@
			AdminUser adminUser = record.getAdminUser();
			if (adminUser == null) {
			record.setAdminUser(new AdminUser());
			}
			// 查询用户备注信息
			UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(record.getExtract().getUserInfo().getId());
			if (extra != null) {
			record.getExtract().getUserInfo().setStateDesc(extra.getMark());
			}

			int warnLevel = 0;
			@@ -850,8 +854,8 @@
			innerList.put("name", "驳回数");
			}

			List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year,
			startTime, endTime);
			List<ChartTDO> list = extractAuditRecordService.countAuditTotal(state, dateType, year, startTime,
			endTime);
			if (dateType != 3) {
			innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
			} else {
			@@ -935,8 +939,8 @@
			JSONObject innerList = new JSONObject();
			innerList.put("name", "总计");

			List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year,
			startTime, endTime);
			List<ChartTDO> list = extractAuditRecordService.countExtractApplyMoney(null, dateType, year, startTime,
			endTime);

			if (dateType != 3) {
			innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
			@@ -1020,12 +1024,11 @@
			Gson gson = new Gson();
			List<String> dateList = AdminUtils.getDateList(dateType, startTime, endTime, year);


			JSONObject innerList = new JSONObject();
			innerList.put("name", "总计");

			List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year,
			startTime, endTime);
			List<ChartTDO> list = extractAuditRecordService.countExtractApplyNumber(null, dateType, year, startTime,
			endTime);

			if (dateType != 3) {
			innerList.put("data", gson.toJson(AdminUtils.dayOrMonthDataFactory(dateType, dateList, list)));
			@@ -1070,7 +1073,8 @@
			response.reset();
			response.setContentType("application/octet-stream");
			String fileName= URLDecoder.decode(filepath,"utf-8");
			response.addHeader("Content-Disposition","attachment;"+ "filename=\"" +URLEncoder.encode(fileName, "utf-8") + "\"");
			response.addHeader("Content-Disposition",
			"attachment;" + "filename=\"" + URLEncoder.encode(fileName, "utf-8") + "\"");

			StringBuilder sb = new StringBuilder();
			for(String t:list){
			@@ -1093,7 +1097,6 @@
			}
			}


			@RequestMapping(value = "uploadExcel", method = RequestMethod.POST)
			public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {
			if (file == null) {
			@@ -1112,8 +1115,6 @@
			out.print(JsonUtil.loadFalseResult("上传失败"));
			}
			}



			@RequestMapping(value = "preAutoUser")
			public void preAutoUser(String callback, Integer pageIndex, Integer pageSize, PrintWriter out) {

			@@ -322,9 +322,9 @@
			// 每15分钟爬取一次
			@Scheduled(cron = "0 0/15 * * * ? ")
			public void pullCommonOrder() {
			LogHelper.job("正在执行15min订单爬取");
			if (!Constant.IS_TASK)
			return;
			LogHelper.job("正在执行15min订单爬取");
			long currentTime = System.currentTimeMillis() - 1000 * 60;
			String h = TimeUtil.getGernalTime(currentTime, "HH");
			String m = TimeUtil.getGernalTime(currentTime, "mm");

			@@ -173,7 +173,7 @@
			doJDOrderJob();// 京东订单处理
			doPDDOrderJob();// 拼多多订单处理
			doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新
			// doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加
			doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加
			// doPlaceOrderIntegralJob();// 下单赠送金币任务
			// doDouYinDeviceActiveJob();// 抖音设备激活广告监测
			}
			@@ -722,7 +722,6 @@
			}
			}
			});

			}

			/**
			@@ -792,8 +791,9 @@
			if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
			"yyyyMMdd")) {
			if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 一级返利小于0.01
			// integralTaskRecordService.firstRebateOrderRewardBoss(threeSale.getBoss().getId(),
			// hongBaoV2.getUserInfo().getId(), null);
			integralTaskRecordService.firstRebateOrderRewardBoss(
			threeSale.getBoss().getId(),
			hongBaoV2.getUserInfo().getId(), null);
			LogHelper.test("自购-一级用户-" + threeSale.getBoss().getId()
			+ "-hongBaoId:" + hongBaoV2.getId());
			}
			@@ -809,8 +809,9 @@
			if (threeSale.getSucceedTime() > TimeUtil
			.convertToTimeTemp("20190901", "yyyyMMdd")) {
			if (secondLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 二级返利小于0.01
			// integralTaskRecordService.firstRebateOrderRewardBossSuper(threeSale.getBoss().getId(),
			// hongBaoV2.getUserInfo().getId(), null);
			integralTaskRecordService.firstRebateOrderRewardBossSuper(
			threeSale.getBoss().getId(),
			hongBaoV2.getUserInfo().getId(), null);
			LogHelper.test("自购-二级用户-" + threeSale.getBoss().getId()
			+ "-hongBaoId:" + hongBaoV2.getId());
			}
			@@ -864,8 +865,9 @@
			if (threeSale.getSucceedTime() > TimeUtil.convertToTimeTemp("20190901",
			"yyyyMMdd")) {
			if (firstLevelMoney.compareTo(new BigDecimal("0.01")) < 0) {// 一级返利小于0.01
			// integralTaskRecordService.firstSharerOrderRewardBoss(threeSale.getBoss().getId(),
			// hongBaoV2.getUserInfo().getId(), null);
			integralTaskRecordService.firstSharerOrderRewardBoss(
			threeSale.getBoss().getId(),
			hongBaoV2.getUserInfo().getId(), null);
			LogHelper.test("分享-一级用户-" + threeSale.getBoss().getId()
			+ "-hongBaoId:" + hongBaoV2.getId());
			}
			@@ -874,9 +876,8 @@
			}
			}
			}
			// HongBaoRecieveCMQManager.getInstance()
			// .deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL,
			// key);
			HongBaoRecieveCMQManager.getInstance()
			.deleteQueueMsg(HongBaoRecieveCMQManager.QUEUE_INTEGRAL, key);
			} catch (Exception e) {
			try {
			LogHelper.errorDetailInfo(e);

			@@ -89,6 +89,26 @@
			int state = 0;
			if (order.getValidCode() < 16) {
			state = CommonOrder.STATE_SX;
			String stateDesc = null;
			if (order.getValidCode() == 4)
			stateDesc = "京东帮主订单";
			else if (order.getValidCode() == 5)
			stateDesc = "账号异常";
			else if (order.getValidCode() == 6)
			stateDesc = "赠品类目";
			else if (order.getValidCode() == 7)
			stateDesc = "校园订单";
			else if (order.getValidCode() == 8)
			stateDesc = "企业订单";
			else if (order.getValidCode() == 9)
			stateDesc = "团购订单";
			else if (order.getValidCode() == 10)
			stateDesc = "专用发票";
			else if (order.getValidCode() == 11)
			stateDesc = "乡村推广员";
			else if (order.getValidCode() == 13)
			stateDesc = "违规订单";
			commonOrder.setStateDesc(stateDesc);
			} else if (order.getValidCode() == 16) {
			state = CommonOrder.STATE_FK;
			} else if (order.getValidCode() == 17) {

			@@ -821,7 +821,7 @@
			Collections.sort(orderList, orderCM);
			String sts = "";
			for (TaoBaoOrder order : orderList) {
			sts += order.getTradeId();
			sts += (order.getTradeId() + "-" + order.getSpecialId() + "-" + order.getRelationId());
			}
			return StringUtil.Md5(sts);
			}