|
@@ -224,13 +224,13 @@ namespace MySystem
|
|
}
|
|
}
|
|
|
|
|
|
public void GetDepositData()
|
|
public void GetDepositData()
|
|
- {
|
|
|
|
|
|
+ {
|
|
try
|
|
try
|
|
{
|
|
{
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
MpMainModels2.WebCMSEntities mpdb2 = new MpMainModels2.WebCMSEntities();
|
|
MpMainModels2.WebCMSEntities mpdb2 = new MpMainModels2.WebCMSEntities();
|
|
List<MpMainModels2.HdDepositTmp> deposits = mpdb2.HdDepositTmp.Where(m => m.Status == 0).ToList();
|
|
List<MpMainModels2.HdDepositTmp> deposits = mpdb2.HdDepositTmp.Where(m => m.Status == 0).ToList();
|
|
- if(deposits.Count > 1)
|
|
|
|
|
|
+ if(deposits.Count > 0)
|
|
{
|
|
{
|
|
foreach (var deposit in deposits)
|
|
foreach (var deposit in deposits)
|
|
{
|
|
{
|
|
@@ -334,7 +334,7 @@ namespace MySystem
|
|
|
|
|
|
// PosPushDataNewHelper.Bind(mer, PosKind);
|
|
// PosPushDataNewHelper.Bind(mer, PosKind);
|
|
}
|
|
}
|
|
- if (merchantAddInfo.BrandId == 1) PosPushDataNewHelper.Deposit(act);
|
|
|
|
|
|
+ PosPushDataNewHelper.Deposit(act);
|
|
|
|
|
|
MpMainModels2.HdDepositTmp edit = mpdb2.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
|
|
MpMainModels2.HdDepositTmp edit = mpdb2.HdDepositTmp.FirstOrDefault(m => m.SnNo == SnNo);
|
|
if(edit != null)
|
|
if(edit != null)
|