yujian
2019-07-29 cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserOrderController.java
@@ -41,6 +41,7 @@
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
@@ -134,7 +135,9 @@
         type = null; // 所有类型订单
      }
      
      if (goodsType != null && goodsType == 0) {
      if (!VersionUtil.greaterThan_1_6_0(acceptData.getPlatform(), acceptData.getVersion())) {
         goodsType = Constant.SOURCE_TYPE_TAOBAO;
      } else if (goodsType != null && goodsType == 0){
         goodsType = null; // 所有平台订单
      }
@@ -446,7 +449,6 @@
         goodsType = null;
      }
      
      /* 今日订单统计 */
      Map<String, BigDecimal> countToday = commonOrderService.countHistoryOrder(uid, 1, goodsType);
@@ -636,7 +638,7 @@
                     try {
                        isS = orderService.addOrder(or);
                        if (isS) {
                           CMQManager.getInstance().addTaoBaoOrderMsg(order, orderList);
                           CMQManager.getInstance().addTaoBaoOrderMsg(order);
                           // 加入到LostOrder
                           LostOrder lo = new LostOrder();
                           lo.setCreateTime(System.currentTimeMillis());