Merge remote-tracking branch 'origin/master'

Lighting/Class/CustomerOrderTableViewCell.m

@@ -44,17 +44,23 @@
     self.customerName.text = _model.consumer.name;
     [self.customerHeader sd_setImageWithURL:[NSURL URLWithString:_model.consumer.picture] placeholderImage:ReplaceImage];
     self.orderStatus.text = _model.order.orderState;
-    self.styleNumber.text = _model.order.goodsNum;
+    //self.styleNumber.text = _model.order.goodsNum;
     self.consigneeName.text = _model.order.receiverName;
     self.consigneePhoneNumber.text = _model.order.receiverMobile;
     self.phoneNumber.text = _model.consumer.mobile;
     self.consigneeAddress.text = _model.order.receiverAddress;
     
     NSInteger goodsAllprice = 0;
+    NSInteger goodsAllnum = 0;
     for (TOOrderdetailEntity *goodslist in _model.orderdetailList) {
         goodsAllprice += [goodslist.goodsTotalPrice integerValue];
+        goodsAllnum += [goodslist.goodsNum integerValue];
+        
     }
     self.orderTotalPrice.text = [NSString stringWithFormat:@"%ld",goodsAllprice];
+    
+    self.styleNumber.text = [NSString stringWithFormat:@"%ld",goodsAllnum];
+    
     //撤销订单、去支付
     if ([_model.order.orderState isEqualToString:@"001"]) {
         self.delecteOrder.hidden = NO;