1

Mall.Module.Product/OrderModule.cs

@@ -554,15 +554,15 @@ namespace Mall.Module.Product
             model.DistrictAddress = (destinationRepository.GetEntity(model.Province)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.City)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.District)?.Name ?? "");
             //物流
             var erlist = goods_ExpressRelevanceRepository.GetList(new RB_Goods_ExpressRelevance_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
-            List<RB_Goods_OrderExpress_Extend> oeList = new List<RB_Goods_OrderExpress_Extend>();
-            if (erlist.Any())
-            {
-                oeList = goods_OrderExpressRepository.GetList(new RB_Goods_OrderExpress_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderExpressIds = string.Join(",", erlist.Select(x => x.OrderExpressId)) });
-                foreach (var item in oeList)
-                {
-                    item.ExpressName = logistics_ExpressRepository.GetEntity(item.ExpressId)?.Name ?? "";
-                }
-            }
+            //List<RB_Goods_OrderExpress_Extend> oeList = new List<RB_Goods_OrderExpress_Extend>();
+            //if (erlist.Any())
+            //{
+            //    oeList = goods_OrderExpressRepository.GetList(new RB_Goods_OrderExpress_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderExpressIds = string.Join(",", erlist.Select(x => x.OrderExpressId)) });
+            //    foreach (var item in oeList)
+            //    {
+            //        item.ExpressName = logistics_ExpressRepository.GetEntity(item.ExpressId)?.Name ?? "";
+            //    }
+            //}
 
             return ApiResult.Success("", new
             {
@@ -627,7 +627,13 @@ namespace Mall.Module.Product
                 oeList = goods_OrderExpressRepository.GetList(new RB_Goods_OrderExpress_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderExpressIds = string.Join(",", erlist.Select(x => x.OrderExpressId)) });
                 foreach (var item in oeList)
                 {
-                    item.ExpressName = logistics_ExpressRepository.GetEntity(item.ExpressId)?.Name ?? "";
+                    if (item.Type == 1)
+                    {
+                        item.ExpressName = logistics_ExpressRepository.GetEntity(item.ExpressId)?.Name ?? "";
+                    }
+                    else {
+                        item.ExpressName = item.Remark;
+                    }
                 }
             }
             return oeList.Select(x => new
@@ -3918,7 +3924,7 @@ namespace Mall.Module.Product
             //物流信息
             List<object> TExpressList = new List<object>();
             List<object> HExpressList = new List<object>();
-            if (model.DeliveryId > 0)
+            if (model.DeliveryId > 0 && model.ReExpressId > 0)
             {
                 var leModel = logistics_ExpressRepository.GetEntity(model.ReExpressId);
                 TExpressList.Add(new
@@ -3966,6 +3972,7 @@ namespace Mall.Module.Product
                 model.RefundActual,
                 model.ReOrderStatus,
                 model.Remark,
+                model.ReRemark,
                 ReOrderStatusName = model.ReOrderStatus.GetEnumName(),
                 AuditTime = model.AuditTime.HasValue ? model.AuditTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 FinishTime = model.FinishTime.HasValue ? model.FinishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
@@ -4649,10 +4656,11 @@ namespace Mall.Module.Product
         /// </summary>
         /// <param name="reOrderId"></param>
         /// <param name="type"></param>
+        /// <param name="DeliveryId"></param>
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public ApiResult SetOrderAfterSaleAudit(int reOrderId, int type, int tenantId, int mallBaseId)
+        public ApiResult SetOrderAfterSaleAudit(int reOrderId, int type,int DeliveryId, int tenantId, int mallBaseId)
         {
             var model = goods_OrderAfterSaleRepository.GetEntity(reOrderId);
             if (model == null)
@@ -4667,6 +4675,7 @@ namespace Mall.Module.Product
             if (type == 1)
             { //通过
                 keyValues.Add(nameof(RB_Goods_OrderAfterSale.ReOrderStatus), OrderAfterSaleStatusEnum.DeliveryToBuyer);
+                keyValues.Add(nameof(RB_Goods_OrderAfterSale.DeliveryId), DeliveryId);
                 keyValues.Add(nameof(RB_Goods_OrderAfterSale.AuditTime), DateTime.Now);
             }
             else

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1391,12 +1391,19 @@ namespace Mall.WebApi.Controllers.MallBase
             JObject parms = JObject.Parse(req.msg.ToString());
             int ReOrderId = parms.GetInt("ReOrderId", 0);
             int Type = parms.GetInt("Type", 1);//1 审核通过  2拒绝
+
+            int DeliveryId = parms.GetInt("DeliveryId", 0);
             if (ReOrderId <= 0)
             {
                 return ApiResult.ParamIsNull();
             }
+            if (Type == 1) {
+                if (DeliveryId <= 0) {
+                    return ApiResult.ParamIsNull("请选择退货地址");
+                }
+            }
 
-            return orderModule.SetOrderAfterSaleAudit(ReOrderId, Type, req.TenantId, req.MallBaseId);
+            return orderModule.SetOrderAfterSaleAudit(ReOrderId, Type, DeliveryId, req.TenantId, req.MallBaseId);
         }
 
         /// <summary>