admin
2019-05-16 4114e871bcb3dce771b6aed64a1027d0bbb95ca6
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -18,16 +18,23 @@
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -60,6 +67,12 @@
   @Resource
   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
   @Resource
   private TaoBaoOrderService taoBaoOrderService;
   @Resource
   private OrderService orderService;
   /**
    * 订单列表
    * 
@@ -67,7 +80,7 @@
    * @param page
    * @param uid
    * @param state
    *            状态:1-未到账 2-已到账 3-已失效
    *            状态:0全部 1-未到账 2-已到账 3-已失效 4已收货
    * @param type
    *            类型:1-返利订单 2-分享订单 3-邀请订单
    * @param orderState
@@ -101,6 +114,12 @@
      if (state != null && state == 0) {
         state = null;// 所有状态
      }
      // 转换状态
      if (state != null && state == 4) {
         orderState = state; // 已收货状态
         state = null; // 清空
      }
      if (type != null && type == 0) {
@@ -416,19 +435,60 @@
         out.print(JsonUtil.loadFalseResult(1, "数据错误"));
         return;
      }
      String orderId = null;
      String[] orders = null;
      try {
         orderId = DESUtil.decode(orderData, StringUtil.getBase64String("YeShiFANLI889*+"),
         String orderIds = DESUtil.decode(orderData, StringUtil.getBase64String("YeShiFANLI889*+"),
               StringUtil.getBase64String("*M#34f?,"));
         orders = orderIds.split(",");
      } catch (Exception e) {
         e.printStackTrace();
      }
      if (!StringUtil.isNullOrEmpty(orderId) && orderId.length() > 6) {
         orderId = orderId.substring(orderId.length() - 6, orderId.length());
         UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
         if (info != null && !StringUtil.isNullOrEmpty(info.getTaoBaoUid())) {
            userExtraTaoBaoInfoService.bindTaoBaoOrderEnd6Num(info.getTaoBaoUid(), orderId);
      if ("findOrder".equalsIgnoreCase(source)) {
         // 匹配订单
         for (String order : orders) {
            if (!StringUtil.isNullOrEmpty(order)) {
               List<TaoBaoOrder> orderList = taoBaoOrderService.getTaoBaoOrderByOrderId(order);
               if (orderList != null && orderList.size() > 0) {
                  List<CommonOrder> commonOrderList = commonOrderService
                        .listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO, order);
                  if (commonOrderList == null || commonOrderList.size() == 0) {
                     Order or = new Order();
                     or.setBeizhu("人工自动找回补单");
                     or.setCreatetime(System.currentTimeMillis());
                     or.setOrderId(order);
                     or.setOrderType(1);
                     or.setState(Order.STATE_YIZHIFU);
                     or.setUserInfo(new UserInfo(uid));
                     or.setVersion(2);
                     // 加入到订单表
                     boolean isS;
                     try {
                        isS = orderService.addOrder(or);
                        if (isS) {
                           CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
                        }
                     } catch (Exception e) {
                        e.printStackTrace();
                     }
                  }
               }
            }
         }
      } else {
         String orderId = null;
         if (orders != null && orders.length > 0)
            orderId = orders[0];
         if (!StringUtil.isNullOrEmpty(orderId) && orderId.length() > 6) {
            orderId = orderId.substring(orderId.length() - 6, orderId.length());
            UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
            if (info != null) {
               UserExtraTaoBaoInfo update = new UserExtraTaoBaoInfo();
               update.setId(info.getId());
               update.setTaoBaoOrderEnd6Num(orderId);
               userExtraTaoBaoInfoService.updateSelective(update);
            }
         }
      }
      out.print(JsonUtil.loadTrueResult(""));