From df6a3182676793dfbea7abd833ac665243a3265e Mon Sep 17 00:00:00 2001
From: liaoxujun@qq.com <liaoxujun@qq.com>
Date: 星期三, 10 四月 2024 14:28:53 +0800
Subject: [PATCH] 经销商价格显示不全
---
CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs | 239 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 225 insertions(+), 14 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
index 54e6806..26eb665 100644
--- a/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
+++ b/CoreCms.Net.Web.Admin/Controllers/Distribution/CoreCmsDistributionController.cs
@@ -1,7 +1,7 @@
/***********************************************************************
- * Project: CoreCms
+ * Project: baifenBinfa
* ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
- * Web: hhtp://chuanyin.com
+ * Web: http://chuanyin.com
* Author:
* Email:
* CreateTime: 202403/02
@@ -9,12 +9,14 @@
***********************************************************************/
using System;
+using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Linq.Expressions;
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.Filter;
+using CoreCms.Net.IRepository.UnitOfWork;
using CoreCms.Net.IServices;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
@@ -28,7 +30,9 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis.Operations;
using SqlSugar;
+using ZstdSharp.Unsafe;
namespace CoreCms.Net.Web.Admin.Controllers
{
@@ -47,18 +51,38 @@
private readonly ICoreCmsDistributionGradeServices _distributionGradeServices;
private readonly ICoreCmsUserServices _userServices;
private readonly IWebHostEnvironment _webHostEnvironment;
+ private readonly ICoreCmsAreaServices _areaServices;
+ private readonly ICoreCmsSettingServices _coreCmsSettingServices;
+ private readonly IUnitOfWork _unitOfWork;
+ private readonly ICoreCmsStoreServices _coreCmsStoreServices;
+ private readonly ICoreCmsClerkServices _coreCmsClerkServices;
+
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
public CoreCmsDistributionController(IWebHostEnvironment webHostEnvironment
- , ICoreCmsDistributionServices coreCmsDistributionServices, ICoreCmsUserGradeServices userGradeServices, ICoreCmsDistributionGradeServices distributionGradeServices, ICoreCmsUserServices userServices)
+ , ICoreCmsDistributionServices coreCmsDistributionServices,
+ ICoreCmsUserGradeServices userGradeServices,
+ ICoreCmsDistributionGradeServices distributionGradeServices,
+ ICoreCmsUserServices userServices,
+ ICoreCmsAreaServices areaServices,
+ ICoreCmsSettingServices coreCmsSettingServices,
+ IUnitOfWork unitOfWork,
+ ICoreCmsStoreServices coreCmsStoreServices,
+ ICoreCmsClerkServices coreCmsClerkServices)
{
_webHostEnvironment = webHostEnvironment;
_coreCmsDistributionServices = coreCmsDistributionServices;
_userGradeServices = userGradeServices;
_distributionGradeServices = distributionGradeServices;
_userServices = userServices;
+ _areaServices = areaServices;
+ _coreCmsSettingServices = coreCmsSettingServices;
+ _unitOfWork = unitOfWork;
+ _coreCmsStoreServices = coreCmsStoreServices;
+ _coreCmsClerkServices= coreCmsClerkServices;
+
}
#region 鑾峰彇鍒楄〃============================================================
@@ -118,7 +142,7 @@
//缁忛攢鍟嗗悕绉� nvarchar
var name = Request.Form["name"].FirstOrDefault();
if (!string.IsNullOrEmpty(name)) where = where.And(p => p.name.Contains(name));
- //鍒嗛攢绛夌骇 int
+ //缁忛攢绛夌骇 int
var gradeId = Request.Form["gradeId"].FirstOrDefault().ObjectToInt(0);
if (gradeId > 0) where = where.And(p => p.gradeId == gradeId);
//鐢ㄦ埛绛夌骇 int
@@ -213,6 +237,7 @@
where = where.And(p => p.isDelete == false);
//鑾峰彇鏁版嵁
var list = await _coreCmsDistributionServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize);
+
//杩斿洖鏁版嵁
jm.data = list;
jm.code = 0;
@@ -384,22 +409,208 @@
return jm;
}
+
//浜嬬墿澶勭悊杩囩▼寮�濮�
oldModel.name = entity.name;
oldModel.gradeId = entity.gradeId;
oldModel.mobile = entity.mobile;
- oldModel.weixin = entity.weixin;
- oldModel.qq = entity.qq;
- oldModel.verifyStatus = entity.verifyStatus;
- oldModel.updateTime = DateTime.Now;
- if (oldModel.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes) oldModel.verifyTime = DateTime.Now;
+ //oldModel.weixin = entity.weixin;
+ //oldModel.qq = entity.qq;
- //浜嬬墿澶勭悊杩囩▼缁撴潫
- var bl = await _coreCmsDistributionServices.UpdateAsync(oldModel);
- jm.code = bl ? 0 : 1;
- jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+ try
+ {
+ _unitOfWork.BeginTran();
+ if (oldModel.verifyStatus != (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes && entity.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ {
- return jm;
+ //鑰佹ā鍨嬫湭閫氳繃瀹℃牳锛屾柊妯″瀷鏈�氳繃瀹℃牳锛岄偅涔堜负瀹℃牳閫氳繃杩囩▼
+ var allConfigs = await _coreCmsSettingServices.GetConfigDictionaries();
+ var kc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DictionaryUserGroupKey);
+ var olduser = await _userServices.QueryByIdAsync(oldModel.userId);
+ var group = await _userGradeServices.GetUserGradeByValueKey(kc);
+ if (group != null)
+ {
+
+ //鍏宠仈缁忛攢鍟嗙敤鎴风瓑绾�
+ if (olduser != null)
+ {
+ olduser.grade = group.id;
+ olduser.updataTime = DateTime.Now;
+ await _userServices.UpdateAsync(olduser);
+
+ }
+ }
+
+ //濡傛灉鏄�氳繃瀹℃牳
+ oldModel.verifyTime = DateTime.Now;
+ //澶勭悊搴楅摵
+ if(entity.profession=="鏂囧叿搴�")
+ {
+
+ //鏂板缓搴楅摵鍚嶇О
+
+ var store = await _coreCmsStoreServices.QueryByClauseAsync(x => x.userID == oldModel.userId);
+ if(store!=null)
+ {
+ //瀛樺湪搴楅摵
+ store.coordinate= entity.storeCoordinate;
+ store.storeName = entity.storeName;
+ //鐢╨ogo浠ｆ浛闂ㄥご鐓х墖
+ store.logoImage = entity.storeLogo;
+ store.en = true;
+ store.updateTime = DateTime.Now;
+ await _coreCmsStoreServices.UpdateAsync(store);
+
+
+ }
+ else
+ {
+ var areaCode = oldModel.areaCode.Split(',').OrderByDescending(x=>x).FirstOrDefault();
+ var db = _unitOfWork.GetDbClient();
+ string[] lat = [];
+ if (!string.IsNullOrEmpty(oldModel.storeCoordinate))
+ lat = oldModel.storeCoordinate.Split(",");
+ //鏂板缓鍦伴摵
+ store = new CoreCmsStore
+ {
+ userID = oldModel.userId,
+ address = oldModel.address,
+ areaId = areaCode.ToInt32OrDefault(510000),
+ storeName = oldModel.storeName,
+ coordinate = oldModel.storeCoordinate,
+ createTime = DateTime.Now,
+ mobile = oldModel.mobile,
+ linkMan = olduser.userName,
+
+
+
+ };
+ if(lat.Length==2)
+ {
+ store.latitude= lat[0];
+ store.longitude= lat[1];
+ }
+ var id= await _unitOfWork.GetDbClient().Insertable(store).ExecuteReturnIdentityAsync();
+
+ //灏嗚嚜宸辫缃负搴楀憳
+ CoreCmsClerk clerk = new CoreCmsClerk()
+ {
+ createTime = DateTime.Now,
+ storeId = id,
+ userId = entity.userId,
+
+ };
+ await _coreCmsClerkServices.InsertAsync(clerk);
+
+
+
+
+ }
+
+ }
+
+
+
+ }
+ else
+ if (oldModel.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes && entity.verifyStatus != (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ {
+ //濡傛灉鏄彇娑堝鏍�
+
+ var allConfigs = await _coreCmsSettingServices.GetConfigDictionaries();
+ var kc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DictionaryUserGroupKey);
+ var group = await _userGradeServices.GetUserGradeByValueKey(kc);
+ var defgroup = await _userGradeServices.GetDefaultUserGrade();
+ if (defgroup != null)
+ {
+ var olduser = await _userServices.QueryByIdAsync(oldModel.userId);
+ if (olduser != null)
+ {//澶勭悊鐢ㄦ埛绛夌骇
+ if (olduser.grade == group.id)
+ {
+ if (defgroup != null)
+ {
+ olduser.grade = defgroup.id;
+ }
+ else
+ {
+
+ olduser.grade = 0;
+ }
+
+ olduser.updataTime = DateTime.Now;
+ await _userServices.UpdateAsync(olduser);
+
+ }
+ }
+ var store = await _coreCmsStoreServices.QueryByClauseAsync(x => x.userID == oldModel.userId);
+ //澶勭悊搴楅摵 鍙栨秷宸叉湁搴楅摵鐨勪娇鑳�
+ if(store != null )
+ if(store.en== true)
+ {
+ store.en = false;
+ store.updateTime= DateTime.Now;
+
+ await _coreCmsStoreServices.UpdateAsync(store);
+
+ }
+
+
+ }
+ }
+ oldModel.verifyStatus = entity.verifyStatus;
+ oldModel.updateTime = DateTime.Now;
+ //if (oldModel.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ //{
+ // oldModel.verifyTime = DateTime.Now;
+ //}
+
+ //浜嬬墿澶勭悊杩囩▼缁撴潫
+ var bl = await _coreCmsDistributionServices.UpdateAsync(oldModel);
+
+ _unitOfWork.CommitTran();
+ jm.code = bl ? 0 : 1;
+ jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+ return jm;
+ }
+ catch (Exception )
+ {
+ _unitOfWork.RollbackTran();
+ jm.code = 1;
+ jm.msg = GlobalConstVars.EditFailure;
+
+ return jm;
+
+ }
+ //if(oldModel.verifyStatus!= (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes&& entity.verifyStatus== (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ //{
+ // var allConfigs = await _coreCmsSettingServices.GetConfigDictionaries();
+ // var kc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DictionaryUserGroupKey);
+ // var group = await _userGradeServices.GetUserGradeByValueKey(kc);
+
+ // //濡傛灉鏄�氳繃瀹℃牳
+ // oldModel.verifyTime = DateTime.Now;
+ //}
+ //else
+ // if(oldModel.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes && entity.verifyStatus != (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ //{
+ // //濡傛灉鏄彇娑堝鏍�
+
+ //}
+ //oldModel.verifyStatus = entity.verifyStatus;
+ //oldModel.updateTime = DateTime.Now;
+ ////if (oldModel.verifyStatus == (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes)
+ ////{
+ //// oldModel.verifyTime = DateTime.Now;
+ ////}
+
+ ////浜嬬墿澶勭悊杩囩▼缁撴潫
+ //var bl = await _coreCmsDistributionServices.UpdateAsync(oldModel);
+ //jm.code = bl ? 0 : 1;
+ //jm.msg = bl ? GlobalConstVars.EditSuccess : GlobalConstVars.EditFailure;
+
+ //return jm;
}
#endregion
--
Gitblit v1.9.1