admin
2019-10-21 520dd4bec679e5febb3986f4bcdd0c9bf29a0542
提现商品验证修改
3个文件已修改
73 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -445,22 +445,25 @@
                    record.setExtraInfoStr(desc.toString());
                }
//                if (warnLevel == 0) {
//                    // 查询同店铺商品,同商品订单超过一定数量的
//                    List<Integer> typeList = new ArrayList<>();
//                    typeList.add(HongBaoV2.TYPE_ZIGOU);
//                    long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
//                            record.getExtract().getUserInfo().getId(),
//                            Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
//                    long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
//                            record.getExtract().getUserInfo().getId(),
//                            Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
//                    if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
//                        warnLevel = 3;
//                        record.setExtraInfoStr(
//                                String.format("同店铺:%s   同商品:%s", sameShopOrderCount, sameGoodsOrderCount));
//                    }
//                }
                // if (warnLevel == 0) {
                // // 查询同店铺商品,同商品订单超过一定数量的
                // List<Integer> typeList = new ArrayList<>();
                // typeList.add(HongBaoV2.TYPE_ZIGOU);
                // long sameGoodsOrderCount =
                // commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList,
                // record.getExtract().getUserInfo().getId(),
                // Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
                // long sameShopOrderCount =
                // commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList,
                // record.getExtract().getUserInfo().getId(),
                // Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
                // if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
                // warnLevel = 3;
                // record.setExtraInfoStr(
                // String.format("同店铺:%s 同商品:%s", sameShopOrderCount,
                // sameGoodsOrderCount));
                // }
                // }
                record.setWarnLevel(warnLevel);
@@ -486,6 +489,27 @@
            e.printStackTrace();
            out.print(JsonUtil.loadFalseResult(e.getMessage()));
        }
    }
    @RequestMapping(value = "getMyAuditedDanger")
    public void getMyAuditedDanger(String callback, Long uid, PrintWriter out) {
        if (uid == null) {
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请登录"));
            return;
        }
        // 查询同店铺商品,同商品订单超过一定数量的
        List<Integer> typeList = new ArrayList<>();
        typeList.add(HongBaoV2.TYPE_ZIGOU);
        long sameGoodsOrderCount = commonOrderCountService.countSameGoodsOrderByUidAndHongBaoType(typeList, uid,
                Integer.parseInt(configService.get("admin_min_same_goods_order_count")));
        long sameShopOrderCount = commonOrderCountService.countSameShopOrderByUidAndHongBaoType(typeList, uid,
                Integer.parseInt(configService.get("admin_min_same_shop_order_count")));
        if (sameGoodsOrderCount > 0 || sameShopOrderCount > 0) {
            String text = (String.format("同店铺:%s 同商品:%s", sameShopOrderCount, sameGoodsOrderCount));
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(text));
            return;
        }
        JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("店铺/商品无异常"));
    }
    /**
@@ -1082,9 +1106,10 @@
            e.printStackTrace();
        }
    }
    /**
     * 下载提现红包Openid
     *
     * @param callback
     * @param response
     * @param out
@@ -1125,10 +1150,10 @@
            e.printStackTrace();
        }
    }
    /**
     * 上传提现红包Excel
     *
     * @param file
     * @param out
     */
@@ -1150,10 +1175,10 @@
            out.print(JsonUtil.loadFalseResult("上传失败"));
        }
    }
    /**
     * 预览红包发生人
     *
     * @param callback
     * @param pageIndex
     * @param out
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -265,7 +265,6 @@
                        taoBaoGoodsUpdateService.offlineTaoBaoGoods(id);
                    }
                });
            }
        } else {
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -182,9 +182,10 @@
            if (analysisTaoToken(acceptData, text, out)) {
                return;
            }
            if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text)))
            if (!StringUtil.isNullOrEmpty(TaoBaoUtil.parseSystemTaoToken(text))) {
                out.print(JsonUtil.loadFalseResult("不支持推荐"));
                return;
            }
            JSONObject root = new JSONObject();
            root.put("type", 2);
            JSONObject data = new JSONObject();