admin
2019-10-26 a56bd9db6b5c989fb2eaecd3a854ac6782b55f95
淘宝维权退款服务修改
2个文件已修改
29 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -133,25 +133,20 @@
        List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);
        if (list == null || list.size() == 0)
            return;
        // 获取和该订单号有关联的用户
        // 获取主红包(同一个订单号的单只会对应同一个用户)
        List<CommonOrderVO> typeList = new ArrayList<>();
        CommonOrderVO cv = new CommonOrderVO();
        cv.setSourceType(Constant.SOURCE_TYPE_TAOBAO);
        cv.setOrderNo(orderId);
        typeList.add(cv);
        List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);
        // 查询还未扣款的主红包
        List<HongBaoV2> mainHongBaoList = new ArrayList<>();
        if (commonOrderList != null)
            for (CommonOrderVO vo : commonOrderList) {
        for (TaoBaoWeiQuanOrder weiQuanOrder : list) {
            List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,
                    weiQuanOrder.getOrderItemId());
            if (orderList != null && orderList.size() > 0)
                for (CommonOrder commonOrder : orderList) {
                // 修改订单状态为维权
                CommonOrder co = new CommonOrder(vo.getId());
                    CommonOrder co = new CommonOrder(commonOrder.getId());
                co.setState(CommonOrder.STATE_WQ);
                co.setUpdateTime(new Date());
                commonOrderMapper.updateByPrimaryKeySelective(co);
                HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(vo.getId());
                    HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
                if (hongBaoOrder.getCommonOrder() != null
                        && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))
                // 查询是否已经维权
@@ -162,11 +157,15 @@
                    if (drawBack == null)// 添加还未扣款的子订单
                        mainHongBaoList.add(hongBaoOrder.getHongBaoV2());
                }
            }
        }
        if (mainHongBaoList == null || mainHongBaoList.size() == 0)
            return;
        for (int i = 0; i < mainHongBaoList.size(); i++) {
            HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKey(mainHongBaoList.get(i).getId());
            //锁行,防止重复 操作
            HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(mainHongBaoList.get(i).getId());
            mainHongBaoList.set(i, hb);
            // 只处理返利订单
            if (hb.getType() != HongBaoV2.TYPE_ZIGOU) {
fanli/src/main/java/com/yeshi/fanli/util/elme/ElmeOrderUtil.java
@@ -77,7 +77,7 @@
                    order.setOrderDate(new Date(TimeUtil.convertToTimeTemp(content, "yyyy-MM-dd")));
                    break;
                case "订单号":
                    order.setOrderId(content.replace("&lt;", "").replace("&gt;", ""));
                    order.setOrderId(content.replace("&lt;", "").replace("&gt;", "").replace("<", "").replace(">", ""));
                    break;
                case "支付金额":
                    order.setPayMoney(new BigDecimal(content));