Commit ef8d182d authored by 吴春's avatar 吴春

提交代码,制单新增部门字段

parent 1907d9c5
......@@ -4551,6 +4551,7 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.IsQuickBuy),model.IsQuickBuy==1?2:1}
};
}
else
{
return false;
......@@ -4595,7 +4596,7 @@ namespace Mall.Module.Product
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public bool SetProductGoodsQuickUpdate(string goodsIds, int type, int sort, string goodsName, int freightId, int limitBuyGoodsNum, int limitBuyOrderNum, int integralPresent, int integralPresentType, decimal pointsDeduction, int pointsDeductionType, int isMultipleDeduction, int isQuickBuy, int isGoodsNegotiable, int tenantId, int mallBaseId)
public bool SetProductGoodsQuickUpdate(string goodsIds, int type, int sort, string goodsName, int freightId, int limitBuyGoodsNum, int limitBuyOrderNum, int integralPresent, int integralPresentType, decimal pointsDeduction, int pointsDeductionType, int isMultipleDeduction, int isQuickBuy, int isGoodsNegotiable,int SupplierId, int tenantId, int mallBaseId)
{
Dictionary<string, object> keyValues;
if (type == 1)
......@@ -4674,6 +4675,12 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.IsGoodsNegotiable),isGoodsNegotiable}
};
}//面议
else if (type == 12)
{
keyValues = new Dictionary<string, object>() {
{ nameof(RB_Goods.SupplierId),SupplierId}
};
}//面议
else
{
return false;
......@@ -5623,5 +5630,6 @@ namespace Mall.Module.Product
#endregion
}
}
......@@ -1757,7 +1757,7 @@ namespace Mall.Module.User
string wenXinResult = string.Empty;
if (!string.IsNullOrWhiteSpace(token))
{
string Url = " http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=" + token;
string Url = " https://api.weixin.qq.com/wxa/business/getliveinfo?access_token=" + token;
var postdata = new
{
start = 0,
......
......@@ -2105,9 +2105,11 @@ namespace Mall.Module.User
if (!string.IsNullOrEmpty(remodel.ReOrderNos) && !string.IsNullOrEmpty(remodel.ReOrderIds))
{
List<int> OrderIdList = JsonConvert.DeserializeObject<List<int>>(remodel.ReOrderIds);
if (OrderIdList.Any()) {
if (OrderIdList.Any())
{
var oclist = goods_OrderCommissionRepository.GetUserCommissionRemitedList(remodel.UserId ?? 0, string.Join(",", OrderIdList));
foreach (var qitem in oclist) {
foreach (var qitem in oclist)
{
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderCommission_Extend.IsRemit),0}
};
......@@ -2560,6 +2562,20 @@ namespace Mall.Module.User
return member_ShippingAddressRepository.Update(keyValues, wheres);
}
#region 地址
/// <summary>
/// 根据地区名称获取地区列表
/// </summary>
/// <param name="where"></param>
/// <returns></returns>
public List<Model.Extend.BaseSetUp.RB_Destination_Extend> GetDestinationListByNames(string[] where)
{
return destinationRepository.GetListByNames(where);
}
#endregion
#endregion
#region 收藏商品
......@@ -3214,7 +3230,8 @@ namespace Mall.Module.User
#region 写入提现订单
if (demodel.TenantId == 1) {
if (demodel.TenantId == 1)
{
//所有未提现的 返佣
var clist = goods_OrderCommissionRepository.GetUserCommissionRemit(demodel.UserId ?? 0);
if (clist.Any())
......
......@@ -63,8 +63,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success("", result);
}
public static List<RB_Destination_Extend> GetData(List<RB_Destination_Extend> nodeList)
{
......
......@@ -243,6 +243,22 @@ namespace Mall.WebApi.Controllers.User
}
}
/// <summary>
/// 根据地区名称获取地区列表
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public virtual ApiResult GetDestinationListByNames()
{
var request = RequestParm;
var userInfo = AppletUserInfo;
JObject parm = JObject.Parse(request.msg.ToString());
var area = parm.GetStringValue("area");
var where = Common.Plugin.JsonHelper.DeserializeObject<string[]>(area);
var list = userModule.GetDestinationListByNames(where);
return ApiResult.Success(data: list.Select(qitem => new { qitem.ID, qitem.Name, qitem.CodeLevel }));
}
#endregion
#region 收藏商品
......
......@@ -334,6 +334,7 @@ namespace Mall.WebApi.Controllers.User
OtherType = 13,
Remark = System.DateTime.Now.ToString("yyyy年MM月dd日") + "生成财务单据",
detailList,
RB_Depart_Id= Config.ExpendDepartment
};
string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
var resultInfo = new
......
......@@ -21,8 +21,8 @@
"ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
"ImKey": "b612b31e837c79c68f141aeb719d2b20",
"ImSecret": "66000451fb72",
"Mongo": "mongodb://192.168.2.214:27017",
//"Mongo": "mongodb://47.96.25.130:27017",
//"Mongo": "mongodb://192.168.2.214:27017",
"Mongo": "mongodb://47.96.25.130:27017",
"MongoDBName": "Mall",
"ProjectUrl": "D:/project/GitProject/mallapp",
"DeveloperKitsPort": "15720",
......@@ -35,24 +35,25 @@
"RB_Branch_Id": 49, //所属公司id
"IncomeDirector": 1756, //财务收入创建人
"IncomeBranchId": 49, //财务收入创建人公司
"IncomeDepartment": 331,
"ExpendDirector": 1756, //财务支出创建人
"ExpendBranchId": 49, //财务支出创建人公司
"ExpendDepartment": 331,
"RebornDMC": "reborn_dmc",
"IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
"PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"SettlementRate": "0.60",
"RedisSetting": {
"RedisServer": "192.168.2.214",
"RedisPort": "6379",
"RedisPwd": "123456"
},
//"RedisSetting": {
// "RedisServer": "47.96.23.199",
// "RedisServer": "192.168.2.214",
// "RedisPort": "6379",
// "RedisPwd": "Viitto2018"
// "RedisPwd": "123456"
//},
"RedisSetting": {
"RedisServer": "47.96.23.199",
"RedisPort": "6379",
"RedisPwd": "Viitto2018"
},
"VirtualDirectory": "WebFile",
"FileService": "2",
"IsNormalServer": 2,
......
......@@ -266,7 +266,8 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
OrderSource = 16,
Remark = System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据",
detailList,
OriginalFee
OriginalFee,
RB_Depart_Id= Config.IncomeDepartment
};
string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
var resultInfo = new
......@@ -1171,7 +1172,8 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
OtherType = 14,
ReFinanceId = 0,
Remark,
detailList
detailList,
RB_Depart_Id = Config.ExpendDepartment
};
string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
var resultInfo = new
......
......@@ -30,8 +30,10 @@
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
"IncomeDirector": 1756, //财务收入创建人
"IncomeBranchId": 49, //财务收入创建人公司
"IncomeDepartment": 331,
"ExpendDirector": 1756, //财务支出创建人
"ExpendBranchId": 49, //财务支出创建人公司
"ExpendDepartment": 331,
"NetworkDirector": 1756, //网络主管的id,用于新建供应商账户的时候的创建人
"RB_Branch_Id": 49, //所属公司id
"RebornDMC": "reborn_dmc",
......
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