签到弹框bug

yujian

2019-08-20 df300df7832cc3d24f1b09297998e8bee8cfd126

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

@@ -16,7 +16,9 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Propagation;

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;

@@ -227,6 +229,7 @@


   @Override

   public void fanli() {

      LogHelper.test("处理返利到账");

      // 获取主红包

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBaoV2.TYPE_ZIGOU, 1000);

      //

@@ -431,10 +434,12 @@
               if (olist != null && olist.size() > 0) {

                  long time = TimeUtil.convertToTimeTemp(olist.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");

                  olist = TaoKeOrderApiUtil.getTaoBaoAllOrder(TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"),

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

                        TaoKeOrderApiUtil.TK_STATUS_ALL);

                  List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(

                        TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                        TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                        TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                  if (thirdOList != null && thirdOList.size() > 0)

                     olist.addAll(thirdOList);



@@ -461,8 +466,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);

            }

         }

   }

@@ -973,7 +982,7 @@
         return;

      String uidStr = order.getExt1();

      Long uid = null;

      if (!StringUtil.isNullOrEmpty(uidStr))

      if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr))

         uid = Long.parseLong(uidStr);

      Long positionId = order.getOrderItemList().get(0).getPositionId();

      if (positionId == JDApiUtil.POSITION_FANLI)// 返利订单

@@ -1016,7 +1025,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)

@@ -1131,7 +1140,7 @@


      // 加入订单

      Order oldOrder = orderMapper.selectOrderByOrderIdAndOrderType(pddOrder.getOrderSn(), Constant.SOURCE_TYPE_PDD);

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

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

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



      if (uid == null)

@@ -1205,4 +1214,24 @@
         }

      }

   }



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

            }

         }



   }

}