Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

@@ -203,7 +203,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 x.IndateDay,
                 EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 x.TotalNum,
-                ResidueNum = x.TotalNum - x.ReceiveNum,
+                ResidueNum =  x.ReceiveNum,
                 x.PickupCenter
             });
             return ApiResult.Success("", pagelist);
@@ -436,7 +436,7 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                     //}
                     if (oldLogisticsModel.TotalNum < list.Count())
                     {
-                        return ApiResult.Failed("优惠券剩余" + (oldLogisticsModel.TotalNum - oldLogisticsModel.ReceiveNum) + "张");
+                        return ApiResult.Failed("优惠券剩余" + oldLogisticsModel.TotalNum  + "张");
                     }
                 }
                 bool result = IntegralModule.GrantCoupon(list, oldLogisticsModel);