爬单修改

admin

2019-04-01 e782b2bcfd89f7ce2e3079c7ebb0867bb00124a7

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

@@ -20,18 +20,13 @@
import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

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

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

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

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

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

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

import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;

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

import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

@@ -39,13 +34,11 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.taobao.PidOrder;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

@@ -53,15 +46,12 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.LostOrderService;

import com.yeshi.fanli.service.inter.order.OrderItemServcie;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.order.PidOrderService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

@@ -70,16 +60,15 @@
import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;



@Service

public class OrderProcessServiceImpl implements OrderProcessService {



   @Resource

   private PidOrderMapper pidOrderMapper;



   @Resource

   private OrderMapper orderMapper;

@@ -88,34 +77,13 @@
   private PidUserMapper pidUserMapper;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private OrderItemServcie orderItemService;



   @Resource

   private PidOrderService pidOrderService;



   @Resource

   private UserInfoMapper userInfoMapper;



   @Resource

   private OrderItemMapper orderItemMapper;



   @Resource

   private HongBaoMapper hongBaoMapper;



   @Resource

   private HongBaoManageMapper hongBaoManageMapper;



   @Resource

   private AccountMessageMapper accountMessageMapper;



   @Resource

   private MoneyRecordMapper moneyRecordMapper;



   @Resource

   private ThreeSaleGiftMapper threeSaleGiftMapper;



   @Resource

   private OrderService orderService;

@@ -172,7 +140,6 @@
      // 分离出返利订单与分享赚订单

      Iterator<String> its = orders.keySet().iterator();

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

      Map<String, List<PidOrder>> sharePidOrderMap = new HashMap<>();

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

      while (its.hasNext()) {

         String orderId = its.next();

@@ -529,7 +496,40 @@
      // 维权扣款（2018-08-05后开始实行）

      if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder().getSettleTime()

            .getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

         taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());

         try {



            taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());



         } catch (TaoBaoWeiQuanException e) {

            if (e.getCode() == TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER) {

               List<TaoBaoOrder> olist = taoBaoOrderService

                     .getTaoBaoOrderByOrderId(hongBaoOrder.getCommonOrder().getOrderNo());



               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"),

                        Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET);

                  List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(

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

                        Constant.TAOBAO_AUTH_APPSECRET);

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

                     olist.addAll(thirdOList);



                  if (olist != null && olist.size() > 0) {

                     for (int i = 0; i < olist.size(); i++) {

                        if (!olist.get(i).getOrderId()

                              .equalsIgnoreCase(hongBaoOrder.getCommonOrder().getOrderNo())) {// 删除无关订单

                           olist.remove(i);

                           i--;

                        }

                     }



                     taoBaoOrderService.addTaoBaoOrderList(olist);

                  }

               }

            } else

               throw new TaoBaoWeiQuanException(e.getCode(), e.getMsg());

         }

      }



   }

@@ -556,12 +556,6 @@
      if (order.getJieSuanTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

         return;

      }

      try {

         orderService.failureOrderWithWeiQuan(order.getOrderId(), Order.ORDER_TYPE_TAOBAO);

      } catch (ObjectStateException e) {

         e.printStackTrace();

      }

      pidOrderService.weiQuan(order.getOrderId());

   }



   @Override

@@ -744,7 +738,7 @@


         // 新版通知

         userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

               userInfoMapper.selectByPKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);