解决冲突

Mall.Common/API/ApiResult.cs

@@ -27,6 +27,13 @@ namespace Mall.Common.API
         /// </summary>
         public string couponMessage { get; set; }
 
+
+        /// <summary>
+        /// 0-一般，1-优惠券，2-积分
+        /// </summary>
+        public int msgType { get; set; }
+
+
         /// <summary>
         /// 返回数据
         /// </summary>
@@ -56,27 +63,54 @@ namespace Mall.Common.API
         }
 
         /// <summary>
-        /// 优惠券领取请求成功
+        /// 优惠券领取/积分获取请求成功
         /// </summary>
-        /// <param name="message">提示信息</param>
-        /// <param name="data">返回数据</param>
+        /// <param name="couponResultCode"></param>
+        /// <param name="msgType">0-其他，1-优惠券，2-积分</param>
+        /// <param name="message"></param>
+        /// <param name="couponMessage"></param>
+        /// <param name="data"></param>
         /// <returns></returns>
-        public static ApiResult CouponSuccess(ResultCode couponResultCode = ResultCode.Success, string message = null, string couponMessage = null, object data = null)
+        public static ApiResult CouponSuccess(ResultCode couponResultCode = ResultCode.Success, int msgType = 0, string message = null, string couponMessage = null, object data = null)
         {
-            return new ApiResult() { resultCode = (int)ResultCode.Success, message = message ?? "操作成功！", couponResultCode = (int)couponResultCode, couponMessage = couponMessage ?? "优惠券领取成功！", data = data };
+            return new ApiResult() { resultCode = (int)ResultCode.Success, message = message ?? "操作成功！", msgType = msgType, couponResultCode = (int)couponResultCode, couponMessage = couponMessage ?? "优惠券领取成功！", data = data };
         }
 
-
         /// <summary>
         /// 优惠券领取请求失败
         /// </summary>
-        /// <param name="message">提示信息</param>
-        /// <param name="data">返回数据</param>
+        /// <param name="couponResultCode"></param>
+        /// <param name="msgType">0-其他，1-优惠券，2-积分</param>
+        /// <param name="message"></param>
+        /// <param name="couponMessage"></param>
+        /// <param name="data"></param>
         /// <returns></returns>
-        public static ApiResult CouponFailed(ResultCode couponResultCode = ResultCode.Success, string message = null, string couponMessage = null, object data = null)
+        public static ApiResult CouponFailed(ResultCode couponResultCode = ResultCode.Success, int msgType = 0, string message = null, string couponMessage = null, object data = null)
         {
-            return new ApiResult { resultCode = (int)ResultCode.Fail, message = message ?? "操作失败！",  couponResultCode = (int)couponResultCode, couponMessage = couponMessage ?? "优惠券领取成功！", data = data };
+            return new ApiResult { resultCode = (int)ResultCode.Fail, message = message ?? "操作失败！", msgType = msgType, couponResultCode = (int)couponResultCode, couponMessage = couponMessage ?? "优惠券领取成功！", data = data };
         }
+        ///// <summary>
+        ///// 优惠券领取请求成功
+        ///// </summary>
+        ///// <param name="message">提示信息</param>
+        ///// <param name="data">返回数据</param>
+        ///// <returns></returns>
+        //public static ApiResult IntegralSuccess(ResultCode integralResultCode = ResultCode.Success, string message = null, string integralMessage = null, string couponMessage = null, object data = null)
+        //{
+        //    return new ApiResult() { resultCode = (int)ResultCode.Success, message = message ?? "操作成功！", integralResultCode = (int)integralResultCode, integralMessage = integralMessage ?? "积分获取成功！", couponResultCode = (int)ResultCode.Success, couponMessage = couponMessage ?? "操作成功！", data = data };
+        //}
+
+
+        ///// <summary>
+        ///// 优惠券领取请求失败
+        ///// </summary>
+        ///// <param name="message">提示信息</param>
+        ///// <param name="data">返回数据</param>
+        ///// <returns></returns>
+        //public static ApiResult IntegralFailed(ResultCode integralResultCode = ResultCode.Success, string message = null, string integralMessage = null, string couponMessage = null, object data = null)
+        //{
+        //    return new ApiResult { resultCode = (int)ResultCode.Fail, message = message ?? "操作失败！", integralResultCode = (int)integralResultCode, integralMessage = integralMessage ?? "积分获取失败！", couponResultCode = (int)integralResultCode, couponMessage = couponMessage ?? "操作失败！", data = data };
+        //}
 
 
         /// <summary>

