|
|
@@ -788,12 +788,12 @@ namespace MySystem
|
|
|
if(GetUserId < 1) return;
|
|
|
string MerNo = merchant.KqMerNo;
|
|
|
//判断商户号是否为空,避免下次再有空商户的情况,导致奖励不发放
|
|
|
- if(string.IsNullOrEmpty(MerNo) && (pos.BrandId < 23 || pos.BrandId > 26))
|
|
|
- {
|
|
|
- // MerNo = "n" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
|
|
|
- RedisDbconn.Instance.AddList("ActiveRewardFailQueue", "{\"PosId\":\"" + pos.Id + "\",\"UserId\":\"" + GetUserId + "\",\"ActPrize\":\"" + ActPrize + "\",\"ChangeType\":\"" + ChangeType + "\",\"ActType\":\"" + ActType + "\"}");
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if(string.IsNullOrEmpty(MerNo) && (pos.BrandId < 23 || pos.BrandId > 26))
|
|
|
+ // {
|
|
|
+ // // MerNo = "n" + DateTime.Now.ToString("yyyyMMddHHmmssfff");
|
|
|
+ // RedisDbconn.Instance.AddList("ActiveRewardFailQueue", "{\"PosId\":\"" + pos.Id + "\",\"UserId\":\"" + GetUserId + "\",\"ActPrize\":\"" + ActPrize + "\",\"ChangeType\":\"" + ChangeType + "\",\"ActType\":\"" + ActType + "\"}");
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
List<int> BrandIds = new List<int>();
|
|
|
BrandIds.Add(18);
|
|
|
BrandIds.Add(19);
|