增加通用模板免单内容

admin

2019-08-19 27920d99bc5925de113aa4f0c22dbba3dcea672f

 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);

         }

         }

		
		
   }

}