Mall.Common/Enum/MarketingCenter/TriggerTypeEnum.cs

@@ -6,7 +6,7 @@ using System.Text;
 namespace Mall.Common.Enum.MarketingCenter
 {
     /// <summary>
-    /// 触发事件，1-分享，2-购买并付款，3-新人领券
+    /// 触发事件，1-分享，2-购买并付款，3-新人领券，4-新人购买并付款
     /// </summary>
     public enum TriggerTypeEnum
     {
@@ -24,7 +24,12 @@ namespace Mall.Common.Enum.MarketingCenter
         /// 新人领券
         /// </summary>
         [EnumField("新人领券")]
-        NewMemer = 3
+        NewMemer = 3,
+        /// <summary>
+        /// 新人购买并付款
+        /// </summary>
+        [EnumField("新人购买并付款")]
+        NewMemerBuyAndPay = 4
 
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -339,5 +339,11 @@ namespace Mall.Model.Entity.Product
         /// 保险成本价格
         /// </summary>
         public decimal? InsuranceCostMoney { get; set; }
+
+
+        /// <summary>
+        /// 评论返积分
+        /// </summary>
+        public int CommentGiveIntegral { get; set; }
     }
 }

Mall.Model/Entity/Property/RB_ERP_Authorize.cs

@@ -75,5 +75,11 @@ namespace Mall.Model.Entity.Property
         /// </summary>
         public int ERPGroupId { get; set; }
 
+
+        /// <summary>
+        /// 是否推送IM消息 0-否，1-是
+        /// </summary>
+        public int IsSendIMMsg { get; set; }
+
     }
 }

Mall.Model/Entity/User/RB_Member_DiscountCoupon.cs

@@ -103,7 +103,7 @@ namespace Mall.Model.Entity.User
 
 
         /// <summary>
-        /// 领取方式0-自行领取（领劵中心领取），1-分享，2-购买并付款，3-新人领取
+        /// 领取方式0-自行领取（领劵中心领取），1-分享，2-购买并付款，3-新人领取,4-新人购买并付款
         /// </summary>
         public new int GetType { get; set; }
 

Mall.Model/Extend/MarketingCenter/RB_DiscountCoupon_Extend.cs

@@ -48,6 +48,10 @@ namespace Mall.Model.Extend.MarketingCenter
         public int[] MemberLevelList { get; set; }
 
 
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public int OrderId { get; set; }
 
 
         /// <summary>

Mall.Model/Extend/Property/RB_ERP_Authorize_Extend.cs

@@ -23,5 +23,7 @@ namespace Mall.Model.Extend.Property
         /// 电商员工信息
         /// </summary>
         public string MallUserName { get; set; }
+
+        public string Ids { get; set; }
     }
 }

Mall.Module.MarketingCenter/CouponModule.cs

@@ -911,8 +911,8 @@ namespace Mall.Module.MarketingCenter
                                 Status = 0,
                                 CreateDate = System.DateTime.Now,
                                 UserId = model.UserId,
-                                Description = item.TriggerType == 1 ? "分享自动发放优惠券" : (item.TriggerType == 2 ? "购买并付款自动发放优惠券" : "新人领劵自动发放优惠券"),
-                                Remarks = item.TriggerType == 1 ? "分享" : (item.TriggerType == 2 ? "购买并付款" : "新人领劵"),
+                                Description = item.TriggerType == 1 ? "分享自动发放优惠券" : (item.TriggerType == 2 ? "购买并付款自动发放优惠券" :(item.TriggerType == 3 ? "新人领劵自动发放优惠券": "新人购买并付款自动发放优惠券")),
+                                Remarks = item.TriggerType == 1 ? "分享" : (item.TriggerType == 2 ? "购买并付款" : (item.TriggerType == 3? "新人领劵": "新人购买并付款")),
                                 UseState = 0,
                                 CouponId = item.ID,
                                 StartDate = item.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon ? System.DateTime.Now : item.StartDate,

