Commit dc17a1e6 authored by 黄奎's avatar 黄奎

页面修改

parent 31610e63
...@@ -26,6 +26,18 @@ namespace Mall.Common.Enum.Goods ...@@ -26,6 +26,18 @@ namespace Mall.Common.Enum.Goods
/// 余额支付 /// 余额支付
/// </summary> /// </summary>
[EnumField("余额支付")] [EnumField("余额支付")]
YEPayment = 3 YEPayment = 3,
/// <summary>
/// 线下支付
/// </summary>
[EnumField("线下支付")]
OfflinePay =4,
/// <summary>
/// 支付定金
/// </summary>
[EnumField("支付定金")]
PayDeposit = 5,
} }
} }
...@@ -5590,7 +5590,11 @@ namespace Mall.Module.Product ...@@ -5590,7 +5590,11 @@ namespace Mall.Module.Product
Random R = new Random(); Random R = new Random();
int Rstr = R.Next(111, 999); int Rstr = R.Next(111, 999);
demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr; demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
demodel.PaymentWay = OrderPaymentTypeEnum.OnlinePayment;//先默认在线支付 if (demodel?.PaymentWay == null)
{
demodel.PaymentWay = OrderPaymentTypeEnum.OnlinePayment;//先默认在线支付
}
demodel.Remark ??= ""; demodel.Remark ??= "";
demodel.ApplyForCancelStatus ??= 0; demodel.ApplyForCancelStatus ??= 0;
if (demodel.Income == 0) if (demodel.Income == 0)
......
...@@ -2648,8 +2648,9 @@ namespace Mall.Module.Product ...@@ -2648,8 +2648,9 @@ namespace Mall.Module.Product
/// <param name="TenantId"></param> /// <param name="TenantId"></param>
/// <param name="MallBaseId"></param> /// <param name="MallBaseId"></param>
/// <param name="storeId">门店编号</param> /// <param name="storeId">门店编号</param>
/// <param name="chooseDate">选择日期</param>
/// <returns></returns> /// <returns></returns>
public object GetAppletOfflineGoodsInfoModule(int goodsId, int UserId, int SmallShopsId, int TenantId, int MallBaseId, int storeId = 0,int servicePersionId=0) public object GetAppletOfflineGoodsInfoModule(int goodsId, int UserId, int SmallShopsId, int TenantId, int MallBaseId, int storeId = 0,int servicePersionId=0,string chooseDate="")
{ {
var model = goodsRepository.GetEntity(goodsId).RefMapperTo<RB_Goods_Extend>(); var model = goodsRepository.GetEntity(goodsId).RefMapperTo<RB_Goods_Extend>();
if (model == null || model.TenantId != TenantId || model.MallBaseId != MallBaseId) if (model == null || model.TenantId != TenantId || model.MallBaseId != MallBaseId)
...@@ -3543,7 +3544,7 @@ namespace Mall.Module.Product ...@@ -3543,7 +3544,7 @@ namespace Mall.Module.Product
var servicePersionList = new List<RB_Reserve_ServicePersonal_Extend>(); var servicePersionList = new List<RB_Reserve_ServicePersonal_Extend>();
if (model.IsChooseServicePerson == 1) if (model.IsChooseServicePerson == 1)
{ {
servicePersionList= reserve_ServicePersonalRepository.GetServicePersonalListExtRepository(storeId, model.Id, categoryIds,servicePersionId)?.ToList() ?? new List<Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend>(); servicePersionList= reserve_ServicePersonalRepository.GetServicePersonalListExtRepository(storeId, model.Id, categoryIds,servicePersionId,chooseDate)?.ToList() ?? new List<Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend>();
} }
var storeModel = storesRepository.GetEntity(storeId); var storeModel = storesRepository.GetEntity(storeId);
List<StoreReserveDate> storeDateList = new List<StoreReserveDate>(); List<StoreReserveDate> storeDateList = new List<StoreReserveDate>();
......
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Entity.Reserve; using Mall.Model.Entity.Reserve;
using Mall.Model.Extend.Reserve; using Mall.Model.Extend.Reserve;
using NPOI.SS.Formula.Functions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -342,8 +343,9 @@ ORDER BY t.orderNum desc "; ...@@ -342,8 +343,9 @@ ORDER BY t.orderNum desc ";
/// <param name="productId"></param> /// <param name="productId"></param>
/// <param name="categoryIds"></param> /// <param name="categoryIds"></param>
/// <param name="servicePersionId">服务人员Id</param> /// <param name="servicePersionId">服务人员Id</param>
/// <param name="chooseDate">服务人员Id</param>
/// <returns></returns> /// <returns></returns>
public List<RB_Reserve_ServicePersonal_Extend> GetServicePersonalListExtRepository(int storeId, int productId, string categoryIds,int servicePersionId=0) public List<RB_Reserve_ServicePersonal_Extend> GetServicePersonalListExtRepository(int storeId, int productId, string categoryIds,int servicePersionId=0,string chooseDate="")
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
...@@ -374,6 +376,10 @@ WHERE A.Status=0 AND A.storeId={2} ...@@ -374,6 +376,10 @@ WHERE A.Status=0 AND A.storeId={2}
{ {
builder.AppendFormat(" AND A.ID={0} ", servicePersionId); builder.AppendFormat(" AND A.ID={0} ", servicePersionId);
} }
if (!string.IsNullOrEmpty(chooseDate))
{
builder.AppendFormat(" AND EXISTS(SELECT 1 FROM rb_reserve_servicetargetdate WHERE A.Id=ServiceId AND DATE_FORMAT(Date,'%y/%m/%d')= DATE_FORMAT('{0}','%y/%m/%d')) ", chooseDate);
}
return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList(); return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
} }
......
...@@ -74,7 +74,8 @@ namespace Mall.WebApi.Controllers ...@@ -74,7 +74,8 @@ namespace Mall.WebApi.Controllers
{ {
get { get {
var parm = this.RequestParm; var parm = this.RequestParm;
AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid); // AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603");
return userInfo; return userInfo;
} }
} }
......
...@@ -424,12 +424,14 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -424,12 +424,14 @@ namespace Mall.WebApi.Controllers.MallBase
int GoodsId = prams.GetInt("GoodsId", 0); int GoodsId = prams.GetInt("GoodsId", 0);
int StoreId = prams.GetInt("StoreId", 0); int StoreId = prams.GetInt("StoreId", 0);
int servicePersionId = prams.GetInt("servicePersionId", 0); int servicePersionId = prams.GetInt("servicePersionId", 0);
//选择的日期
string chooseDate = prams.GetStringValue("chooseDate");
if (StoreId<=0 || GoodsId<=0) if (StoreId<=0 || GoodsId<=0)
{ {
return ApiResult.ParamIsNull(message:"请选择门店"); return ApiResult.ParamIsNull(message:"请选择门店");
} }
int UserId = req.UserId; int UserId = req.UserId;
object Robj = productModule.GetAppletOfflineGoodsInfoModule(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId, storeId: StoreId,servicePersionId:servicePersionId); object Robj = productModule.GetAppletOfflineGoodsInfoModule(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId, storeId: StoreId,servicePersionId:servicePersionId,chooseDate:chooseDate);
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment