yujian
2019-04-12 d1b7fd85615a78a476650e5acfc8b165a5deb3aa
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -67,7 +67,7 @@
    * @param page
    * @param uid
    * @param state
    *            状态:1-未到账 2-已到账 3-已失效
    *            状态:0全部 1-未到账 2-已到账 3-已失效  4已收货
    * @param type
    *            类型:1-返利订单 2-分享订单 3-邀请订单
    * @param orderState
@@ -103,6 +103,12 @@
         state = null;// 所有状态
      }
      // 转换状态
      if (state != null && state == 4) {
         orderState = state; // 已收货状态
         state = null; // 清空
      }
      if (type != null && type == 0) {
         type = null; // 所有类型订单
      }
@@ -427,8 +433,11 @@
      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 (info != null) {
            UserExtraTaoBaoInfo update=new UserExtraTaoBaoInfo();
            update.setId(info.getId());
            update.setTaoBaoOrderEnd6Num(orderId);
            userExtraTaoBaoInfoService.updateSelective(update);
         }
      }
      out.print(JsonUtil.loadTrueResult(""));