订单详情中新增货号、sku、商品编码展示

@@ -1553,7 +1553,13 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     	resp.setShipFee(String.format("%.2f", buyerOrder.getShipFee().doubleValue()));
     	resp.setAmount(String.format("%.2f", buyerOrder.getAmount().doubleValue()));
     	resp.setCouponCutAmount(goods.getCouponCutAmount().compareTo(BigDecimal.valueOf(0))==0 ? "-" : goods.getCouponCutAmount().toString());
-    	
+		resp.setStorageId(sellerGoods.getStorageId());
+		resp.setProductId(sellerGoods.getProductId());
+
+		//查询商品的货号
+		Product product = productMapper.selectByPrimaryKey(sellerGoods.getProductId());
+		resp.setProductCode((null != product && StringUtils.isNotEmpty(product.getProductCode()))? product.getProductCode() : "");
+
     	resp.setPlatformReceiveGoodsAddress(appraiseAddressMapper.selectAddressByType(sellerGoods.getDepotNo()));
 
 		//买家收货时间
@@ -2545,7 +2551,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
 		}
 
 		if(null != req.getBuyerEndTime() && "NaN".equals(req.getBuyerEndTime())){
-			req.setBuyerStartTime(null);
+			req.setBuyerEndTime(null);
 		}else if(StringUtils.isNotEmpty(req.getBuyerEndTime())){
 			req.setBuyerEndTime(req.getBuyerEndTime().substring(0, 10));
 		}

@@ -80,15 +80,19 @@
                 <td><label>详细地址：</label><span id="sellerRebackAddressDetail"></span></td>
                 <td><label>寄回手机号码：</label><span id="sellerRebackMobile"></span></td>
                 <td><label>邮政编码：</label><span id="sellerZipCode"></span></td>
+                <td><label>身份信息：</label><span id="seller"></span></td>
               </tr>
 		    </table>
 
 		    <h2>订单商品</h2>
 		    <table class="sub-info" border="1" bordercolor="#ddd" cellspacing="0" width="100%" cellpadding="8">
 		      <tr>
+                <th>商品编码</th>
+                <th>SKU</th>
                 <th>SKU-P</th>
                 <th>商品图片</th>
                 <th>商品名称</th>
+                <th>货号</th>
                 <th>颜色</th>
                 <th>尺码</th>
                 <th>销售价</th>
@@ -98,9 +102,12 @@
                 <th>买家实付</th>
               </tr>
               <tr>
+                <td><span id="sku"></span></td>
+                <td><span id="productId"></span></td>
                 <td><span id="skup"></span></td>
                 <td><img id="productImage" height='78px;' width='59px;' /></td>
                 <td><span id="productName"></span></td>
+                <td><span id="productCode"></span></td>
                 <td><span id="colorName"></span></td>
                 <td><span id="sizeName"></span></td>
                 <td><span id="goodsPrice"></span></td>
@@ -366,9 +373,12 @@ function getOrderInfo(orderCode){
             	 $("#sellerRebackMobile").html(result.data.sellerRebackMobile);
             	 $("#sellerZipCode").html(result.data.sellerZipCode);
             	 //商品信息
-            	 $("#skup").html(result.data.skup);
+                 $("#productId").html(result.data.productId);
+                 $("#sku").html(result.data.storageId);
+                 $("#skup").html(result.data.skup);
             	 $("#productImage").attr("src", result.data.productImage);
             	 $("#productName").html(result.data.productName);
+                 $("#productCode").html(result.data.productCode);
             	 $("#colorName").html(result.data.colorName);
             	 $("#sizeName").html(result.data.sizeName);
             	 $("#goodsPrice").html(result.data.goodsPrice);