Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Common/Plugin/HttpHelper.cs

@@ -566,7 +566,8 @@ namespace Mall.Common.Plugin
             g.DrawImage(imgBack, 0, 0, imgBack.Width, imgBack.Height);   //g.DrawImage(imgBack, 0, 0, 相框宽, 相框高);
                                                                          //g.FillRectangle(System.Drawing.Brushes.White, imgBack.Width / 2 - img.Width / 2 - 1, imgBack.Width / 2 - img.Width / 2 - 1,1,1);//相片四周刷一层黑色边框
                                                                          //g.DrawImage(img, 照片与相框的左边距, 照片与相框的上边距, 照片宽, 照片高);
-            g.DrawImage(img, imgBack.Width / 2 - Size / 2, imgBack.Width / 2 - Size / 2, Size, Size);
+            Size = imgBack.Width / 2;
+            g.DrawImage(img, imgBack.Width / 2 - (Size / 2) + 5, imgBack.Width / 2 - (Size / 2) + 5, Size - 10, Size - 10);
             GC.Collect();
             return imgBack;
         }

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -14,6 +14,10 @@ namespace Mall.Model.Extend.Product
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Goods_Order_Extend : RB_Goods_Order
     {
+        /// <summary>
+        /// 赠送的会员等级
+        /// </summary>
+        public int PresentFXGrade { get; set; }
         /// <summary>
         /// 公司id
         /// </summary>

Mall.Module.Product/OrderModule.cs

@@ -704,7 +704,9 @@ namespace Mall.Module.Product
                 foreach (var item in list)
                 {
                     item.DetailList = dlist.Where(x => x.OrderId == item.OrderId).ToList();
-
+                    if (item.DetailList.Where(x => x.PresentFXGrade > 0).Any()) {
+                        item.PresentFXGrade = 1;
+                    }
                     item.DistrictAddress = (arealist.Where(x => x.ID == item.Province).FirstOrDefault()?.Name ?? "") + " " + (arealist.Where(x => x.ID == item.City).FirstOrDefault()?.Name ?? "") + " " + (arealist.Where(x => x.ID == item.District).FirstOrDefault()?.Name ?? "");
                 }
             }
@@ -766,6 +768,9 @@ namespace Mall.Module.Product
                     {
                         item.IsApplyForAfterSale = 1;
                     }
+                    if (item.PresentFXGrade > 0) {
+                        model.PresentFXGrade = 1;
+                    }
                 }
             }
             model.DetailList = dlist;
@@ -855,7 +860,8 @@ namespace Mall.Module.Product
                 }),
                 model.IsApplyForCancel,
                 model.RejectRemark,
-                model.IsCanApplyForAfterSale
+                model.IsCanApplyForAfterSale,
+                model.PresentFXGrade
             });
         }
 
@@ -9369,8 +9375,8 @@ namespace Mall.Module.Product
             var ssList = smallShops_CommissionRepository.GetList(new RB_SmallShops_Commission_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
             if (ssList.Any())
             {
-                var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserIds = string.Join(",", introductList.Select(x => x.UserId).Distinct()) });
-                var slist = smallShops_InfoRepository.GetListForSingle(new RB_SmallShops_Info_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserIds = string.Join(",", introductList.Select(x => x.UserId).Distinct()) });
+                var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserIds = string.Join(",", ssList.Select(x => x.UserId).Distinct()) });
+                var slist = smallShops_InfoRepository.GetListForSingle(new RB_SmallShops_Info_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, UserIds = string.Join(",", ssList.Select(x => x.UserId).Distinct()) });
                 foreach (var item in ulist)
                 {
                     decimal Commission = ssList.Where(x => x.UserId == item.Id).Sum(x => x.Commission ?? 0);

Mall.Module.User/UserModule.cs

@@ -5592,7 +5592,7 @@ namespace Mall.Module.User
             int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
             if (IsNormalServer != 1)
             {
-                token = "36_h7IHGhiGidxjkK2dBvc-H_9EEfB9vkzOWrB0NqY6NDtvEvZm8yAQS7HaeT4qBfNETZBYWxTNr3yiBAGmyZuS6dakDmsRz_HzgflabycgFBpL3vutNhLzul77OCjFAaK3vTqXXbR5hUY5MRXIAAXaAIASSP";
+                token = "36_k9Yprh3EpK1OlRt5a23mjp-WXLUjDzV6Vn8qiyb3ppbsXqhIaAQo5ibLi9xh1fxxRTVPvdplYVawG-TIzxw1x32pB-fhfX7cFYs2LSpKgnn7Nk64a4bDvdKPofHCG7WzlDRTryJhtTufhquTWDEaAIACJK";
             }
             if (string.IsNullOrEmpty(token))
             {
@@ -5613,7 +5613,7 @@ namespace Mall.Module.User
                 string path_server = basepath + "\\upfile\\temporary\\" + pathName;
                 #region 微店头像
                 var ssmodel = smallShopsInfoRepository.GetListForSingle(new RB_SmallShops_Info_Extend() { MallBaseId = mallBaseId, UserId = userId }).FirstOrDefault();
-                string ssPhoto = ssmodel?.Photo ?? "";
+                string ssPhoto = ssmodel?.Logo ?? "";
                 #endregion
                 var Robj = HttpHelper.HttpPostForGetWXQRCodePathSmallShops(GetImageUrl, JsonHelper.Serialize(postData), path_server, ssPhoto);
 

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -257,6 +257,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 OrderStatusName = x.OrderStatus.GetEnumName(),
                 x.TenantId,
                 x.MallBaseId,
+                x.PresentFXGrade,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
             return ApiResult.Success("", pagelist);