duhongyu 5 lat temu
rodzic
commit
03b2fd74ad

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

@@ -239,7 +239,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
239 239
             {
240 240
                 if (state > -1)
241 241
                 {
242
-                    conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual , FieldValue ="3" });
242
+                    conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual , FieldValue ="1" });
243 243
                 }
244 244
             }
245 245
             //根据角色展示列表

+ 7 - 3
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs

@@ -144,8 +144,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
144 144
                 {
145 145
                     var vip = await cus_vip_infoRepository.GetListALL(x => x.F_Phone == input.F_CustomerPhone
146 146
                     && x.F_State == 1);
147
-                    if (vip != null&& vip.Count >0)
147
+                    if (vip != null && vip.Count > 0)
148 148
                         modelOrder.F_VipId = vip.FirstOrDefault().F_ID;
149
+                    else
150
+                        modelOrder.F_VipId = 0;
149 151
                 }
150 152
                 if (input.F_Belong > 0)
151 153
                 { 
@@ -356,7 +358,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
356 358
                 if (input.F_State == 1)
357 359
                 {
358 360
 
359
-                    if (modelscore.F_StartDebit == 0)
361
+                    if (modelscore.F_StartDebit == 0 || modelOrder.F_VipId == 0)
360 362
                     {
361 363
                         modelOrder.F_UseScore = 0;
362 364
                     }
@@ -508,6 +510,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
508 510
                     && x.F_State == 1);
509 511
                 if (vip != null && vip.Count > 0)
510 512
                     modelOrder.F_VipId = vip.FirstOrDefault().F_ID;
513
+                else
514
+                    modelOrder.F_VipId = 0;
511 515
             }
512 516
 
513 517
 
@@ -702,7 +706,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
702 706
                 {  //订单完成后也不计算积分
703 707
                     modelOrder.F_Score = 0.00M;
704 708
                 }
705
-                if (modelscore.F_StartDebit == 0)
709
+                if (modelscore.F_StartDebit == 0 || modelOrder.F_VipId == 0)
706 710
                 {
707 711
                     modelOrder.F_UseScore = 0;
708 712
                 }