Mall.Module.Product/GuideCarModule.cs

@@ -203,7 +203,10 @@ namespace Mall.Module.Product
         /// </summary>
         private RB_GuideCar_CarBrandRepository carBrandRepository = new RB_GuideCar_CarBrandRepository();
 
-
+        /// <summary>
+        /// 用户积分
+        /// </summary>
+        private readonly RB_Member_IntegralRepository member_IntegralRepository = new RB_Member_IntegralRepository();
 
 
         #region 基础配置
@@ -1654,6 +1657,16 @@ namespace Mall.Module.Product
                     Integral = Convert.ToInt32(Math.Floor((model.SellingPrice ?? 0) * (model.IntegralPresent ?? 0) / 100));
                 }
             }
+
+            int CommentIntegral = 0;
+            if (model.IntegralComment > 0)
+            {
+                CommentIntegral = model.IntegralComment ?? 0;
+                if (model.IntegralCommentType == 2)
+                {
+                    CommentIntegral = Convert.ToInt32(Math.Floor((model.SellingPrice ?? 0) * (model.IntegralComment ?? 0) / 100));
+                }
+            }
             #endregion
 
             #region 会员价格
@@ -1829,7 +1842,11 @@ namespace Mall.Module.Product
                         integral = new
                         {
                             title = Integral > 0 ? "购买可得" + Integral + "积分" : ""
-                        }
+                        },
+                        commentIntegral = new
+                         {
+                             title = CommentIntegral > 0 ? "购买并评论可得" + Integral + "积分" : ""
+                         }
                     },
                     extra_quick_share = new
                     {
@@ -3794,8 +3811,10 @@ namespace Mall.Module.Product
             }
             //查询订单明细
             var dlist = goods_OrderDetailRepository.GetGuideCarOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
-
-
+            foreach (var item in dlist)
+            {
+                item.CoverImagePath = item.CoverImage;
+            }
             model.DetailList = dlist;
             //地址
             model.DistrictAddress = (destinationRepository.GetEntity(model.Province)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.City)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.District)?.Name ?? "");
@@ -3972,5 +3991,33 @@ namespace Mall.Module.Product
 
 
         #endregion
+
+        #region
+        /// <summary>
+        /// 获取订单明细实体
+        /// </summary>
+        /// <param name="OrderId"></param>
+        /// <returns></returns>
+        public RB_Goods_OrderDetail_Extend GetOrderDetailInfo(int OrderId)
+        {
+            return goods_OrderDetailRepository.GetEntity(OrderId).RefMapperTo<RB_Goods_OrderDetail_Extend>();
+        }
+
+
+        /// <summary>
+        /// 订单评论返积分
+        /// </summary>
+        /// <param name="memberIntegralModel"></param>
+        /// <returns></returns>
+        public bool AddMemberIntegral(Model.Entity.User.RB_Member_Integral memberIntegralModel)
+        {
+            if (memberIntegralModel.Id == 0)
+            {
+                return member_IntegralRepository.Insert(memberIntegralModel) > 0;
+            }
+            return false;
+
+        }
+        #endregion
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -234,7 +234,7 @@ namespace Mall.Module.Product
         /// <param name="demodel"></param>
         /// <param name="IsGetShare">1-获取分销佣金</param>
         /// <returns></returns>
-        public List<RB_Goods_Extend> GetAppletGoodsPageListForZY(int pageIndex, int pageSize, out long count, RB_Goods_Extend demodel,int IsGetShare=0)
+        public List<RB_Goods_Extend> GetAppletGoodsPageListForZY(int pageIndex, int pageSize, out long count, RB_Goods_Extend demodel, int IsGetShare = 0)
         {
             var list = goodsRepository.GetAppletGoodsPageList(pageIndex, pageSize, out count, demodel);
             if (list.Any())
@@ -2174,6 +2174,15 @@ namespace Mall.Module.Product
                     Integral = Convert.ToInt32(Math.Floor((model.SellingPrice ?? 0) * (model.IntegralPresent ?? 0) / 100));
                 }
             }
