admin
2025-02-25 30d8e227e8d823b6c38c3b9c90ac2df03b63befe
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -1301,6 +1301,10 @@
                stateInfo = "该订单申诉已通过,请稍后查看。";
            } else if (state == -5) {
                stateInfo = "该订单为分享奖金订单";
            } else if (state == -1001) {
                stateInfo = "该订单为违规订单";
            } else if (state == -1002) {
                stateInfo = "该订单已发起维权";
            }
        }
        JSONObject data = new JSONObject();
@@ -1392,7 +1396,7 @@
    }
    @RequestMapping("collectionGoods")
    public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, PrintWriter out) {
    public void collectionGoods(AcceptData acceptData, long uid, String auctionId, int type, PrintWriter out) {
        try {
            CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,
                    Constant.SOURCE_TYPE_TAOBAO);
@@ -1432,7 +1436,7 @@
     * @param out
     */
    @RequestMapping("collectionGoodsJp")
    public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType,
    public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, String auctionId, Integer goodsType,
                                  PrintWriter out) {
        if (uid == null || auctionId == null) {
@@ -1490,7 +1494,7 @@
            BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
            List<Long> listGid = new ArrayList<Long>();
            List<String> listGid = new ArrayList<>();
            for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
                CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
                if (commonGoods == null) {
@@ -1518,9 +1522,9 @@
                if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
                    int state = 1; // 默认停售
                    Long goodsId = commonGoods.getGoodsId();
                    String goodsId = commonGoods.getGoodsId();
                    for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
                        Long auctionId = taoKeGoods.getAuctionId();
                        String auctionId = taoKeGoods.getAuctionId();
                        if (goodsId == auctionId || goodsId.equals(auctionId)) {
                            state = 0; // 在售
                            break;
@@ -1567,7 +1571,7 @@
            if (!StringUtil.isNullOrEmpty(ids)) {
                Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {
                    try {
                        collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),
                        collectionGoodsV2Service.cancelCollectionByAuctionId(uid, (auctionIdStr),
                                goodsType);
                    } catch (Exception e) {
                        e.printStackTrace();
@@ -2247,7 +2251,7 @@
                    vipAction.put("jumpDetail",
                            jumpDetailV2Service.getByTypeCache("web",
                                    acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
                                    Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
                                    Integer.parseInt(acceptData.getVersion()), acceptData.getSystem()));
                    JSONObject params = new JSONObject();
                    params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));
                    vipAction.put("params", params);
@@ -2263,7 +2267,7 @@
                            vipAction.put("jumpDetail",
                                    jumpDetailV2Service.getByTypeCache("web",
                                            acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
                                            Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
                                            Integer.parseInt(acceptData.getVersion()), acceptData.getSystem()));
                            JSONObject params = new JSONObject();
                            params.put("url", link.replace("[ID]", list.get(0).getId()));
                            vipAction.put("params", params);