Skip to content

M
mall.oytour.com
Commit cc6b2b52 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

parents 19f2df32 78d2d918
Expand all Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 1021 deletions
Mall.Common/API/AirOrderInfo.cs deleted 100644 → 0
View file @ 19f2df32
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common
{
/// <summary>
/// B2B散卖机票订单定时取消信息缓存
/// </summary>
public class AirOrderInfo
{
/// <summary>
/// 散卖机票订单id
/// </summary>
public int? AirOrderId { get; set; }
/// <summary>
/// 订单的创建时间
/// </summary>
public string CreateTime { get; set; }
/// <summary>
/// 订单初始加载付款二维码时间
/// </summary>
public string PayTime { get; set; }
/// <summary>
/// 类型 1散卖机票 2景点 3餐厅
/// </summary>
public int? Type { get; set; }
}
}
Mall.Common/API/ApiResult.cs
View file @ cc6b2b52
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common.API
{
......@@ -105,6 +101,7 @@ namespace Mall.Common.API
return new ApiResult { resultCode = (int)ResultCode.ParamIsNull, message = message ?? "参数为空！", data = data };
}
}
/// <summary>
/// 分页返回数据
/// </summary>
......@@ -114,14 +111,17 @@ namespace Mall.Common.API
/// 当前页
/// </summary>
public int pageIndex { get; set; }
/// <summary>
/// 分页大小
/// </summary>
public int pageSize { get; set; }
/// <summary>
/// 总条数
/// </summary>
public int count { get; set; }
/// <summary>
/// 分页数
/// </summary>
......@@ -147,45 +147,10 @@ namespace Mall.Common.API
}
}
/// <summary>
/// 分页数据
/// </summary>
public object pageData { get; set; }
}
/// <summary>
/// 文件上传
/// </summary>
public class ResultFileModel
{
/// <summary>
/// 文件全路径
/// </summary>
public string FullFilePath { get; set; }
/// <summary>
/// 文件路径
/// </summary>
public string FilePath { get; set; }
/// <summary>
/// 文件大小
/// </summary>
public int Size { get; set; }
/// <summary>
/// 图片宽度
/// </summary>
public int Width { get; set; }
/// <summary>
/// 图片高度
/// </summary>
public int Heigth { get; set; }
/// <summary>
/// 文件名
/// </summary>
public string FileName { get; set; }
/// <summary>
/// 文件后缀
/// </summary>
public string Ext { get; set; }
}
}
\ No newline at end of file
Mall.Common/API/AppUserInfo.cs deleted 100644 → 0
View file @ 19f2df32
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common.API
{
/// <summary>
/// App端登录用户信息缓存
/// </summary>
public class AppUserInfo
{
/// <summary>
/// 集团名称
/// </summary>
public string GroupName { get; set; }
/// <summary>
/// 集团图片
/// </summary>
public string GroupPic { get; set; }
/// <summary>
/// 集团域名
/// </summary>
public string Domain { get; set; }
/// <summary>
/// 版本名称
/// </summary>
public string VersionsName { get; set; }
/// <summary>
/// 公司名称
/// </summary>
public string BranchName { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DepartName { get; set; }
/// <summary>
/// 岗位名称
/// </summary>
public string PostName { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string EmName { get; set; }
/// <summary>
/// 用户id
/// </summary>
public int EmployeeId { get; set; }
/// <summary>
/// 集团id
/// </summary>
public int RB_Group_id { get; set; }
/// <summary>
/// 版本id
/// </summary>
public int Versions_Id { get; set; }
/// <summary>
/// 公司id
/// </summary>
public int RB_Branch_id { get; set; }
/// <summary>
/// 岗位id
/// </summary>
public int RB_Post_Id { get; set; }
/// <summary>
/// 部门id
/// </summary>
public int RB_Department_Id { get; set; }
/// <summary>
/// token
/// </summary>
public string Token { get; set; }
/// <summary>
/// SecretKey
/// </summary>
public string SecretKey { get; set; }
/// <summary>
/// 头像
/// </summary>
public string Icon { get; set; }
/// <summary>
/// Im账号
/// </summary>
public string ImAccount { get; set; }
/// <summary>
/// ImToken
/// </summary>
public string ImToken { get; set; }
/// <summary>
/// 用户菜单
/// </summary>
public object UserMenu { get; set; }
/// <summary>
/// 信息
/// </summary>
public string Msg { get; set; }
/// <summary>
/// 返回码
/// </summary>
public ResultCode ResultCode { get; set; }
/// <summary>
/// 员工类型 0:正式员工,1:临时员工（外聘导游）
/// </summary>
public int EmployeeType { get; set; }
/// <summary>
/// 领队id
/// </summary>
public int LeaderId { get; set; }
}
}
Mall.Common/API/AppletUserInfo.cs
View file @ cc6b2b52
using Mall.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common
{
......
Mall.Common/API/CustomerAccountInfo.cs deleted 100644 → 0
View file @ 19f2df32
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common
{
/// <summary>
///b2b端登录用户信息缓存
/// </summary>
public class CustomerAccountInfo
{
/// <summary>
/// 用户id
/// </summary>
public int AccountId { get; set; }
/// <summary>
/// 客户id
/// </summary>
public int CustomerId { get; set; }
/// <summary>
/// 客户名
/// </summary>
public String CustomerName { get; set; }
/// <summary>
/// 是否是会员 1-是，2-否
/// </summary>
public int IsMember { get; set; }
/// <summary>
/// 集团id
/// </summary>
public int GroupId { get; set; }
/// <summary>
/// 公司id
/// </summary>
public int BranchId { get; set; }
/// <summary>
/// 部门id
/// </summary>
public int DepartmentId { get; set; }
/// <summary>
/// 销售id
/// </summary>
public int SalesId { get; set; }
/// <summary>
/// 密钥
/// </summary>
public string SecretKey { get; set; }
}
}
Mall.Common/API/ERPUserInfo.cs deleted 100644 → 0
View file @ 19f2df32
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common
{
/// <summary>
/// web端登录用户信息缓存
/// </summary>
public class ERPUserInfo
{
/// <summary>
/// 集团域名
/// </summary>
public string Domain { get; set; }
/// <summary>
/// 姓名
/// </summary>
public string emName { get; set; }
/// <summary>
/// 用户id
/// </summary>
public int EmployeeId { get; set; }
/// <summary>
/// 集团id
/// </summary>
public int RB_Group_id { get; set; }
/// <summary>
/// 公司id
/// </summary>
public int RB_Branch_id { get; set; }
/// <summary>
/// 岗位id
/// </summary>
public int RB_Post_Id { get; set; }
/// <summary>
/// 部门id
/// </summary>
public int RB_Department_Id { get; set; }
/// <summary>
/// token
/// </summary>
public string token { get; set; }
/// <summary>
/// SecretKey
/// </summary>
public string SecretKey { get; set; }
/// <summary>
/// 用户头像
/// </summary>
public string Icon { get; set; }
/// <summary>
/// 所在公司是否为总公司 1：是，2：否
/// </summary>
public int IsParentCompany { get; set; }
}
}
Mall.Common/API/Model/User/AuditInfoModel.cs deleted 100644 → 0
View file @ 19f2df32
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Mall.Common.Plugin;
namespace Mall.Common.API.Model
{
/// <summary>
/// 动态表单数据
/// </summary>
public class AuditInfoModel
{
/// <summary>
/// 表单名
/// </summary>
public string title { get; set; }
/// <summary>
/// 表单值
/// </summary>
public object value { get; set; }
/// <summary>
/// 表单类型
/// </summary>
public string formType { get; set; }
}
/// <summary>
/// 详情类型枚举
/// </summary>
public enum AuditInfoTypeEnum
{
/// <summary>
/// string类型数据
/// </summary>
[EnumField("String")]
String = 1,
/// <summary>
/// json格式数据
/// </summary>
[EnumField("Json")]
Json = 2,
/// <summary>
/// Image格式数据
/// </summary>
[EnumField("Image")]
Image = 3
}
}
Mall.Common/API/Model/User/FormDataModel.cs deleted 100644 → 0
View file @ 19f2df32
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Mall.Common.Plugin;
namespace Mall.Common.API.Model
{
/// <summary>
/// 动态表单数据
/// </summary>
public class FormDataModel
{
/// <summary>
/// 表单类型
/// </summary>
public string formType { get; set; }
/// <summary>
/// 表单值
/// </summary>
public object value { get; set; }
/// <summary>
/// 表单名
/// </summary>
public string title { get; set; }
/// <summary>
/// 占位符
/// </summary>
public string placeHolder { get; set; }
/// <summary>
/// 图片描述
/// </summary>
public string imageDesc { get; set; }
/// <summary>
/// 提交表单key值
/// </summary>
public string key { get; set; }
/// <summary>
/// 枚举值
/// </summary>
public object category { get; set; }
/// <summary>
/// 是否必填
/// </summary>
public bool required { get; set; }
}
/// <summary>
/// 表单类型枚举
/// </summary>
public enum FromTypeEnum
{
/// <summary>
/// 单行输入框
/// </summary>
[EnumField("textField")]
textField = 1,
/// <summary>
/// 多行输入框
/// </summary>
[EnumField("textareaField")]
TextareaField = 2,
/// <summary>
/// 数字输入框
/// </summary>
[EnumField("numberField")]
NumberField = 3,
/// <summary>
/// 单选框
/// </summary>
[EnumField("selectField")]
Selectfield = 4,
/// <summary>
/// 多选框
/// </summary>
[EnumField("multiSelectField")]
MultiSelectField = 5,
/// <summary>
/// 日期时间
/// </summary>
[EnumField("dateTimeField")]
DateTimeField = 6,
/// <summary>
/// 图片
/// </summary>
[EnumField("imageField")]
ImageField = 7,
/// <summary>
/// 附件
/// </summary>
[EnumField("fileField")]
FileField = 8,
/// <summary>
/// 子表单
/// </summary>
[EnumField("childField")]
ChildField = 9,
/// <summary>
/// 时长控件
/// </summary>
[EnumField("durationField")]
DurationField = 10,
/// <summary>
/// 总时长控件
/// </summary>
[EnumField("totalDurationField")]
TotalDurationField = 11
}
}
Mall.Common/Data/PriceShopHelper.cs deleted 100644 → 0
View file @ 19f2df32
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common.Data
{
/// <summary>
/// 购物店配置帮助类
/// </summary>
public class PriceShopHelper
{
static readonly string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data\\CreateBillConfig.json");
/// <summary>
/// 地区节点集合
/// </summary>
public static List<ShopConfig> ShopConfigList { get; set; }
/// <summary>
/// 根据编号获取节点
/// </summary>
/// <param name="LineId">线路编号</param>
/// <returns></returns>
public static ShopConfig GetShopConfig(int LineId)
{
List<ShopConfig> list = GetShopConfigList();
return list.Find(qitem => qitem.LineID == LineId);
}
/// <summary>
/// 获取地区列表
/// </summary>
/// <returns></returns>
private static List<ShopConfig> GetShopConfigList()
{
if (ShopConfigList != null && ShopConfigList.Count > 0)
{
return ShopConfigList;
}
try
{
//读取json文件
using (StreamReader file = new StreamReader(path))
{
try
{
JsonSerializer serializer = new JsonSerializer();
//serializer.Formatting =
ShopConfigList = (List<ShopConfig>)serializer.Deserialize(file, typeof(List<ShopConfig>));
return ShopConfigList;
}
catch
{
return null;
}
}
}
catch
{
return null;
}
}
}
/// <summary>
/// 购物店主项配置表
/// </summary>
public class ShopConfig
{
/// <summary>
/// 线路先把
/// </summary>
public int LineID
{
get;
set;
}
/// <summary>
/// 购物店子项列表
/// </summary>
public List<ShopConfigDetail> ChildList { get; set; }
}
/// <summary>
/// 购物店子项配置表
/// </summary>
public class ShopConfigDetail
{
/// <summary>
/// 购物店名称
/// </summary>
public string ShopName { get; set; }
/// <summary>
/// 购物店Id
/// </summary>
public int ShopId { get; set; }
/// <summary>
/// 资金池账户ID
/// </summary>
public int CashPoolID { get; set; }
/// <summary>
/// 费用类型
/// </summary>
public int CostTypeId { get; set; }
/// <summary>
/// 币种
/// </summary>
public int CurrencyId { get; set; }
}
}
\ No newline at end of file
Mall.Common/Encrypt/EncryptionHelper.cs
View file @ cc6b2b52
This diff is collapsed.
Mall.Common/Plugin/ValidateHepler.cs
View file @ cc6b2b52
using System;
using System.Reflection;
using System.Text.RegularExpressions;
......@@ -10,7 +9,6 @@ namespace Mall.Common.Plugin
/// </summary>
public static class ValidateHepler
{
/// <summary>
/// 返回ok为参数合法，其余为不合法
/// </summary>
......@@ -38,6 +36,7 @@ namespace Mall.Common.Plugin
}
return "ok";
}
/// <summary>
/// 验证字符串是否数字
/// </summary>
......@@ -49,8 +48,6 @@ namespace Mall.Common.Plugin
return true;
if (string.IsNullOrEmpty(val))
return false;
return Regex.IsMatch(val, @"^[1-9]\d*\.?[0]*$");
}
......@@ -137,6 +134,7 @@ namespace Mall.Common.Plugin
/// <returns></returns>
public abstract string CheckValiadte(string name, object value);
}
/// <summary>
/// 整形数字范围验证
/// </summary>
......@@ -164,7 +162,6 @@ namespace Mall.Common.Plugin
/// <returns></returns>
public override string CheckValiadte(string name, object value)
{
if (value == null || string.IsNullOrWhiteSpace(value.ToString()))
{
return successMessage;
......@@ -188,6 +185,7 @@ namespace Mall.Common.Plugin
}
}
}
/// <summary>
/// 字符串必填验证
/// </summary>
......@@ -201,7 +199,6 @@ namespace Mall.Common.Plugin
/// <returns></returns>
public override string CheckValiadte(string name, object value)
{
if (value == null || string.IsNullOrWhiteSpace(value.ToString()))
{
if (!string.IsNullOrWhiteSpace(showMessage))
......@@ -217,9 +214,9 @@ namespace Mall.Common.Plugin
{
return successMessage;
}
}
}
/// <summary>
/// 字符串范围验证
/// </summary>
......@@ -247,7 +244,6 @@ namespace Mall.Common.Plugin
/// <returns></returns>
public override string CheckValiadte(string name, object value)
{
if (value == null || string.IsNullOrWhiteSpace(value.ToString()))
{
return successMessage;
......@@ -290,7 +286,6 @@ namespace Mall.Common.Plugin
return successMessage;
}
string number = value.ToString();
if (!Regex.IsMatch(number, @"^[0-9]\d*\.?[0]*$"))
{
if (!string.IsNullOrWhiteSpace(showMessage))
......@@ -306,10 +301,9 @@ namespace Mall.Common.Plugin
{
return successMessage;
}
}
}
/// <summary>
/// 邮箱校验
/// </summary>
......@@ -328,7 +322,6 @@ namespace Mall.Common.Plugin
return successMessage;
}
string email = value.ToString();
if (string.IsNullOrEmpty(email))
{
return showMessage;
......@@ -351,7 +344,6 @@ namespace Mall.Common.Plugin
return successMessage;
}
}
}
}
/// <summary>
......@@ -380,7 +372,6 @@ namespace Mall.Common.Plugin
{
return $"参数{name}必须为日期格式！";
}
}
}
......@@ -389,7 +380,6 @@ namespace Mall.Common.Plugin
/// </summary>
public class RegularValidateAttribute : AbstractValidateAttribute
{
private string pattern = "";
/// <summary>
///
......@@ -399,6 +389,7 @@ namespace Mall.Common.Plugin
{
this.pattern = pattern;
}
/// <summary>
/// 正则验证
/// </summary>
......@@ -426,8 +417,6 @@ namespace Mall.Common.Plugin
{
return successMessage;
}
}
}
}
\ No newline at end of file
Mall.Common/webHepler.cs
View file @ cc6b2b52

namespace System.WebHttpContext
namespace System.WebHttpContext
{
public static class HttpContext
{
private static Microsoft.AspNetCore.Http.IHttpContextAccessor m_httpContextAccessor;
public static void Configure(Microsoft.AspNetCore.Http.IHttpContextAccessor httpContextAccessor)
{
m_httpContextAccessor = httpContextAccessor;
}
public static Microsoft.AspNetCore.Http.HttpContext httpCurrent
{
get
......@@ -21,10 +15,5 @@ namespace System.WebHttpContext
return m_httpContextAccessor.HttpContext;
}
}
}
}
\ No newline at end of file
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ cc6b2b52
......@@ -977,6 +977,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.UserName = userInfo.Name;
demodel.PlatformSource = userInfo.Source;
demodel.Status = 0;
demodel.CreateDate = DateTime.Now;
demodel.UpdateDate = DateTime.Now;
bool flag = orderModule.SetGoodsCommentInfo(demodel);
......
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