Merge branch 'feature-dgy-小分仓体系' into DuGuYang

Areas/Admin/Controllers/MainServer/StoreHouseAmountRecordController.cs

@@ -530,7 +530,8 @@ namespace MySystem.Areas.Admin.Controllers
                 if (Status == 2) dic["Status"] = "处理中";
                 if (Status == 1) dic["Status"] = "成功";
                 if (Status == -1) dic["Status"] = "失败";
-
+                decimal UseAmount = Convert.ToDecimal(dic["UseAmount"].ToString());
+                dic["UseAmount"] = UseAmount / 2;
             }
             return Json(obj);
         }
@@ -584,6 +585,8 @@ namespace MySystem.Areas.Admin.Controllers
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
+                decimal UseAmount = Convert.ToDecimal(dic["UseAmount"].ToString());
+                dic["UseAmount"] = UseAmount / 2;
                 dic["CertId"] = userid_Users.CertId;
                 dic["SettleBankCardNo"] = userid_Users.SettleBankCardNo;
                 dic["SettleBankName"] = userid_Users.SettleBankName;
@@ -616,7 +619,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("IsOk", "是否成功(是、否)");
 
             result.Add("Fields", ReturnFields);
-            OtherMySqlConn.op("UPDATE StoreHouseAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ")");
+            OtherMySqlConn.op("UPDATE StoreHouseAmountRecord SET `Status`=2 WHERE Id IN(" + Ids + ") AND `Status`=0");
             AddSysLog("0", "StoreHouseAmountRecord", "ExportExcel");
             return Json(result);
         }