admin
2020-06-08 457f4881a89c03984c7b46ed10e8919d3294976c
淘宝好物圈修改
3个文件已修改
41 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -94,7 +94,7 @@
    @Resource
    private HongBaoManageService hongBaoManageService;
    @Resource
    private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@@ -194,8 +194,6 @@
    public void VIP(PrintWriter out) {
        out.print("success");
    }
    /**
     * 支付宝支付回调
@@ -260,33 +258,12 @@
        // return;
        // }
        String contentDecode = "";
        if (request instanceof MultipartHttpServletRequest) {
            MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
            List<MultipartFile> files = multipartRequest.getFiles("file");
            try {
                InputStream input = files.get(0).getInputStream();
                InputStreamReader reader = new InputStreamReader(input, "UTF-16LE");
                int d = -1;
                String st = "";
                while ((d = reader.read()) != -1) {
                    st += ((char) d);
                }
                System.out.println(st);
                contentDecode = st;
                contentDecode = contentDecode.substring(contentDecode.indexOf("(") +1,
                        contentDecode.length()).trim();
                if (contentDecode.endsWith(")"))
                    contentDecode = contentDecode.substring(0, contentDecode.length() - 1);
        contentDecode = content.substring(content.indexOf("(") + 1, content.length()).trim();
        if (contentDecode.endsWith(")"))
            contentDecode = contentDecode.substring(0, contentDecode.length() - 1);
                System.out.println(contentDecode);
                reader.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
        System.out.println(contentDecode);
        JSONObject data = JSONObject.fromObject(contentDecode).optJSONObject("data");
@@ -337,7 +314,7 @@
                } else {
                    imgInfo.setType(ImgEnum.goods);
                    SimpleGoods simpleGoods = new SimpleGoods();
                    simpleGoods.setGoodsId(itemId+"");
                    simpleGoods.setGoodsId(itemId + "");
                    simpleGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
                    simpleGoods.setState(CommonGoods.STATE_NORMAL);
                    CouponInfoVO couponInfo = goodsVO.getCouponInfo();
@@ -357,7 +334,7 @@
            ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();
            try {
                goodsEvaluateService.addGoodsEvaluate(itemId+"", imageList, user, doc, null, null);
                goodsEvaluateService.addGoodsEvaluate(itemId + "", imageList, user, doc, null, null);
            } catch (GoodsEvaluateException e) {
                e.printStackTrace();
            }
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
@@ -85,7 +85,7 @@
                saveJDOrders(result.getOrderList());
        } else if ("1hour".equalsIgnoreCase(param)) {// 更新1小时内的订单
            updateUpdateOrder();
        } else if ("1day".equalsIgnoreCase(param)) {// 更新1小时内的订单
        } else if ("1day".equalsIgnoreCase(param)) {// 更新1天内的订单
            updateLatestDayOrder(new Date(System.currentTimeMillis()));
        } else if ("3day".equalsIgnoreCase(param)) {// 更新最近3天更新的数据
            updateLatest3DayOrder();
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -340,7 +340,7 @@
            UserSystemCoupon userSystemCoupon = null;
            try {
                userSystemCoupon = userSystemCouponService.freeCouponWin(giveUid, CouponTypeEnum.freeCoupon,
                userSystemCoupon = userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCoupon,
                        UserSystemCoupon.SOURCE_GIVE, 1, true);
            } catch (Exception e) {
                LogHelper.errorDetailInfo(e);