|
@@ -492,10 +492,16 @@ namespace MySystem
|
|
|
if(MerHelpFlag == 2) Version = 1;
|
|
if(MerHelpFlag == 2) Version = 1;
|
|
|
if(MerHelpFlag == 3) Version = 2;
|
|
if(MerHelpFlag == 3) Version = 2;
|
|
|
//盒易付和来客吧电签，稳定期自动转到稳定期A
|
|
//盒易付和来客吧电签，稳定期自动转到稳定期A
|
|
|
- if((pos.BrandId == 12 || pos.BrandId == 13 || pos.BrandId == 15) && MerHelpFlag == 0 && Version == 0)
|
|
|
|
|
|
|
+ if((pos.BrandId == 12 || pos.BrandId == 13) && MerHelpFlag == 0 && Version == 0)
|
|
|
{
|
|
{
|
|
|
Version = 1;
|
|
Version = 1;
|
|
|
}
|
|
}
|
|
|
|
|
+ //如果是吱客宝，直接稳定期
|
|
|
|
|
+ if(pos.BrandId == 17)
|
|
|
|
|
+ {
|
|
|
|
|
+ MerHelpFlag = 0;
|
|
|
|
|
+ Version = 0;
|
|
|
|
|
+ }
|
|
|
decimal SettleFee = trade.SettleFee * 100;
|
|
decimal SettleFee = trade.SettleFee * 100;
|
|
|
PxcModels.TradeRecord add = db.TradeRecord.Add(new PxcModels.TradeRecord()
|
|
PxcModels.TradeRecord add = db.TradeRecord.Add(new PxcModels.TradeRecord()
|
|
|
{
|
|
{
|