+            int CommentIntegral = 0;
+            if (model.IntegralComment > 0)
+            {
+                CommentIntegral = model.IntegralComment ?? 0;
+                if (model.IntegralCommentType == 2)
+                {
+                    CommentIntegral = Convert.ToInt32(Math.Floor((model.SellingPrice ?? 0) * (model.IntegralComment ?? 0) / 100));
+                }
+            }
             #endregion
 
             #region 赠送vip会员
@@ -2406,6 +2415,10 @@ namespace Mall.Module.Product
                         {
                             title = Integral > 0 ? "购买可得" + Integral + "积分" : ""
                         },
+                        commentIntegral = new
+                        {
+                            title = CommentIntegral > 0 ? "购买并评论可得" + Integral + "积分" : ""
+                        },
                         PresentFXGradeMsg
                     },
                     //plugin_extra = new List<object>(),
@@ -2437,7 +2450,7 @@ namespace Mall.Module.Product
                         x.CategoryId,
                         x.CategoryName
                     }),
-                    video_type=model.VideoType,
+                    video_type = model.VideoType,
                 },
                 delivery = ""
             };
@@ -6937,5 +6950,17 @@ namespace Mall.Module.Product
             return freeShippingRepository.GetFreeShippingListByCategoryIds(query);
         }
         #endregion
+
+        #region 根据订单状态获取订单信息
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Order_Extend> GetOrderListByOrderStatus(RB_Goods_Order_Extend dmodel)
+        {
+            return goods_OrderRepository.GetOrderListByOrderStatus(dmodel);
+        }
+        #endregion
     }
 }

Mall.Module.Property/AuthorizeModule.cs

@@ -113,7 +113,27 @@ namespace Mall.Module.Property
             }
             return false;
         }
+        /// <summary>
+        /// 更新是否授权发送IM消息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateSendIMMsg(RB_ERP_Authorize_Extend model)
+        {
 
+            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                              { nameof(RB_ERP_Authorize.IsSendIMMsg),model.IsSendIMMsg},
+                           { nameof(RB_ERP_Authorize.UpdateDate),model.UpdateDate}
+                };
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_ERP_Authorize.ID),
+                              FiledValue=model.Ids,
+                               OperatorEnum=OperatorEnum.IN
+                        }
+                    };
+            return authorizeRepository.Update(keyValues, wheres);
+        }
 
         #endregion
 

Mall.Repository/MarketingCenter/RB_DiscountCouponRepository.cs

@@ -227,7 +227,8 @@ SELECT a.ID as MemberCouponId,a.UserId,b.`Name`,b.CouponType,b.UseType,b.MinCons
                     where += $" AND ( a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}={query.SmallShopId} or ( a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}=0 and a.{nameof(RB_DiscountCoupon_Extend.IsZanYangUse)}=0))";
 
                 }
-                else { 
+                else
+                {
                     where += $" AND a.{nameof(RB_DiscountCoupon_Extend.SmallShopId)}=0";
                 }
             }
@@ -317,7 +318,6 @@ on a.CouponId=b.ID {where} ";
         {
             StringBuilder builder = new StringBuilder();
             string userWhere = "";
-            // builder.Append(@$" SELECT a.*,b.TriggerType,b.GrantNum from rb_coupon_selfmotion as b LEFT JOIN {TableName} as a on a.ID=b.DiscountCouponId  WHERE a.{nameof(RB_DiscountCoupon_Extend.Status)}=0 and b.`Status`=0  and (a.IndateType=1 or (a.IndateType=2  and a.StartDate<NOW() and a.EndDate>NOW()))");
             if (query != null)
             {
 

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -139,6 +139,50 @@ where {where} group by o.OrderId order by o.CreateDate desc";
             return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
         }
 
+
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Goods_Order_Extend> GetOrderListByOrderStatus(RB_Goods_Order_Extend dmodel)
+        {
+            string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0 and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.OrderId > 0)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderId)}={dmodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.OrderIds))
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderId)} in({dmodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.orderNos))
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} in({dmodel.orderNos})";
+            }
+
+            string sql = $@"SELECT o.* FROM rb_goods_order o
+where {where} group by o.OrderId asc";
+            return Get<RB_Goods_Order_Extend>(sql).ToList();
+        }
+
+
+
+
         /// <summary>
         /// 获取列表
         /// </summary>

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

