1

REBORN.Module.CommissionModule/MergeCommissionModule2.cs

@@ -216,6 +216,12 @@ namespace REBORN.Module.CommissionModule
                         //赋默认值
                         opcList.FirstOrDefault().CommissionRate = ruleOrderModel?.OPRate ?? 0;
                     }
+                    var opvList = RModel.AppointOPInfoList.Where(x => x.OPType == 1).ToList();
+                    if (opvList.Any() && !opvList.Any(x => x.CommissionRate > 0))
+                    {
+                        //赋默认值
+                        opvList.FirstOrDefault().CommissionRate = ruleOrderModel?.VisaRate ?? 0;
+                    }
                 }
             }
             else if (orderType == (int)Common.Enum.ResourceTypeEnum.SingleTicket)
@@ -1393,6 +1399,12 @@ namespace REBORN.Module.CommissionModule
                                 //赋默认值
                                 opcList.FirstOrDefault().CommissionRate = ruleOrderModel?.OPRate ?? 0;
                             }
+                            var opvList = item.AppointOPList.Where(x => x.OPType == 1).ToList();
+                            if (opvList.Any() && !opvList.Any(x => x.CommissionRate > 0))
+                            {
+                                //赋默认值
+                                opvList.FirstOrDefault().CommissionRate = ruleOrderModel?.VisaRate ?? 0;
+                            }
                         }
                         //销售
                         if (item.SaleRate > 0)
@@ -1418,6 +1430,17 @@ namespace REBORN.Module.CommissionModule
                             DetailList.Add(smodel);
                             if (smodel.Rate <= 0) { errMsg += item.OrderId + "单船票OP提成比例小于0"; }
                         }
+                        //签证
+                        foreach (var citem in item.AppointOPList.Where(x => x.OPType == 1))
+                        {
+                            var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
+                            smodel.UserId = citem.OPId;
+                            smodel.Rate = citem.CommissionRate;
+                            smodel.CommissionMoney = Math.Round(smodel.OrderProfit * smodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
+                            smodel.RoleType = 3;
+                            DetailList.Add(smodel);
+                            if (smodel.Rate <= 0) { errMsg += item.OrderId + "单船票签证提成比例小于0"; }
+                        }
                         //负责人
                         if (item.ManagerRate > 0 && item.ManagerId>0)
                         {

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -4123,6 +4123,12 @@ namespace REBORN.Module.SellModule
                                 //赋默认值
                                 opcList.FirstOrDefault().CommissionRate = ruleOrderModel?.OPRate ?? 0;
                             }
+                            var opvList = item.AppointOPList.Where(x => x.OPType == 1).ToList();
+                            if (opvList.Any() && !opvList.Any(x => x.CommissionRate > 0))
+                            {
+                                //赋默认值
+                                opvList.FirstOrDefault().CommissionRate = ruleOrderModel?.VisaRate ?? 0;
+                            }
                         }
                     }
                     #endregion

REBORN.Services.SellService/CustomerOrderService.cs

@@ -1718,7 +1718,8 @@ namespace REBORN.Services.SellService
                 OrderGuestList = x.OrderGuestList.Select(subItem => new { GuestId = subItem.Id, subItem?.Remarks, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.OrderId, Name = subItem?.Name ?? "", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone }),
                 // OrderGuestList = x.OrderGuestList?.Select(z => new { PassportIssued = StringHelper.FormatDate(z?.PassportIssued), PassportExpiry = StringHelper.FormatDate(z?.PassportExpiry), IdCard = z?.IdCard ?? "", Name = z?.Name ?? "", Tel = z?.Tel ?? "", PassportNo = z?.PassportNo ?? "", Birthday = StringHelper.FormatDate(z.Birthday) }),
                 SupplierModel = new { SupplierId = x?.SupplierModel?.ID ?? 0, SupplierName = x?.SupplierModel?.Name ?? "", Tel = x?.SupplierModel?.Tel ?? "", Contact = x?.SupplierModel?.Contact ?? "", CompanyName = x?.SupplierModel?.CompanyName ?? "", DutyParagraph = x?.SupplierModel?.DutyParagraph ?? "", CompanyPhone = x?.SupplierModel?.CompanyPhone ?? "", OpeningBank = x?.SupplierModel?.OpeningBank ?? "", BankNo = x?.SupplierModel?.BankNo ?? "" },
-                AppointOPList = x.AppointOPList?.Select(z => new { z.OPId, OPName = CacheManager.User.RbUserCache.GetUserLoginInfo(z.OPId.ToString())?.emName ?? "", z.CommissionRate, z.CommissionMoney }),
+                AppointOPList = x.AppointOPList?.Where(z => z.OPType == 0).Select(z => new { z.OPId, OPName = CacheManager.User.RbUserCache.GetUserLoginInfo(z.OPId.ToString())?.emName ?? "", z.CommissionRate, z.CommissionMoney }),
+                AppointVisaList = x.AppointOPList?.Where(z => z.OPType == 1).Select(z => new { z.OPId, OPName = CacheManager.User.RbUserCache.GetUserLoginInfo(z.OPId.ToString())?.emName ?? "", z.CommissionRate, z.CommissionMoney }),
             });
             return ApiResult.Success("", pmodel);
         }