zhangkun преди 5 години
родител
ревизия
faf7ca028a

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

@@ -672,8 +672,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
672 672
                     input.F_RemarkXS = "";
673 673
                 if (input.F_PayTime == null)
674 674
                     return Error("请输入打款时间");
675
-                if (input.F_Money < 0)
676
-                    return Error("请输入金额");
675
+                if (input.F_Money >= 0)
676
+                    return Error("退款金额只能为负数");
677 677
 
678 678
                 #endregion
679 679
 
@@ -681,7 +681,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
681 681
                 ModelConvertHelper<T_Bus_OrderMoney, OrderMoneyInput>.ModeToModelDefault(modelOrderMoeny, input);
682 682
                 modelOrderMoeny.F_AddUserId = UserLogin.UserId.ObjToInt();
683 683
                 modelOrderMoeny.F_UserName = UserLogin.UserName;
684
-                modelOrderMoeny.F_Money = -input.F_Money;
684
+                modelOrderMoeny.F_Money = input.F_Money;
685 685
                 modelOrderMoeny.F_MoneyBak = modelOrderMoeny.F_Money;
686 686
                 modelOrderMoeny.F_State = 1;
687 687
                 modelOrderMoeny.F_Id = Guid.NewGuid().ToString().Replace("-", "");

+ 2 - 2
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs

@@ -346,7 +346,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
346 346
                 if (input.F_State == 1)
347 347
                 {
348 348
 
349
-                    if (modelscore.F_StartDebit != 1)
349
+                    if (modelscore.F_StartDebit == 1)
350 350
                     {
351 351
                         modelOrder.F_UseScore = 0;
352 352
                     }
@@ -682,7 +682,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
682 682
                 {  //订单完成后也不计算积分
683 683
                     modelOrder.F_Score = 0.00M;
684 684
                 }
685
-                if (modelscore.F_StartDebit != 1)
685
+                if (modelscore.F_StartDebit == 1)
686 686
                 {
687 687
                     modelOrder.F_UseScore = 0;
688 688
                 }

+ 2 - 2
代码/TVShoppingCallCenter_ZLJ/appsettings.json

@@ -33,8 +33,8 @@
33 33
     "ordertrackkey": "F_Id,F_TrackingNo,F_Status",
34 34
     "ordertracktvalue": "订单号,运单号,物流状态",
35 35
 
36
-    "vipkey": "F_Name,F_Birthday,F_Age,F_Sex,F_ShoeSize,F_Mobile,F_Mobile1,F_Phone,F_Recommender,F_Label,F_Note,F_Nickname,F_CreateOn,F_Province,F_City,F_Area,F_Town,F_Postcode,F_Address,F_Address1,F_Score,F_Money,F_TotalScore,F_Saleperson,F_Type",
37
-    "vipvalue": "姓名,生日,年龄,性别,鞋码,手机号1,手机号2,固定电话,推荐人,标签,备注,昵称,注册时间,省份,城市,县区,乡镇,邮编,地址,备用地址,会员积分,累计消费,累计积分,销售负责人,会员类型"
36
+    "vipkey": "F_Name,F_Birthday,F_Age,F_Sex,F_ShoeSize,F_Mobile,F_Mobile1,F_Phone,F_Recommender,F_Label,F_Province,F_City,F_Area,F_Town,F_Postcode,F_Address,F_Address1,F_Score,F_Money,F_TotalScore,F_Saleperson",
37
+    "vipvalue": "姓名,生日,年龄,性别,鞋码,手机号1,手机号2,固定电话,推荐人,会员标签,省份,城市,县区,乡镇,邮编,地址,备用地址,会员积分,累计消费,累计积分,销售负责人"
38 38
 
39 39
     //在这里可以成对配置导入模板的 表头与对象属性名对应关系 备用省份,备用城市,备用县区,备用乡镇,备用邮编, F_Province1,F_City1,F_Area1,F_Town1,F_Postcode1,
40 40
   },