提交代码

Mall.Common/API/AppletUserInfo.cs

@@ -39,6 +39,12 @@ namespace Mall.Common
         /// </summary>
         public int SmallShopId { get; set; }
 
+
+        /// <summary>
+        /// 用户所属店铺id
+        /// </summary>
+        public int UserSmallShopId { get; set; }
+
         /// <summary>
         /// 唯一码
         /// </summary>        

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1084,7 +1084,6 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull("选中的订单部分已制单，不能修改");
             }
 
-
             bool flag = orderModule.UpdateOrderDetailLive(Type, LivePeopleNum, LiveCommission, orderDetailsList, req.TenantId, req.MallBaseId);
             if (flag)
             {
@@ -1143,20 +1142,24 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult SetLiveGoodsOrderFinance() {
+        public ApiResult SetLiveGoodsOrderFinance()
+        {
             var req = RequestParm;
             JObject parms = JObject.Parse(req.msg.ToString());
             int IsPublic = parms.GetInt("IsPublic", 0);//账户类型
             int ErpEmpId = parms.GetInt("ErpEmpId", 0);
-            if (ErpEmpId <= 0) {
+            if (ErpEmpId <= 0)
+            {
                 ErpEmpId = req.ERPEmpId;
             }
             string AccountIds = parms.GetStringValue("AccountIds");//账户ids
             string OrderDetailIds = parms.GetStringValue("OrderDetailIds");//订单明细ids
-            if (string.IsNullOrEmpty(AccountIds)) {
+            if (string.IsNullOrEmpty(AccountIds))
+            {
                 return ApiResult.ParamIsNull("账户不存在");
             }
-            if (string.IsNullOrEmpty(OrderDetailIds)) {
+            if (string.IsNullOrEmpty(OrderDetailIds))
+            {
                 return ApiResult.ParamIsNull("订单明细不存在");
             }
             List<int> AccountIdList;
@@ -1178,10 +1181,12 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("订单明细格式有误");
             }
-            if (!AccountIdList.Any()) {
+            if (!AccountIdList.Any())
+            {
                 return ApiResult.ParamIsNull("请选择账户");
             }
-            if (!OrderdetailIdList.Any()) {
+            if (!OrderdetailIdList.Any())
+            {
                 return ApiResult.ParamIsNull("请选择订单列表");
             }
 
@@ -1190,7 +1195,8 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.Success();
             }
-            else {
+            else
+            {
                 return ApiResult.Failed(msg);
             }
         }

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -176,7 +176,8 @@ namespace Mall.WebApi.Controllers.User
                         SecretKey = demodel.SecretKey,
                         SuperiorId = demodel.SuperiorId ?? 0,
                         Token = token,
-                        SmallShopId = 0
+                        SmallShopId = 0,
+                        UserSmallShopId= demodel.SmallShopId
                     };
                     UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + UserId, appletUserInfo, Config.JwtExpirTime);
                     if (couponResult != null && couponResult.ID > 0)
@@ -240,7 +241,8 @@ namespace Mall.WebApi.Controllers.User
                     SecretKey = umodel.SecretKey,
                     SuperiorId = umodel.SuperiorId ?? 0,
                     Token = token,
-                    SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0
+                    SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0,
+                    UserSmallShopId = demodel.SmallShopId
                 };
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
                 return ApiResult.CouponSuccess(ResultCode.Fail, "", "", appletUserInfo);