duhongyu лет назад: 5
Родитель
Сommit
63beda80d0

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

405
                 }
405
                 }
406
                 if (res == ids.Length)
406
                 if (res == ids.Length)
407
                 {
407
                 {
408
-                    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);
408
+                    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);
409
                     return Success("转移消息创建成功");
409
                     return Success("转移消息创建成功");
410
                    
410
                    
411
                 }
411
                 }

+ 4 - 4
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/AfterSaleController.cs

551
                     if (input.F_CheckStateSH == 1)
551
                     if (input.F_CheckStateSH == 1)
552
                     {
552
                     {
553
                         //如果是改代收
553
                         //如果是改代收
554
-                        if (input.F_ReturnType == "改收")
554
+                        if (input.F_ReturnType == "改收")
555
                         {
555
                         {
556
                             dgs = true;
556
                             dgs = true;
557
                             decimal tempShouldPrice = modelOrder.F_ShouldPrice;
557
                             decimal tempShouldPrice = modelOrder.F_ShouldPrice;
558
                             modelOrder.F_ShouldPrice = modelOrder.F_ShouldPrice + input.F_Money;
558
                             modelOrder.F_ShouldPrice = modelOrder.F_ShouldPrice + input.F_Money;
559
-                            modelOrder.F_Tag += ",改收";
559
+                            modelOrder.F_Tag += ",改收";
560
                             modelOrder.F_Tag = modelOrder.F_Tag.Trim(',');
560
                             modelOrder.F_Tag = modelOrder.F_Tag.Trim(',');
561
                             if (tempShouldPrice > 0)
561
                             if (tempShouldPrice > 0)
562
                             {
562
                             {
855
                     if (input.F_CheckStateSH == 1)
855
                     if (input.F_CheckStateSH == 1)
856
                     {
856
                     {
857
                         //如果是改代收
857
                         //如果是改代收
858
-                        if (input.F_ReturnType == "改收")
858
+                        if (input.F_ReturnType == "改收")
859
                         {
859
                         {
860
                             dgs = true;
860
                             dgs = true;
861
                             decimal tempShouldPrice = modelOrder.F_ShouldPrice;
861
                             decimal tempShouldPrice = modelOrder.F_ShouldPrice;
862
                             modelOrder.F_ShouldPrice = modelOrder.F_ShouldPrice + input.F_Money;
862
                             modelOrder.F_ShouldPrice = modelOrder.F_ShouldPrice + input.F_Money;
863
-                            modelOrder.F_Tag += ",改收";
863
+                            modelOrder.F_Tag += ",改收";
864
                             modelOrder.F_Tag = modelOrder.F_Tag.Trim(',');
864
                             modelOrder.F_Tag = modelOrder.F_Tag.Trim(',');
865
                             if (tempShouldPrice > 0)
865
                             if (tempShouldPrice > 0)
866
                             {
866
                             {

+ 1 - 0
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KFOrderController.cs

243
                 }
243
                 }
244
             }
244
             }
245
             //根据角色展示列表
245
             //根据角色展示列表
246
+
246
             if (UserLogin.RoleCode == "XS")
247
             if (UserLogin.RoleCode == "XS")
247
             {
248
             {
248
                 conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });
249
                 conModels.Add(new ConditionalModel() { FieldName = "F_AddUser", ConditionalType = ConditionalType.Equal, FieldValue = UserLogin.UserId });

+ 1 - 1
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/KGOrderController.cs

214
                 return Error("操作类型不正确");
214
                 return Error("操作类型不正确");
215
 
215
 
216
             #endregion
216
             #endregion
217
-
217
+           
218
 
218
 
219
             T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && new[] { 3, 4, 5 }.Contains(q.F_State));
219
             T_Bus_Order modelOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == orderid && new[] { 3, 4, 5 }.Contains(q.F_State));
220
             if (modelOrder == null)
220
             if (modelOrder == null)

Разница между файлами не показана из-за своего большого размера
+ 24 - 5
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs


+ 3 - 1
代码/TVShoppingCallCenter_ZLJ/Models/Inputs/Order/OrderInput.cs

50
         private string _f_remark = "";
50
         private string _f_remark = "";
51
         private string _f_adfrom = "";
51
         private string _f_adfrom = "";
52
         private string _f_type = "";
52
         private string _f_type = "";
53
-        private int _f_paystate = 0;
53
+        private int _f_paystate = -1;
54
         private decimal _f_usescore = 0;
54
         private decimal _f_usescore = 0;
55
         private decimal _f_activitymoney = 0;
55
         private decimal _f_activitymoney = 0;
56
         private string _f_checkremark = "";
56
         private string _f_checkremark = "";
538
             set { _f_sendusername = value; }
538
             set { _f_sendusername = value; }
539
             get { return _f_sendusername; }
539
             get { return _f_sendusername; }
540
         }
540
         }
541
+        public int? IsSale
542
+        { get; set; }
541
         #endregion Model
543
         #endregion Model
542
 
544
 
543
     }
545
     }