联动补全名称

AppStart/Helper/AlipayPayBack2Service.cs

@@ -567,7 +567,7 @@ namespace MySystem
                                     if(puser.LeaderLevel > 0)
                                     {
                                         UserAccount acccount = db.UserAccount.FirstOrDefault(m => m.Id == puser.Id) ?? new UserAccount();
-                                        if(acccount.LeaderReserve >= order.TotalPrice && !buyPrize)
+                                        if(acccount.LeaderReserve >= 400 * pro.ProductCount && !buyPrize)
                                         {
                                             //购机奖励
                                             OpAccount(db, order, puser.Id, 100, pro.ProductCount);
@@ -583,7 +583,7 @@ namespace MySystem
                                             OncePrizeFlag4 = false;
                                         }
                                         //如果是大盟主，则标记大盟主标签
-                                        if(couponIds.Count > 0 && puser.LeaderLevel == 2 && acccount.LeaderReserve >= order.TotalPrice && !bigLeaderPrize)
+                                        if(couponIds.Count > 0 && puser.LeaderLevel == 2 && acccount.LeaderReserve >= 400 * pro.ProductCount && !bigLeaderPrize)
                                         {
                                             foreach(int couponId in couponIds)
                                             {

AppStart/Helper/SycnSpServer/SycnSpTradeService.cs

@@ -205,6 +205,7 @@ namespace MySystem
                                             if(merchant != null)
                                             {
                                                 bool flag = false;
+                                                if(function.CheckNull(merchant.MerchantName).Contains("*")) merchant.MerchantName = trade.MerName;
                                                 if(string.IsNullOrEmpty(merchant.MerIdcardNo) && !string.IsNullOrEmpty(trade.Field2))
                                                 {
                                                     merchant.MerIdcardNo = trade.Field2.ToUpper(); //商户身份证号