@@ -636,8 +636,6 @@ namespace Mall.WebApi.Controllers.MarketingCenter
             }
             else
             {
-
-
                 if (query.ID == 0)
                 {
                     query.CreateDate = System.DateTime.Now;

Mall.WebApi/Controllers/Product/AppletGCOrderController.cs

@@ -161,7 +161,42 @@ namespace Mall.WebApi.Controllers.Product
             }
 
             bool flag = guideCarModule.SetGoodsCommentInfo(list);
-            if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
+            if (flag)
+            {
+                var demodel = list.FirstOrDefault();
+                var dmodel = guideCarModule.GetOrderDetailInfo(demodel.OrderDetailId ?? 0);
+                if (dmodel != null && dmodel.CommentGiveIntegral > 0 && demodel.UserId > 0)
+                {
+                    Model.Entity.User.RB_Member_Integral memberIntegralModel = new Model.Entity.User.RB_Member_Integral
+                    {
+                        UserId = demodel.UserId,
+                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
+                        PlatformType = demodel.PlatformSource,
+                        Integral = dmodel.CommentGiveIntegral,
+                        Description = "评论赠送" + dmodel.CommentGiveIntegral + "积分",
+                        TenantId = demodel.TenantId,
+                        MallBaseId = demodel.MallBaseId,
+                        Remarks = "评论商品" + dmodel.GoodsName + "赠送" + dmodel.CommentGiveIntegral + "积分",
+                        CreateDate = demodel.CreateDate,
+                        OrderId = dmodel.OrderId
+                    };
+                    bool integralResult = guideCarModule.AddMemberIntegral(memberIntegralModel);
+                    if (integralResult)
+                    {
+                        return ApiResult.CouponSuccess(ResultCode.Success, 2, "", dmodel.CommentGiveIntegral.ToString());
+                    }
+                    else
+                    {
+                        return ApiResult.CouponSuccess(ResultCode.Fail, 2, "", "");
+                    }
+                }
+
+                return ApiResult.CouponSuccess(ResultCode.Fail, 2, "", "");
+
+
+            }
+            else { return ApiResult.CouponFailed(ResultCode.Fail, 2, "", ""); }
+            // if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
         }
 
 

Mall.WebApi/Controllers/Product/AppletGuideCarController.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
 using Mall.Common.API;
 using Mall.Common.Plugin;
@@ -426,6 +427,29 @@ namespace Mall.WebApi.Controllers.Product
             });
         }
 
+        /// <summary>
+        /// 根据地址获取经纬度
+        /// </summary>
+        /// <param name="requestMsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetLngAndLat(object requestMsg)
+        {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            JObject prams = JObject.Parse(req.msg.ToString());
+            string address = prams.GetStringValue("Address");
+            var array = Common.Plugin.HttpHelper.GetGeocoderLatitude(address);
+            if (array[0] != "" && array[1] != "")
+            {
+                return ApiResult.Success("", new { lng = array[0], lat = array[1] });
+            }
+            else
+            {
+                return ApiResult.Failed("获取地址错误");
+            }
+        }
+
+
         #endregion
 
         #region 订单信息

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -539,7 +539,7 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("接送地址不能为空");
             }
-            if (!demodel.TripSTime.HasValue) 
+            if (!demodel.TripSTime.HasValue)
             {
                 return ApiResult.ParamIsNull("请传递出发时间");
             }
