修复部分订单bug

代码/System.Model/Common/ResultMessage.cs

@@ -0,0 +1,21 @@
+using System;
+namespace System.Model
+{
+	/// <summary>
+	///  返回结果状态
+	/// </summary>
+	[Serializable]
+	public partial class ResultMessage
+	{
+		public ResultMessage()
+		{ }
+		//状态码
+		public int Code { get; set; }
+		//成功失败状态
+		public bool Status { get; set; }
+		//具体消息
+		public string Msg { get; set; }
+
+	}
+}
+

代码/System.Utility/NumberConvert.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Utility
+{
+    public class NumberConvert
+    {
+
+        public static string IntToJinZhi(long xx,int jinZhi)
+        {
+            string a = "";
+            while (xx >= 1)
+            {
+                int index = Convert.ToInt16(xx - (xx / jinZhi) * jinZhi);
+                a = Base64Code[index] + a;
+                xx = xx / jinZhi;
+            }
+            return a;
+        }
+
+        public static long JinZhiToInt(string xx,int jinZhi)
+        {
+            long a = 0;
+            int power = xx.Length - 1;
+
+            for (int i = 0; i <= power; i++)
+            {
+                a += _Base64Code[xx[power - i].ToString()] * Convert.ToInt64(Math.Pow(jinZhi, i));
+            }
+
+            return a;
+        }
+
+        public static Dictionary<int, string> Base64Code = new Dictionary<int, string>() {
+            {   0  ,"z"}, {   1  ,"1"}, {   2  ,"2"}, {   3  ,"3"}, {   4  ,"4"}, {   5  ,"5"}, {   6  ,"6"}, {   7  ,"7"}, {   8  ,"8"}, {   9  ,"9"},
+            {   10  ,"a"}, {   11  ,"b"}, {   12  ,"c"}, {   13  ,"d"}, {   14  ,"e"}, {   15  ,"f"}, {   16  ,"g"}, {   17  ,"h"}, {   18  ,"i"}, {   19  ,"j"},
+            {   20  ,"k"}, {   21  ,"x"}, {   22  ,"m"}, {   23  ,"n"}, {   24  ,"y"}, {   25  ,"p"}, {   26  ,"q"}, {   27  ,"r"}, {   28  ,"s"}, {   29  ,"t"},
+            {   30  ,"u"}, {   31  ,"v"}, {   32  ,"w"}, {   33  ,"x"}, {   34  ,"y"}, {   35  ,"z"}, {   36  ,"A"}, {   37  ,"B"}, {   38  ,"C"}, {   39  ,"D"},
+            {   40  ,"E"}, {   41  ,"F"}, {   42  ,"G"}, {   43  ,"H"}, {   44  ,"I"}, {   45  ,"J"}, {   46  ,"K"}, {   47  ,"L"}, {   48  ,"M"}, {   49  ,"N"},
+            {   50  ,"O"}, {   51  ,"P"}, {   52  ,"Q"}, {   53  ,"R"}, {   54  ,"S"}, {   55  ,"T"}, {   56  ,"U"}, {   57  ,"V"}, {   58  ,"W"}, {   59  ,"X"},
+            {   60  ,"Y"}, {   61  ,"Z"}, {   62  ,"-"}, {   63  ,"_"},
+        };
+
+        public static Dictionary<string, int> _Base64Code
+        {
+            get
+            {
+                return Enumerable.Range(0, Base64Code.Count()).ToDictionary(i => Base64Code[i], i => i);
+            }
+        }
+    }
+}

代码/TVShoppingCallCenter_ZLJ/Controllers/CallCenter/CallFunctionController.cs

@@ -156,7 +156,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.CallCenter
                         var cus = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1 && x.F_Phone
                        == modelcdr.caller || x.F_Phone
                        == tel);
-                        if (cus!=null )
+                        if (cus!=null && cus.Count>0)
                         {
                             modelRecord.CusCode = cus.FirstOrDefault ().F_Name ;
                             modelRecord.CusId = cus.FirstOrDefault().F_ID ;

代码/TVShoppingCallCenter_ZLJ/Controllers/InternalMessages/InternalMessagesController.cs

@@ -97,7 +97,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.InternalMessages
         public async Task<IActionResult> GetListMark(int istop=-1,int smstype=-1,int isread=-1, int pageindex = 0, int pagesize = 0)
         {
             //string user = "8000";
-          string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            string user = UserLogin.UserCode;
             List<IConditionalModel> conModels = new List<IConditionalModel>();
             #region 条件筛选
             conModels.Add(new ConditionalModel() { FieldName = "SMS_IsDelete", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumUserCountState.Enabled).ToString() });

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderMergeController.cs

@@ -501,7 +501,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         }
                         if (modelDetail != null)
                         {
-                            if (await busOrcerFunctionController.ChangeStock(setStockModel, modeStocklogs))
+                            ResultMessage modelMessage = await busOrcerFunctionController.ChangeStock(setStockModel, modeStocklogs);
+                            if (modelMessage.Status)
                             {
                                 //处理库存
                             }