订单bug修复

Administrator

2019-08-17 02c407ff8ca33296a9afee4a390945bfcfa162b2

订单bug修复

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

@@ -372,7 +372,13 @@
        if (!Constant.IS_TASK)

            return;

        LogHelper.error("处理返利到账前置");

        doTaoBaoWeiQuanOrder(2);

        try {

			
            doTaoBaoWeiQuanOrder(2);

        } catch (Exception e) {

        LogHelper.errorDetailInfo(e);

        }

        LogHelper.error("开始处理返利");

        orderProcessService.fanli();

    }




 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -18,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.NumberUtil;



import com.google.gson.Gson;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

@@ -463,8 +464,12 @@
    public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {

        if (orderList != null)

            for (TaoBaoWeiQuanOrder order : orderList) {

                if (order.getState().contains("维权成功")) {

                    CMQManager.getInstance().addWeiQuanOrderMsg(order);

                try {

                    if (order.getState().contains("维权成功")) {

                        CMQManager.getInstance().addWeiQuanOrderMsg(order);

                    }

                } catch (Exception e) {

                    LogHelper.error("维权订单加入到队列出错:"+order!=null?new Gson().toJson(order):null);

                }

            }

    }

@@ -1018,7 +1023,7 @@
        // 加入订单

        Order oldOrder = orderMapper.selectOrderByOrderIdAndOrderType(jdOrder.getOrderId() + "",

                Constant.SOURCE_TYPE_JD);

        if (uid == null && oldOrder.getBeizhu().contains("补单"))

        if (uid == null && oldOrder != null && oldOrder.getBeizhu() != null && oldOrder.getBeizhu().contains("补单"))

            uid = oldOrder.getUserInfo().getId();



        if (uid == null)

@@ -1207,4 +1212,25 @@
            }

        }

    }



    @Override

    public void repairCommonOrderByByTaoBaoOrder(String orderId) {

        //根据订单号查询淘宝订单

        List<TaoBaoOrder>  orderList=    taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);

        if(orderList!=null)

            for(TaoBaoOrder order:orderList)

            {

                //根据交易ID查询常规订单

            CommonOrder commonOrder=    commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, order.getTradeId());

            //修复orderby

            if(commonOrder!=null)

            {CommonOrder update=new CommonOrder(commonOrder.getId());

            update.setOrderBy(order.getOrderBy());

            update.setUpdateTime(new Date());		
            commonOrderService.updateByPrimaryKeySelective(update);

            }

            }

		
		
    }

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java

@@ -100,5 +100,12 @@
     * @param pddOrder

     */

    public void processPDDOrder(PDDOrder pddOrder);

	
	
    /**

     * 根据淘宝订单的排序值修复常规订单的排序值

     * @param orderId

     */

    public void repairCommonOrderByByTaoBaoOrder(String orderId);



}


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

@@ -207,10 +207,10 @@
                        try {

                            // 取16个订单

                            List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);

                            Map<String, List<TaoBaoOrder>> map = new HashMap<>();

                            if (orderIds != null) {

                                for (String orderId : orderIds) {

                                    if (NumberUtil.isNumeric(orderId.trim())) {

                                        Map<String, List<TaoBaoOrder>> map = new HashMap<>();

                                        List<TaoBaoOrder> orderList = taoBaoOrderService

                                                .getTaoBaoOrderByOrderId(orderId);

                                        map.put(orderId, orderList);