@@ -695,14 +695,12 @@ namespace Mall.WebApi.Controllers.MallBase
         {
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
-            var FinanceId = parms.GetInt("FinanceId", 0);
             RB_Goods_Order_Extend extModel = new RB_Goods_Order_Extend()
             {
-                OrderId=parms.GetInt("OrderId"),
-                MerchantsNo=parms.GetStringValue("MerchantsNo"),
-                OrderStatus= OrderStatusEnum.WaitSendGoods,
-                PaymentTime=DateTime.Now,
-                Fee=parms.GetDecimal("Fee"),
+                OrderId = parms.GetInt("OrderId"),
+                MerchantsNo = parms.GetStringValue("MerchantsNo"),
+                OrderStatus = OrderStatusEnum.WaitSendGoods,
+                PaymentTime = DateTime.Now,
             };
 
             RB_Goods_Online_Trade_Extend tradeModel = new RB_Goods_Online_Trade_Extend()
@@ -729,7 +727,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 TenantId = 1,
                 CreateDate = DateTime.Now,
             };
-            bool flag = orderModule.UpdateERPGoodsOrderInfoModule(extModel, tradeModel,FinanceId:FinanceId);
+            bool flag = orderModule.UpdateERPGoodsOrderInfoModule(extModel, tradeModel);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
@@ -798,10 +796,12 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull();
             }
             var omodel = orderModule.GetOrderInfo(OrderId);
