Authored by mali

订单类型

@@ -2394,6 +2394,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -2394,6 +2394,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
2394 resp.setStatusStr(Constant.convertOrderStatusStr(item.getStatus())); 2394 resp.setStatusStr(Constant.convertOrderStatusStr(item.getStatus()));
2395 resp.setChannel(Objects.equals(item.getAttributes(), 2) ? 2 : 1); //1,线上订单; 2,门店订单 2395 resp.setChannel(Objects.equals(item.getAttributes(), 2) ? 2 : 1); //1,线上订单; 2,门店订单
2396 resp.setProductNum(1);//目前固定为1 2396 resp.setProductNum(1);//目前固定为1
  2397 + resp.setAttributesStr(OrderConfigConstant.getOrderAttributeStr(item.getAttributes()));
2397 if(null==sellerGoodsMap.get(skup)){ 2398 if(null==sellerGoodsMap.get(skup)){
2398 LOGGER.warn("convertToResp not correct data,sellerGoodsMap get sku p {} is empty ,buyer order {}",skup,item); 2399 LOGGER.warn("convertToResp not correct data,sellerGoodsMap get sku p {} is empty ,buyer order {}",skup,item);
2399 }else{ 2400 }else{
@@ -454,7 +454,7 @@ function getOrderInfo(orderCode){ @@ -454,7 +454,7 @@ function getOrderInfo(orderCode){
454 attributesStr = '预售'; 454 attributesStr = '预售';
455 }else if("5" == attributes){ 455 }else if("5" == attributes){
456 attributesStr = '全新瑕疵'; 456 attributesStr = '全新瑕疵';
457 - }else if("4" == attributes){ 457 + }else if("6" == attributes){
458 attributesStr = '二手'; 458 attributesStr = '二手';
459 } 459 }
460 $("#preSellOrNormal").html(attributesStr); 460 $("#preSellOrNormal").html(attributesStr);
@@ -236,6 +236,11 @@ function getOrderList(){ @@ -236,6 +236,11 @@ function getOrderList(){
236 return rowData.orderCode; 236 return rowData.orderCode;
237 } 237 }
238 }, { 238 }, {
  239 + title: "订单类型",
  240 + field: "attributesStr",
  241 + width: 20,
  242 + align: "center"
  243 + }, {
239 title: "买家UID", 244 title: "买家UID",
240 field: "uid", 245 field: "uid",
241 width: 20, 246 width: 20,