dingdan

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -405,7 +405,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 }
                 if (res == ids.Length)
                 {
-                    bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_user_accountRepository).AddInternalMessagesInfo(res,  "档案转移消息", msg, toperson, DateTime.Now , 6, 1, 0, User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value, 1);
+                    bool n = new InternalMessages.InternalMessagesController(_sys_internalMessagesrepository, _sys_user_accountRepository).AddInternalMessagesInfo(res,  "档案转移消息", msg, User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value, DateTime.Now , 6, 1, 0, toperson, 1);
                     return Success("转移消息创建成功");
                    
                 }

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

@@ -551,12 +551,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     if (input.F_CheckStateSH == 1)
                     {
                         //如果是改代收
-                        if (input.F_ReturnType == "代改收")
+                        if (input.F_ReturnType == "改代收")
                         {
                             dgs = true;
                             decimal tempShouldPrice = modelOrder.F_ShouldPrice;
                             modelOrder.F_ShouldPrice = modelOrder.F_ShouldPrice + input.F_Money;
-                            modelOrder.F_Tag += ",代改收";
+                            modelOrder.F_Tag += ",改代收";
                             modelOrder.F_Tag = modelOrder.F_Tag.Trim(',');
                             if (tempShouldPrice > 0)
                             {
@@ -855,12 +855,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     if (input.F_CheckStateSH == 1)
                     {
                         //如果是改代收
-                        if (input.F_ReturnType == "代改收")
+                        if (input.F_ReturnType == "改代收")
                         {
                             dgs = true;
                             decimal tempShouldPrice = modelOrder.F_ShouldPrice;
                             modelOrder.F_ShouldPrice = modelOrder.F_ShouldPrice + input.F_Money;
-                            modelOrder.F_Tag += ",代改收";
+                            modelOrder.F_Tag += ",改代收";
                             modelOrder.F_Tag = modelOrder.F_Tag.Trim(',');
                             if (tempShouldPrice > 0)
                             {

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

@@ -243,6 +243,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
             }
             //根据角色展示列表
+
             if (UserLogin.RoleCode == "XS")
             {
                 conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });

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

@@ -214,7 +214,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 return Error("操作类型不正确");
 
             #endregion
-
+           
 
             T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && new[] { 3, 4, 5 }.Contains(q.F_State));
             if (modelOrder == null)

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderInput.cs

@@ -50,7 +50,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private string _f_remark = "";
         private string _f_adfrom = "";
         private string _f_type = "";
-        private int _f_paystate = 0;
+        private int _f_paystate = -1;
         private decimal _f_usescore = 0;
         private decimal _f_activitymoney = 0;
         private string _f_checkremark = "";
@@ -538,6 +538,8 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             set { _f_sendusername = value; }
             get { return _f_sendusername; }
         }
+        public int? IsSale
+        { get; set; }
         #endregion Model
 
     }