-            if (omodel == null) {
+            if (omodel == null)
+            {
                 return ApiResult.Failed("订单不存在");
             }
-            if (omodel.OrderClassify == 1) {
+            if (omodel.OrderClassify == 1)
+            {
                 //验证可提前取消时间
                 string msg = orderModule.ValidateSDOrderCanCancel(omodel);
                 if (msg != "")
@@ -1085,7 +1085,8 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetAppletGoodsWaitCommentPageList() {
+        public ApiResult GetAppletGoodsWaitCommentPageList()
+        {
             var parms = RequestParm;
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
@@ -1193,7 +1194,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 demodel.CommentGrade = Common.Enum.Goods.GoodsCommentTypeEnum.Medium;
             }
-            else if (demodel.CommentScore == 1) {
+            else if (demodel.CommentScore == 1)
+            {
                 demodel.CommentGrade = Common.Enum.Goods.GoodsCommentTypeEnum.Negative;
             }
 
@@ -1214,7 +1216,41 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UpdateDate = DateTime.Now;
 
             bool flag = orderModule.SetGoodsCommentInfo(demodel);
-            if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
+            if (flag)
+            {
+
+                var dmodel = orderModule.GetOrderDetailInfo(demodel.OrderDetailId ?? 0);
+                if (dmodel != null && dmodel.CommentGiveIntegral > 0 && demodel.UserId > 0)
+                {
+                    Model.Entity.User.RB_Member_Integral memberIntegralModel = new Model.Entity.User.RB_Member_Integral
+                    {
+                        UserId = demodel.UserId,
+                        Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
+                        PlatformType = demodel.PlatformSource,
+                        Integral = dmodel.CommentGiveIntegral,
+                        Description = "评论赠送" + dmodel.CommentGiveIntegral + "积分",
+                        TenantId = demodel.TenantId,
+                        MallBaseId = demodel.MallBaseId,
+                        Remarks = "评论商品" + dmodel.GoodsName + "赠送" + dmodel.CommentGiveIntegral + "积分",
+                        CreateDate = demodel.CreateDate,
+                        OrderId = dmodel.OrderId
+                    };
+                    bool integralResult = orderModule.AddMemberIntegral(memberIntegralModel);
+                    if (integralResult)
+                    {
+                        return ApiResult.CouponSuccess(ResultCode.Success,2, "", dmodel.CommentGiveIntegral.ToString());
+                    }
+                    else
+                    {
+                        return ApiResult.CouponSuccess(ResultCode.Fail, 2, "", "");
+                    }
+                }
+
+                return ApiResult.CouponSuccess(ResultCode.Fail,2, "", "");
+
+
+            }
+            else { return ApiResult.CouponFailed(ResultCode.Fail, 2, "", ""); }
         }
 
         #endregion
@@ -1234,7 +1270,7 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Goods_OrderCommission_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderCommission_Extend>(req.msg.ToString());
             //HK 2020-08-27新增
             JObject parms = JObject.Parse(req.msg.ToString());
-        
+
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.UserId = userInfo.UserId;
@@ -1243,13 +1279,13 @@ namespace Mall.WebApi.Controllers.MallBase
             if (parms.GetInt("NewUserId") > 0)
             {
                 demodel.UserId = parms.GetInt("NewUserId");
-                list = orderModule.GetDistributionOrdersPageListModule(pagelist.pageIndex, pagelist.pageSize, out  count, demodel);
+                list = orderModule.GetDistributionOrdersPageListModule(pagelist.pageIndex, pagelist.pageSize, out count, demodel);
             }
             else
             {
-               list = orderModule.GetDistributionOrdersPageList_V2(pagelist.pageIndex, pagelist.pageSize, out  count, demodel);
+                list = orderModule.GetDistributionOrdersPageList_V2(pagelist.pageIndex, pagelist.pageSize, out count, demodel);
             }
-           
+
             List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
             if (list != null && list.Count > 0)
             {

Mall.WebApi/Controllers/Property/AuthorizeController.cs

@@ -50,7 +50,8 @@ namespace Mall.WebApi.Controllers.Property
                 x.Account,
                 x.MallUserName,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : "",
-                UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd") : ""
+                UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd") : "",
+                x.IsSendIMMsg
             });
             return ApiResult.Success("", pagelist);
         }
@@ -94,6 +95,7 @@ namespace Mall.WebApi.Controllers.Property
                 demodel.MallBaseId = parms.MallBaseId;
                 demodel.CreateBy = UserInfo.EmpId;
                 demodel.CreateDate = System.DateTime.Now;
+                demodel.IsSendIMMsg = 0;
             }
             if (string.IsNullOrWhiteSpace(demodel.DomainName))
             {
@@ -198,6 +200,27 @@ namespace Mall.WebApi.Controllers.Property
 
         }
 
+        /// <summary>
+        /// 授权是否发送IM消息权限
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdateSendIMMsg()
+        {
+            var parms = RequestParm;
+            RB_ERP_Authorize_Extend demodel = JsonConvert.DeserializeObject<RB_ERP_Authorize_Extend>(parms.msg.ToString());
+            bool result = authorizeModule.UpdateSendIMMsg(demodel);
+            if (result)
+            {
+                return ApiResult.Success("操作成功");
+            }
+            else
+            {
+                return ApiResult.Failed("操作失败");
+            }
+
+        }
+
     }
 
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -192,17 +192,17 @@ namespace Mall.WebApi.Controllers.User
                     UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
                     if (couponResult != null && couponResult.ID > 0)
                     {
-                        return ApiResult.CouponSuccess(ResultCode.Success, "", couponResult.Name, appletUserInfo);
+                        return ApiResult.CouponSuccess(ResultCode.Success,1, "", couponResult.Name, appletUserInfo);
 
                     }
                     else
                     {
-                        return ApiResult.CouponSuccess(ResultCode.Fail, "", "", appletUserInfo);
+                        return ApiResult.CouponSuccess(ResultCode.Fail, 1, "","", appletUserInfo);
                     }
 
                 }
 
-                return ApiResult.CouponFailed(ResultCode.Fail, "", "");
+                return ApiResult.CouponFailed(ResultCode.Fail,1, "");
                 //  return ApiResult.Failed("注册失败，请联系管理员");
             }
             else
@@ -211,7 +211,7 @@ namespace Mall.WebApi.Controllers.User
                 var umodel = userModule.GetMemberUserEntityModule(new RB_Member_User_Extend() { TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId, Source = demodel.Source, OpenId = demodel.OpenId });
                 if (umodel == null)
                 {
-                    return ApiResult.CouponFailed(ResultCode.Fail, "", "");
+                    return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
                     // return ApiResult.Failed("未能查询到用户信息");
                 }
                 if (umodel.Blacklist == 1) {
@@ -258,7 +258,7 @@ namespace Mall.WebApi.Controllers.User
                     UserSmallShopId = umodel.SmallShopId
                 };
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
-                return ApiResult.CouponSuccess(ResultCode.Fail, "", "", appletUserInfo);
+                return ApiResult.CouponSuccess(ResultCode.Fail, 1,"", "", appletUserInfo);
                 //return ApiResult.Success("", appletUserInfo);
             }
         }

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.User
                 return ApiResult.Failed();
             }
         }
