Merge branch 'feature-dgy-创客分期扣款和预扣款' into feature-dgy-后台测试

AppStart/Helper/TimeOutPosChargeService.cs

@@ -164,13 +164,13 @@ namespace MySystem
                     {
                         ChangeType = 202;
                         // Remark = "普通扣款";
-                        Remark = "扣款";
+                        Remark = items.Remark;
                     }
                     if (record.ChargeType == 2)//分期预扣款
                     {
                         ChangeType = 201;
                         // Remark = "分期扣款";
-                        Remark = "扣款";
+                        Remark = items.Remark;
                     }
                     var userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord
                     {

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -103,8 +103,8 @@ namespace MySystem.Areas.Admin.Controllers
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
                 if (ChargeType == 124) dic["ChargeTypeName"] = "过期机具扣款";
-                if (ChargeType == 1) dic["ChargeTypeName"] = "普通扣款";
-                if (ChargeType == 2) dic["ChargeTypeName"] = "分期扣款";
+                if (ChargeType == 1) dic["ChargeTypeName"] = "创客预扣款";
+                if (ChargeType == 2) dic["ChargeTypeName"] = "分期预扣款";
                 if (ChargeType == 0) dic["ChargeTypeName"] = "";
 
                 if (ChargeType != 124)

Areas/Admin/Views/MainServer/ToChargeBackRecord/Index.cshtml

@@ -82,8 +82,8 @@
                             <select id="ChargeTypeSelect" name="ChargeTypeSelect" lay-search="">
                                 <option value="">全部...</option>
                                 <option value="124">过期机具扣款</option>
-                                <option value="1">普通扣款</option>
-                                <option value="2">分期扣款</option>
+                                <option value="1">创客预扣款</option>
+                                <option value="2">分期预扣款</option>
                             </select>
                         </div>
                     </div>