|
@@ -349,13 +349,20 @@ namespace MySystem
|
|
|
decimal DepositAmt = decimal.Parse(function.CheckNum(pos.SeoKeyword));
|
|
|
if (pos.DownFeeFlag == 1)
|
|
|
{
|
|
|
- if (pos.DownFee == 0.6M)
|
|
|
+ if(pos.BrandId == 12 || pos.BrandId == 13)
|
|
|
{
|
|
|
MerHelpFlag = 3;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- MerHelpFlag = 2;
|
|
|
+ if (pos.DownFee == 0.6M)
|
|
|
+ {
|
|
|
+ MerHelpFlag = 3;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ MerHelpFlag = 2;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
else if ((DepositAmt > 0 && pos.IsFirst == 1) || pos.BrandId == 14)
|
|
@@ -370,6 +377,10 @@ namespace MySystem
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if((pos.BrandId == 12 || pos.BrandId == 13) && pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0)
|
|
|
+ {
|
|
|
+ MerHelpFlag = 2;
|
|
|
+ }
|
|
|
if((pos.BrandId == 10 || pos.BrandId == 11) && trade.TradeType == "T015" && MerHelpFlag == 1)
|
|
|
{
|
|
|
MerHelpFlag = 0;
|