-            
+
 
         /// <summary>
         /// 设置地址默认
@@ -733,7 +733,7 @@ namespace Mall.WebApi.Controllers.User
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
             //是否直属
-            int IsDirect= parms.GetInt("IsDirect", 0);
+            int IsDirect = parms.GetInt("IsDirect", 0);
             var obj = userModule.GerUserMyTeamTitelListForFX(userInfo, IsDirect: IsDirect);
             return ApiResult.Success("", obj);
         }
@@ -759,10 +759,10 @@ namespace Mall.WebApi.Controllers.User
             if (parms.GetInt("NewUserId") > 0)
             {
                 demodel.UserId = parms.GetInt("NewUserId");
-                NewUserId= parms.GetInt("NewUserId");
+                NewUserId = parms.GetInt("NewUserId");
             }
-            var list= userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel,NewUserId: NewUserId);
-           
+            var list = userModule.GetUserMyTeamPageListForFX(pageModel.pageIndex, pageModel.pageSize, out long count, demodel, NewUserId: NewUserId);
+
 
             pageModel.count = Convert.ToInt32(count);
             pageModel.pageData = list;
@@ -1093,7 +1093,7 @@ namespace Mall.WebApi.Controllers.User
                 }
                 if (allMemberInfo.SmallShopId == 0)
                 {
-                    if (oldLogisticsModel.SmallShopId > 0 )
+                    if (oldLogisticsModel.SmallShopId > 0)
                     {
                         return ApiResult.Failed("您不属于当前店铺");
                     }
@@ -1237,14 +1237,42 @@ namespace Mall.WebApi.Controllers.User
             query.TenantId = userInfo.TenantId;
             query.MallBaseId = userInfo.MallBaseId;
             query.UserId = userInfo.UserId;
-            RB_DiscountCoupon_Extend resultModel = couponModule.AutoCoupon(query);
+            RB_DiscountCoupon_Extend resultModel = new RB_DiscountCoupon_Extend();
+            if (query.TriggerType == 2)
+            {
+                //先判断是否是新人购买并付款
+                var orderList = productModule.GetOrderListByOrderStatus(new RB_Goods_Order_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, UserId = query.UserId });
+                //查询当前订单号信息
+                var orderModel = orderList.Where(x => x.OrderId == query.OrderId).FirstOrDefault();
+
+                //判断这个订单号之前有没有付款成功的订单信息
+                if (orderList.Where(x => x.OrderId != orderModel.OrderId && (int)x.OrderStatus > 1).Count() > 0)
+                {
+                    query.TriggerType = 2;
+                    resultModel = couponModule.AutoCoupon(query);
+                }
+                else
+                {
+                    query.TriggerType = 4;
+                    resultModel = couponModule.AutoCoupon(query);
+                    if (resultModel == null || resultModel.ID == 0)
+                    {
+                        query.TriggerType = 2;
+                        resultModel = couponModule.AutoCoupon(query);
+                    }
+                }
+            }
+            else
+            {
+                resultModel = couponModule.AutoCoupon(query);
+            }
             if (resultModel != null && resultModel.ID > 0)
             {
-                return ApiResult.CouponSuccess(ResultCode.Success, "", resultModel.Name);
+                return ApiResult.CouponSuccess(ResultCode.Success, 1, resultModel.Name);
             }
             else
             {
-                return ApiResult.CouponFailed(ResultCode.Fail, "", "");
+                return ApiResult.CouponFailed(ResultCode.Fail, 1, "");
             }
         }
 
@@ -1770,7 +1798,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.UserId = userInfo.UserId;
             List<RB_Member_User_Extend> memberList = new List<RB_Member_User_Extend>();
             var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
- 
+
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
             {
@@ -1789,7 +1817,7 @@ namespace Mall.WebApi.Controllers.User
                     y.Number
                 }),
                 x.UserId,
-                
+
                 x.UserName,
                 x.Photo,
                 x.Mobile,