媒体管理提示售后类型客服合并订单

代码/TVShoppingCallCenter_ZLJ/Controllers/MediaCente/MediaManagementController.cs

@@ -35,7 +35,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
             if (string.IsNullOrEmpty(input.F_Telephone))
                 return Error("请输入媒体电话");
             if(input.F_Name.Length>30)
-                return Error("媒体名称不能超过30");
+                return Error("媒体名称不能过长");
             //  input.F_CreateUser = "8000";
             input.F_CreateTime = DateTime.Now;
             input.F_IsDelete = 0;
@@ -61,7 +61,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
             if (string.IsNullOrEmpty(input.F_Telephone))
                 return Error("请输入媒体电话");
             if (input.F_Name.Length > 30)
-                return Error("媒体名称不能超过30");
+                return Error("媒体名称不能过长");
             var model = await _sys_mediaManagement_Repository.GetSingle(x => x.F_ID == input.F_ID);
             if (model == null)
                 return Error("操作失败");

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/AfterSaleController.cs

@@ -37,7 +37,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         private readonly IBus_OrderMergeRepository busOrderMergeRepository;
         private readonly ICus_ScoreSetRepository cus_score_setRepository;
         private readonly IBus_AfterSaleRepository busAfterSaleRepository;
-        public AfterSaleController(OrderFunctionController _OrderFunctionController, ICus_ScoreSetRepository _cus_score_setRepository, IBus_OrderMergeRepository _busOrderMergeRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IBus_AfterSaleRepository _busAfterSaleRepository)
+        private readonly ISys_DictionaryValueRepository _sys_dictionaryRepository;
+        public AfterSaleController(OrderFunctionController _OrderFunctionController, ICus_ScoreSetRepository _cus_score_setRepository, IBus_OrderMergeRepository _busOrderMergeRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IBus_AfterSaleRepository _busAfterSaleRepository, ISys_DictionaryValueRepository sys_dictionaryRepository)
         {
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
@@ -47,6 +48,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             busOrderMergeRepository = _busOrderMergeRepository;
             cus_score_setRepository = _cus_score_setRepository;
             busAfterSaleRepository = _busAfterSaleRepository;
+            _sys_dictionaryRepository = sys_dictionaryRepository;
         }
 
         #region 销售操作
@@ -1082,7 +1084,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             model.F_DetailList = $"{model.F_DetailList}|{productid},{count},空货";
                         }
                     }
+                  
                 }
+                string F_TypeName = _sys_dictionaryRepository.GetSingle(x => x.F_ValueId == model.F_Type).Result != null ? _sys_dictionaryRepository.GetSingle(x => x.F_ValueId == model.F_Type).Result.F_Value : "";//  
                 //if (!string.IsNullOrEmpty(model.F_OldDetailList))
                 //{
                 //    string[] F_OldDetailList = model.F_OldDetailList.Split("|");
@@ -1104,7 +1108,46 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 //    }
                 //}
             }
-            return Success("成功", model);
+            #region 
+            var obj = new
+            {
+                model.F_Id,
+                model.F_OrderId,
+                model.F_AddTime,
+                model.F_Type,
+                model.F_CheckStateXS,
+                model.F_CheckTimeXS,
+                model.F_CheckUserXS,
+                model.F_CheckUserNameXS,
+                model.F_CheckStateSH,
+                model.F_CheckTimeSH,
+                model.F_CheckUserSH,
+                model.F_CheckUserNameSH,
+                model.F_DetailList,
+                model.F_OldDetailList,
+                model.F_TrackingNo,
+                model.F_TrackDes,
+                model.F_Money,
+                model.F_State,
+                model.F_CheckStateKG,
+                model.F_CheckTimeKG,
+                model.F_CheckUserKG,
+                model.F_CheckUserNameKG,
+                model.F_Remark,
+                model.F_AboutOrderId,
+                model.F_ReturnType,
+                model.F_ReturnDes,
+                model.F_ProductStatus,
+                model.F_Tag,
+                model.F_AboutUserId,
+                model.F_AboutName,
+                model.F_Customer,
+                model.F_CustomerPhone,
+                model.F_VipId,
+                F_TypeName
+            };
+            #endregion
+            return Success("成功", obj);
 
         }
 

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderMergeController.cs

@@ -321,6 +321,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         {
             try
             {
+               
                 string id = input.F_Id;
                 int state = input.F_State;
 
@@ -426,6 +427,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             if (n == 0&& modelOrderMerge.F_Gift != "")
                             {
                                 T_Bus_Product productModel =await bus_productRepository.GetSingle(q=>q.F_ProductId== modelOrderMerge.F_Gift);
+                                if (productModel == null)
+                                    break;
                                 modelDetail = new T_Bus_OrderDetail();
                                 modelDetail.F_ProductName = productModel.F_ProductName;
                                 modelDetail.F_ProductId = productModel.F_ProductId;