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

AppStart/Helper/TimeOutPosChargeService.cs

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

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -99,6 +99,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["UserIdMobile"] = userid_Users.Mobile;
                 dic.Remove("UserId");
+
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
                 if (ChargeType == 124) dic["ChargeTypeName"] = "过期机具扣款";
@@ -106,6 +107,11 @@ namespace MySystem.Areas.Admin.Controllers
                 if (ChargeType == 2) dic["ChargeTypeName"] = "分期扣款";
                 if (ChargeType == 0) dic["ChargeTypeName"] = "";
 
+                if (ChargeType != 124)
+                {
+                    dic["Remark"] = "";
+                }
+
                 //扣款状态
                 int Status = int.Parse(dic["Status"].ToString());
                 if (Status == 0) dic["StatusName"] = "待扣款";
@@ -196,16 +202,25 @@ namespace MySystem.Areas.Admin.Controllers
         public string Edit(ToChargeBackRecord data)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-
-            Fields.Add("UserId", data.UserId); //创客
+            var info = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == data.Id) ?? new ToChargeBackRecord();
+            if (info.ChargeAmount != data.ChargeAmount)
+            {
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == info.UserId) ?? new UserAccount();
+                if (info.ChargeAmount > data.ChargeAmount)
+                {
+                    userAccount.ToChargeAmount -= info.ChargeAmount - data.ChargeAmount;
+                }
+                if (info.ChargeAmount < data.ChargeAmount)
+                {
+                    userAccount.ToChargeAmount += data.ChargeAmount - info.ChargeAmount;
+                }
+            }
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额
-            Fields.Add("ChargeType", data.ChargeType); //待扣类型
-            Fields.Add("Remark", data.Remark); //备注
-            Fields.Add("Field1", data.Field1); //备用字段
-
-            Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
+            if (info.ChargeType != 124)
+            {
+                Fields.Add("Remark", data.SeoDescription);
+            }
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ToChargeBackRecord", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "ToChargeBackRecord", "update");
             db.SaveChanges();

Areas/Admin/Controllers/MainServer/ToChargeBackRecordSubController.cs

@@ -198,13 +198,16 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (toChargeBackRecordSub.ChargeAmount != data.ChargeAmount)
             {
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeByStage.UserId) ?? new UserAccount();
                 if (toChargeBackRecordSub.ChargeAmount > data.ChargeAmount)
                 {
                     toChargeByStage.TotalAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
+                    userAccount.ToChargeAmount -= toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
                 }
                 if (toChargeBackRecordSub.ChargeAmount < data.ChargeAmount)
                 {
-                    toChargeByStage.TotalAmount += toChargeBackRecordSub.ChargeAmount - data.ChargeAmount;
+                    toChargeByStage.TotalAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
+                    userAccount.ToChargeAmount += data.ChargeAmount - toChargeBackRecordSub.ChargeAmount;
                 }
             }
             Fields.Add("ChargeAmount", data.ChargeAmount); //待扣金额

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

@@ -38,7 +38,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">创客编号</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="ChargeAmount" name="ChargeAmount"
+                                    <input class="layui-input" type="text" id="ChargeAmount" name="ChargeAmount" readonly
                                         value="@ViewBag.MakerCode" maxlength="20" lay-verify="required|"
                                         autocomplete="off" placeholder="请输入待扣金额">
                                 </div>
@@ -51,10 +51,10 @@
                                         autocomplete="off" placeholder="请输入待扣金额">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
+                            @* <div class="layui-form-item">
                                 <label class="layui-form-label">待扣类型</label>
                                 <div class="layui-input-inline">
-                                    <select id="ChargeType" name="ChargeType" lay-search="">
+                                    <select id="ChargeType" name="ChargeType" lay-search="" readonly>
                                         <option value="">请选择</option>
                                         <option value="124">过期机具扣款</option>
                                         <option value="1">普通预扣</option>
@@ -62,7 +62,7 @@
                                     </select>
                                     <script>$("#ChargeType").val("@editData.ChargeType");</script>
                                 </div>
-                            </div>
+                            </div> *@
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">备注</label>
                                 <div class="layui-input-block">