Przeglądaj źródła

商品 售后审核提交

zhangkun 5 lat temu
rodzic
commit
13e025cd29

+ 219 - 104
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/AfterSaleController.cs

@@ -22,6 +22,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
22 22
 using Microsoft.Extensions.Configuration;
23 23
 using SqlSugar;
24 24
 using TVShoppingCallCenter_ZLJ.Models.Inputs;
25
+using Utility;
25 26
 
26 27
 namespace TVShoppingCallCenter_ZLJ.Controllers.Order
27 28
 {
@@ -64,8 +65,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
64 65
 
65 66
                 if (string.IsNullOrEmpty(input.F_OrderId))
66 67
                     return Error("请选择订单");
67
-              
68
-                if (input.F_Type <=0)
68
+
69
+                if (input.F_Type <= 0)
69 70
                     return Error("申请类型不符合售后");
70 71
 
71 72
                 #endregion
@@ -107,19 +108,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
107 108
                 //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
108 109
                 //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
109 110
                 //modelAfterSale.F_TrackDes = input.F_TrackDes;
110
-                if(!string.IsNullOrEmpty(input.F_Remark))
111
-                    modelAfterSale.F_Remark =" 销售:"+ input.F_Remark;
112
-
113
-
114
-                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
115
-                //modelAfterSale.F_AddUserName = UserLogin.UserName;
116
-                //modelAfterSale.F_State = input.F_State;
117
-                //modelAfterSale.F_Money = input.F_Money;
118
-                //modelAfterSale.F_Gift = input.F_Gift;
119
-                //modelAfterSale.F_Type = input.F_Type;
120
-                //modelAfterSale.F_OrderList = input.F_OrderList;
121
-                //modelAfterSale.F_Remark = input.F_Remark;
122
-                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
111
+                if (!string.IsNullOrEmpty(input.F_Remark))
112
+                    modelAfterSale.F_Remark = " 销售:" + input.F_Remark;
113
+
123 114
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
124 115
                 {
125 116
                     if (input.F_State == 0)
@@ -169,11 +160,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
169 160
                 { }
170 161
                 #endregion
171 162
 
172
-                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q=>q.F_Id==input.F_Id);
163
+                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
173 164
 
174 165
                 if (modelAfterSale.F_CheckStateSH == 1 && modelAfterSale.F_CheckStateXS == 1)
175 166
                 {
176
-                    return Error("双审核通过不能编辑");                    
167
+                    return Error("双审核通过不能编辑");
177 168
                 }
178 169
                 modelAfterSale.F_CheckTimeXS = DateTime.Now;
179 170
                 modelAfterSale.F_CheckStateXS = input.F_CheckStateXS;
@@ -190,18 +181,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
190 181
                 //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
191 182
                 //modelAfterSale.F_TrackDes = input.F_TrackDes;
192 183
                 if (!string.IsNullOrEmpty(input.F_Remark))
193
-                    modelAfterSale.F_Remark = modelAfterSale.F_Remark+"\\r\\n 销售:"+input.F_Remark;
194
-
195
-
196
-                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
197
-                //modelAfterSale.F_AddUserName = UserLogin.UserName;
198
-                //modelAfterSale.F_State = input.F_State;
199
-                //modelAfterSale.F_Money = input.F_Money;
200
-                //modelAfterSale.F_Gift = input.F_Gift;
201
-                //modelAfterSale.F_Type = input.F_Type;
202
-                //modelAfterSale.F_OrderList = input.F_OrderList;
203
-                //modelAfterSale.F_Remark = input.F_Remark;
204
-                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
184
+                    modelAfterSale.F_Remark = modelAfterSale.F_Remark + "\\r\\n 销售:" + input.F_Remark;
185
+
186
+
187
+
205 188
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
206 189
                 {
207 190
                     if (input.F_State == 0)
@@ -257,7 +240,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
257 240
             Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckUserXS == UserLogin.UserId.ObjToInt();
258 241
 
259 242
 
260
-            if (input.F_CheckStateXS>-1)
243
+            if (input.F_CheckStateXS > -1)
261 244
             {
262 245
                 eq = eq.And(a => a.F_CheckStateXS == input.F_CheckStateXS);
263 246
             }
@@ -310,22 +293,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
310 293
 
311 294
                 #endregion
312 295
 
313
-                #region 验证逻辑
314
-                if (input.F_Type == 1)
315
-                { }
316
-                else if (input.F_Type == 2)
317
-                { }
318
-                else if (input.F_Type == 3)
319
-                { }
320
-                else if (input.F_Type == 4)
321
-                { }
322
-                #endregion
323
-                T_Bus_Order modeOrder =await bus_OrderRepository.GetSingle(q=>q.F_Id== input.F_OrderId);
296
+
297
+                T_Bus_Order modeOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_OrderId);
324 298
                 if (modeOrder == null)
325 299
                 {
326 300
                     return Error("订单不存在");
327 301
                 }
328
-                else if (modeOrder.F_Status==-1)
302
+                else if (modeOrder.F_Status == -1)
329 303
                 {
330 304
                     //物流状态0 未发出 1物流运送中2签收3改代收4拒收
331 305
                     return Error("状态不符合售后");
@@ -333,7 +307,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
333 307
                 T_Bus_AfterSale modelAfterSale = new T_Bus_AfterSale();
334 308
                 modelAfterSale.F_AddTime = DateTime.Now;
335 309
                 modelAfterSale.F_CheckTimeSH = DateTime.Now;
336
-                modelAfterSale.F_CheckStateSH = input.F_CheckStateXS;
310
+                modelAfterSale.F_CheckStateSH = input.F_State;
337 311
                 modelAfterSale.F_CheckUserSH = UserLogin.UserId.ObjToInt();
338 312
                 modelAfterSale.F_CheckUserNameSH = UserLogin.UserName;
339 313
 
@@ -342,39 +316,41 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
342 316
                 modelAfterSale.F_DetailList = input.F_DetailList;
343 317
                 modelAfterSale.F_Type = input.F_Type;
344 318
                 modelAfterSale.F_Money = input.F_Money;
319
+
345 320
                 modelAfterSale.F_OrderId = input.F_OrderId;
346 321
                 modelAfterSale.F_AboutOrderId = "";
347 322
                 modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
348
-                //modelAfterSale.F_OurTrackingNo = input.F_OurTrackingNo;
349
-                //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
350
-                //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
351
-                //modelAfterSale.F_TrackDes = input.F_TrackDes;
323
+
324
+                modelAfterSale.F_TrackingNo = input.F_TrackingNo;
325
+                modelAfterSale.F_TrackDes = input.F_TrackDes;
352 326
                 if (!string.IsNullOrEmpty(input.F_Remark))
353 327
                     modelAfterSale.F_Remark = " 售后:" + input.F_Remark;
354 328
 
355 329
 
356
-                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
357
-                //modelAfterSale.F_AddUserName = UserLogin.UserName;
358
-                //modelAfterSale.F_State = input.F_State;
359
-                //modelAfterSale.F_Money = input.F_Money;
360
-                //modelAfterSale.F_Gift = input.F_Gift;
361
-                //modelAfterSale.F_Type = input.F_Type;
362
-                //modelAfterSale.F_OrderList = input.F_OrderList;
363
-                //modelAfterSale.F_Remark = input.F_Remark;
364
-                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
330
+                if (input.F_Type == 4)
331
+                {
332
+                    if (input.F_CheckStateSH == 1)
333
+                    {
334
+                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
335
+                        string addResult = await AddOrder(modelAfterSale, modeOrder);
336
+                        if (addResult != "1")
337
+                        {
338
+                            return Error("订单无法创建:" + addResult);
339
+                        }
340
+                    }
341
+                }
365 342
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
366 343
                 {
367
-                    if (input.F_State == 0)
368
-                        return Success("售后申请已保存");
369
-                    else if (input.F_State == 1)
370
-                    { return Success("售后申请已提交审核"); }
344
+                    if (input.F_CheckStateSH == 0)
345
+                        return Success("售后已保存");
346
+                    else if (input.F_CheckStateSH == 1)
347
+                    { return Success("售后已提交"); }
371 348
                 }
372 349
                 return Error("申请失败,请重试!");
373 350
             }
374 351
             catch (Exception ex)
375 352
             { return Error(ex.Message); }
376 353
 
377
-
378 354
         }
379 355
 
380 356
         /// <summary>
@@ -389,67 +365,70 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
389 365
             {
390 366
                 #region 验证参数 必填项  
391 367
 
392
-                if (string.IsNullOrEmpty(input.F_Id))
393
-                    return Error("参数缺失Id");
394
-
395 368
                 if (string.IsNullOrEmpty(input.F_OrderId))
396 369
                     return Error("请选择订单");
397
-
370
+                if (string.IsNullOrEmpty(input.F_Id))
371
+                    return Error("请选择售后单");
398 372
                 if (input.F_Type <= 0)
399 373
                     return Error("申请类型不符合售后");
400 374
 
401 375
                 #endregion
402 376
 
403
-                #region 验证逻辑
404
-                if (input.F_Type == 1)
405
-                { }
406
-                else if (input.F_Type == 2)
407
-                { }
408
-                else if (input.F_Type == 3)
409
-                { }
410
-                else if (input.F_Type == 4)
411
-                { }
412
-                #endregion
413
-
414
-                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
415 377
 
416
-                if (modelAfterSale.F_CheckStateSH == 1 && modelAfterSale.F_CheckStateXS == 1)
378
+                T_Bus_Order modeOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_OrderId);
379
+                if (modeOrder == null)
417 380
                 {
418
-                    return Error("双审核通过不能编辑");
381
+                    return Error("订单不存在");
419 382
                 }
420
-                modelAfterSale.F_CheckTimeXS = DateTime.Now;
421
-                modelAfterSale.F_CheckStateXS = input.F_CheckStateXS;
422
-                modelAfterSale.F_CheckUserXS = UserLogin.UserId.ObjToInt();
423
-                modelAfterSale.F_CheckUserNameXS = UserLogin.UserName;
383
+                else if (modeOrder.F_Status == -1)
384
+                {
385
+                    //物流状态0 未发出 1物流运送中2签收3改代收4拒收
386
+                    return Error("订单状态不符合售后");
387
+                }
388
+                T_Bus_AfterSale modelAfterSale =await busAfterSaleRepository.GetSingle(q=>q.F_Id==input.F_Id);
389
+                if (modelAfterSale.F_CheckStateSH == 1)
390
+                {
391
+                    return Error("不能重复审核提交");
392
+                }
393
+                modelAfterSale.F_CheckTimeSH = DateTime.Now;
394
+                modelAfterSale.F_CheckStateSH = input.F_State;
395
+                modelAfterSale.F_CheckUserSH = UserLogin.UserId.ObjToInt();
396
+                modelAfterSale.F_CheckUserNameSH = UserLogin.UserName;
397
+
398
+                modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
424 399
 
425 400
                 modelAfterSale.F_DetailList = input.F_DetailList;
426 401
                 modelAfterSale.F_Type = input.F_Type;
427 402
                 modelAfterSale.F_Money = input.F_Money;
428 403
 
429
-                modelAfterSale.F_CheckStateSH = 0;//需要售后重新审核
430
-                //modelAfterSale.F_OurTrackingNo = input.F_OurTrackingNo;
431
-                //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
432
-                //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
433
-                //modelAfterSale.F_TrackDes = input.F_TrackDes;
404
+                modelAfterSale.F_OrderId = input.F_OrderId;
405
+                modelAfterSale.F_AboutOrderId = "";
406
+                modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
407
+
408
+                modelAfterSale.F_TrackingNo = input.F_TrackingNo;
409
+                modelAfterSale.F_TrackDes = input.F_TrackDes;
434 410
                 if (!string.IsNullOrEmpty(input.F_Remark))
435
-                    modelAfterSale.F_Remark = modelAfterSale.F_Remark + "\\r\\n 售后:" + input.F_Remark;
436
-
437
-
438
-                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
439
-                //modelAfterSale.F_AddUserName = UserLogin.UserName;
440
-                //modelAfterSale.F_State = input.F_State;
441
-                //modelAfterSale.F_Money = input.F_Money;
442
-                //modelAfterSale.F_Gift = input.F_Gift;
443
-                //modelAfterSale.F_Type = input.F_Type;
444
-                //modelAfterSale.F_OrderList = input.F_OrderList;
445
-                //modelAfterSale.F_Remark = input.F_Remark;
446
-                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
411
+                    modelAfterSale.F_Remark = " 售后:" + input.F_Remark;
412
+
413
+
414
+                if (modelAfterSale.F_Type == 4)
415
+                {
416
+                    if (modelAfterSale.F_CheckStateSH == 1)
417
+                    {
418
+                        modelAfterSale.F_AboutOrderId = "BJ" + UserLogin.UserId + "T" + DateTimeConvert.ToTimetag(DateTime.Now);
419
+                        string addResult = await AddOrder(modelAfterSale, modeOrder);
420
+                        if (addResult != "1")
421
+                        {
422
+                            return Error("订单无法创建:" + addResult);
423
+                        }
424
+                    }
425
+                }
447 426
                 if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
448 427
                 {
449
-                    if (input.F_State == 0)
450
-                        return Success("售后申请已保存");
451
-                    else if (input.F_State == 1)
452
-                    { return Success("售后申请已提交审核"); }
428
+                    if (input.F_CheckStateSH == 0)
429
+                        return Success("售后已保存");
430
+                    else if (input.F_CheckStateSH == 1)
431
+                    { return Success("售后已提交"); }
453 432
                 }
454 433
                 return Error("申请失败,请重试!");
455 434
             }
@@ -530,7 +509,143 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
530 509
 
531 510
         #endregion
532 511
 
512
+        /// <summary>
513
+        /// 仓库确认后创建订单  对发货直接创建订单
514
+        /// </summary>
515
+        /// <param name="newOrderlist">12,3|</param>
516
+        /// <param name="OldModelOrder"></param>
517
+        /// <param name="money"></param>
518
+        /// <returns></returns>
519
+        private async Task<string> AddOrder(T_Bus_AfterSale ModelAfterSale, T_Bus_Order OldModelOrder)
520
+        {
521
+            try
522
+            {
523
+                string newOrderlist = ModelAfterSale.F_DetailList;
524
+                T_Bus_Order modelOrder = OldModelOrder;
525
+                #region 订单属性
526
+                //必填
527
+
528
+                modelOrder.F_Type = "售后订单";
529
+                modelOrder.F_Id = ModelAfterSale.F_AboutOrderId;
530
+
531
+
532
+                //选填 快递属性
533
+
534
+                modelOrder.F_ExpressFee = 0;
535
+                //modelOrder.F_Stock = input.F_Stock;
536
+                modelOrder.F_Remark = "售后订单";
537
+
538
+                modelOrder.F_RealPrice = 0.00M;
539
+                modelOrder.F_UseScore = 0.00M;
540
+                //选填 关联属性
541
+
542
+                modelOrder.F_State = 0;
543
+                modelOrder.F_Status = 0;
544
+
533 545
 
546
+                //必须属性 系统生成
547
+                modelOrder.F_AddTime = DateTime.Now;
548
+                modelOrder.F_AddUser = UserLogin.UserId.ObjToInt();
549
+                modelOrder.F_AddUserName = UserLogin.UserName;
550
+                modelOrder.F_Belong = OldModelOrder.F_Belong;
551
+                modelOrder.F_BelongName = OldModelOrder.F_BelongName;
552
+                #endregion
553
+
554
+                //计算属性  商品计算
555
+
556
+
557
+                decimal totle = 0.00M;
558
+
559
+                List<T_Bus_OrderDetail> modelDetailList = new List<T_Bus_OrderDetail>();
560
+
561
+                #region 订单详情列表核算
562
+                if (string.IsNullOrEmpty(newOrderlist))
563
+                {
564
+                    int n = 1;
565
+
566
+                    #region 商品核算
567
+                    foreach (string product in newOrderlist.Split('|'))
568
+                    {
569
+                        string productid = product.Split(',')[0];
570
+                        int Count = product.Split(',')[1].ObjToInt();
571
+                        T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == productid);
572
+                        if (modelProduct == null)
573
+                            return "商品不存在:" + productid;
574
+                        T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
575
+                        modelDetail.F_ProductName = modelProduct.F_ProductName;
576
+                        modelDetail.F_ProductId = modelProduct.F_ProductId;
577
+                        modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
578
+                        modelDetail.F_OrderId = modelOrder.F_Id;
579
+                        modelDetail.F_Count = Count;
580
+                        modelDetail.F_Price = modelProduct.F_MemberPrice;
581
+
582
+                        modelDetail.F_DealPrice = modelProduct.F_MemberPrice;
583
+                        modelDetail.F_Remark = "售后订单:";
584
+
585
+
586
+                        modelDetail.F_Sort = n;
587
+                        modelDetail.F_AddTime = DateTime.Now;
588
+
589
+                        modelDetail.F_AddUser = modelOrder.F_AddUser;
590
+                        modelDetail.F_AddUserName = modelOrder.F_AddUserName;
591
+                        modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
592
+                        modelDetail.F_Activity = 0;
593
+                        modelDetailList.Add(modelDetail);
594
+                        totle += modelDetail.F_TotlePrice;
595
+                        n++;
596
+                    }
597
+                    #endregion
598
+
599
+                    modelOrder.F_TotlePrice = totle;
600
+                    modelOrder.F_ActivityMoney = 0.00M;
601
+                    modelOrder.F_UseActivity = "";
602
+                }
603
+                else
604
+                {
605
+                    return "0";
606
+                }
607
+                #endregion
608
+
609
+
610
+
611
+
612
+                #region 直接提交  锁库存log  锁积分log
613
+
614
+
615
+
616
+                modelOrder.F_FlowNum = Guid.NewGuid().ToString().Replace("-", "");
617
+                string strStock = await orderController.ChangeStockOne(modelOrder, 1, modelDetailList);
618
+                if (strStock != "1")
619
+                { modelOrder.F_State = 0; }
620
+                else
621
+                { modelOrder.F_SubmitTime = DateTime.Now; }
622
+
623
+
624
+
625
+
626
+
627
+                #endregion
628
+                //计算结果  积分有规则            
629
+                modelOrder.F_ShouldPrice = ModelAfterSale.F_Money;
630
+
631
+                modelOrder.F_RealPrice = 0.00M;
632
+
633
+
634
+                if (await bus_OrderRepository.AddReturnCount(modelOrder))
635
+                {
636
+                    if (await bus_OrderDetailRepository.AddMany(modelDetailList))
637
+                        return "1";
638
+                    else
639
+                        return "订单添加失败,请重试!";
640
+                }
641
+                else
642
+                {
643
+                    return "订单添加失败,请重试!";
644
+                }
645
+            }
646
+            catch (Exception ex)
647
+            { return ex.Message; }
648
+        }
534 649
 
535 650
 
536 651
 

+ 225 - 222
代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderController.cs

@@ -58,267 +58,270 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
58 58
         [HttpPost("addorder")]
59 59
         public async Task<IActionResult> AddOrder([FromBody]OrderInput input)
60 60
         {
61
-            T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
62
-            #region 验证参数 必填项  
63
-
64
-            if (string.IsNullOrEmpty(input.F_ADFrom))
65
-                return Error("请输入选择广告来源");
66
-            if (string.IsNullOrEmpty(input.F_Type))
67
-                return Error("请输入选择订单类型");
68
-            if (string.IsNullOrEmpty(input.F_Id))
69
-                return Error("请输入订单编号");
70
-            if (string.IsNullOrEmpty(input.F_Customer))
71
-                return Error("请输入客户姓名");
72
-            if (string.IsNullOrEmpty(input.F_CustomerPhone))
73
-                return Error("请输入客户电话");
74
-            #endregion
61
+            try {
62
+                T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
63
+                #region 验证参数 必填项  
75 64
 
65
+                if (string.IsNullOrEmpty(input.F_ADFrom))
66
+                    return Error("请输入选择广告来源");
67
+                if (string.IsNullOrEmpty(input.F_Type))
68
+                    return Error("请输入选择订单类型");
69
+                if (string.IsNullOrEmpty(input.F_Id))
70
+                    return Error("请输入订单编号");
71
+                if (string.IsNullOrEmpty(input.F_Customer))
72
+                    return Error("请输入客户姓名");
73
+                if (string.IsNullOrEmpty(input.F_CustomerPhone))
74
+                    return Error("请输入客户电话");
75
+                #endregion
76 76
 
77
-            int exist = await bus_OrderRepository.GetCount(q => q.F_Id == input.F_Id);
78
-            if (exist > 0)
79
-            {
80
-                return Error("此订单号已存在");
81
-            }
82
-            T_Bus_Order modelOrder = new T_Bus_Order();
83
-            #region 订单属性
84
-            //必填
85
-            modelOrder.F_ADFrom = input.F_ADFrom;
86
-            modelOrder.F_Type = input.F_Type;
87
-            modelOrder.F_Id = input.F_Id;
88 77
 
89
-            modelOrder.F_Customer = input.F_Customer;
90
-            modelOrder.F_CustomerPhone = input.F_CustomerPhone;
91
-            //选填 快递属性
92
-            modelOrder.F_TrackingNo = input.F_TrackingNo;
93
-            modelOrder.F_Addressee = input.F_Addressee;
94
-            modelOrder.F_AddPhone = input.F_AddPhone;
95
-            modelOrder.F_AddProvince = input.F_AddProvince;
96
-            modelOrder.F_AddCity = input.F_AddCity;
97
-            modelOrder.F_AddArea = input.F_AddArea;
98
-            modelOrder.F_AddTown = input.F_AddTown;
99
-            modelOrder.F_AddDes = input.F_AddDes;
100
-            modelOrder.F_Address = input.F_Address;
101
-            modelOrder.F_PostalCode = input.F_PostalCode;
102
-            modelOrder.F_Express = input.F_Express;
103
-            modelOrder.F_ExpressFee = input.F_ExpressFee;
78
+                int exist = await bus_OrderRepository.GetCount(q => q.F_Id == input.F_Id);
79
+                if (exist > 0)
80
+                {
81
+                    return Error("此订单号已存在");
82
+                }
83
+                T_Bus_Order modelOrder = new T_Bus_Order();
84
+                #region 订单属性
85
+                //必填
86
+                modelOrder.F_ADFrom = input.F_ADFrom;
87
+                modelOrder.F_Type = input.F_Type;
88
+                modelOrder.F_Id = input.F_Id;
89
+
90
+                modelOrder.F_Customer = input.F_Customer;
91
+                modelOrder.F_CustomerPhone = input.F_CustomerPhone;
92
+                //选填 快递属性
93
+                modelOrder.F_TrackingNo = input.F_TrackingNo;
94
+                modelOrder.F_Addressee = input.F_Addressee;
95
+                modelOrder.F_AddPhone = input.F_AddPhone;
96
+                modelOrder.F_AddProvince = input.F_AddProvince;
97
+                modelOrder.F_AddCity = input.F_AddCity;
98
+                modelOrder.F_AddArea = input.F_AddArea;
99
+                modelOrder.F_AddTown = input.F_AddTown;
100
+                modelOrder.F_AddDes = input.F_AddDes;
101
+                modelOrder.F_Address = input.F_Address;
102
+                modelOrder.F_PostalCode = input.F_PostalCode;
103
+                modelOrder.F_Express = input.F_Express;
104
+                modelOrder.F_ExpressFee = input.F_ExpressFee;
105
+
106
+                modelOrder.F_PayType = input.F_PayType;
107
+                modelOrder.F_Stock = input.F_Stock;
108
+                modelOrder.F_Remark = input.F_Remark;
109
+
110
+                modelOrder.F_RealPrice = input.F_RealPrice;
111
+                modelOrder.F_UseScore = input.F_UseScore;
112
+                //选填 关联属性
113
+                modelOrder.F_VipId = input.F_VipId;
114
+                modelOrder.F_State = input.F_State;
115
+                modelOrder.F_Status = 0;
104 116
 
105
-            modelOrder.F_PayType = input.F_PayType;
106
-            modelOrder.F_Stock = input.F_Stock;
107
-            modelOrder.F_Remark = input.F_Remark;
108 117
 
109
-            modelOrder.F_RealPrice = input.F_RealPrice;
110
-            modelOrder.F_UseScore = input.F_UseScore;
111
-            //选填 关联属性
112
-            modelOrder.F_VipId = input.F_VipId;
113
-            modelOrder.F_State = input.F_State;
114
-            modelOrder.F_Status = 0;
118
+                //必须属性 系统生成
119
+                modelOrder.F_AddTime = DateTime.Now;
120
+                modelOrder.F_AddUser = UserLogin.UserId.ObjToInt();
121
+                modelOrder.F_AddUserName = UserLogin.UserName;
122
+                modelOrder.F_Belong = UserLogin.UserId.ObjToInt();
123
+                modelOrder.F_BelongName = UserLogin.UserName;
124
+                #endregion
115 125
 
126
+                //计算属性  商品计算
116 127
 
117
-            //必须属性 系统生成
118
-            modelOrder.F_AddTime = DateTime.Now;
119
-            modelOrder.F_AddUser = UserLogin.UserId.ObjToInt();
120
-            modelOrder.F_AddUserName = UserLogin.UserName;
121
-            modelOrder.F_Belong = 0;
122
-            modelOrder.F_BelongName = "";
123
-            #endregion
128
+                decimal F_Score = 0.00M;
129
+                decimal totle = 0.00M;
130
+                decimal ActivityMoney = 0.00M;
131
+                string UseActivity = "";
132
+                string UseActivity4 = ",";
133
+                string UseActivity2 = ",";
134
+                List<T_Bus_OrderDetail> modelDetailList = new List<T_Bus_OrderDetail>();
124 135
 
125
-            //计算属性  商品计算
126
-
127
-            decimal F_Score = 0.00M;
128
-            decimal totle = 0.00M;
129
-            decimal ActivityMoney = 0.00M;
130
-            string UseActivity = "";
131
-            string UseActivity4 = ",";
132
-            string UseActivity2 = ",";
133
-            List<T_Bus_OrderDetail> modelDetailList = new List<T_Bus_OrderDetail>();
134
-
135
-            #region 订单详情列表核算
136
-            if (input.OrderDetailList != null && input.OrderDetailList.Count > 0)
137
-            {
138
-                int n = 1;
139
-                int n2 = input.OrderDetailList.Count + 1;
140
-                #region 活动核算
141
-                if (input.UseActList != null && input.UseActList.Count > 0)
136
+                #region 订单详情列表核算
137
+                if (input.OrderDetailList != null && input.OrderDetailList.Count > 0)
142 138
                 {
143
-                    //遍历所有选中的活动
144
-                    foreach (UseActInput act in input.UseActList)
139
+                    int n = 1;
140
+                    int n2 = input.OrderDetailList.Count + 1;
141
+                    #region 活动核算
142
+                    if (input.UseActList != null && input.UseActList.Count > 0)
145 143
                     {
146
-                        UseActivity += act.id + ",";
147
-                        //满赠
148
-                        if (act.type == 1)
144
+                        //遍历所有选中的活动
145
+                        foreach (UseActInput act in input.UseActList)
149 146
                         {
150
-                            string[] productidlist = act.gift.Split(',');
151
-                            foreach (string giftid in productidlist)
147
+                            UseActivity += act.id + ",";
148
+                            //满赠
149
+                            if (act.type == 1)
152 150
                             {
153
-                                T_Bus_Product m = await bus_productRepository.GetSingle(b => ("," + giftid + ",").Contains("," + b.F_ProductId + ",") && b.F_IsSale == 0);
154
-                                if (m != null)
151
+                                string[] productidlist = act.gift.Split(',');
152
+                                foreach (string giftid in productidlist)
155 153
                                 {
156
-                                    T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
157
-                                    modelDetail.F_ProductName = m.F_ProductName;
158
-                                    modelDetail.F_ProductId = m.F_ProductId;
159
-                                    modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
160
-                                    modelDetail.F_OrderId = input.F_Id;
161
-                                    modelDetail.F_Count = 1;
162
-                                    modelDetail.F_Price = 0.00M;
163
-                                    modelDetail.F_DealPrice = 0.00M;
164
-                                    modelDetail.F_Sort = n2;
165
-                                    modelDetail.F_Remark = "赠品-活动:" + act.id;
166
-                                    modelDetail.F_AddUser = modelOrder.F_AddUser;
167
-                                    modelDetail.F_AddUserName = modelOrder.F_AddUserName;
168
-                                    modelDetail.F_TotlePrice = 0.00M;
169
-                                    modelDetail.F_Activity = act.id;
170
-                                    modelDetail.F_AddTime = DateTime.Now;
171
-                                    modelDetailList.Add(modelDetail);
172
-                                    n2++;
154
+                                    T_Bus_Product m = await bus_productRepository.GetSingle(b => ("," + giftid + ",").Contains("," + b.F_ProductId + ",") && b.F_IsSale == 0);
155
+                                    if (m != null)
156
+                                    {
157
+                                        T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
158
+                                        modelDetail.F_ProductName = m.F_ProductName;
159
+                                        modelDetail.F_ProductId = m.F_ProductId;
160
+                                        modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
161
+                                        modelDetail.F_OrderId = input.F_Id;
162
+                                        modelDetail.F_Count = 1;
163
+                                        modelDetail.F_Price = 0.00M;
164
+                                        modelDetail.F_DealPrice = 0.00M;
165
+                                        modelDetail.F_Sort = n2;
166
+                                        modelDetail.F_Remark = "赠品-活动:" + act.id;
167
+                                        modelDetail.F_AddUser = modelOrder.F_AddUser;
168
+                                        modelDetail.F_AddUserName = modelOrder.F_AddUserName;
169
+                                        modelDetail.F_TotlePrice = 0.00M;
170
+                                        modelDetail.F_Activity = act.id;
171
+                                        modelDetail.F_AddTime = DateTime.Now;
172
+                                        modelDetailList.Add(modelDetail);
173
+                                        n2++;
174
+                                    }
173 175
                                 }
174
-                            }
175 176
 
177
+                            }
178
+                            //生日赠
179
+                            else if (act.type == 2)
180
+                            {
181
+                                UseActivity2 += act.gift + ",";
182
+                            }
183
+                            //满减
184
+                            else if (act.type == 3)
185
+                            {
186
+                                ActivityMoney += act.money;
187
+                            }
188
+                            else if (act.type == 4)
189
+                            {
190
+                                UseActivity4 += act.gift + ",";
191
+                            }
176 192
                         }
177
-                        //生日赠
178
-                        else if (act.type == 2)
179
-                        {
180
-                            UseActivity2 += act.gift + ",";
181
-                        }
182
-                        //满减
183
-                        else if (act.type == 3)
193
+                        UseActivity = UseActivity.Trim(',');
194
+                    }
195
+                    #endregion
196
+
197
+                    #region 商品核算
198
+                    foreach (OrderDetailInput m in input.OrderDetailList)
199
+                    {
200
+                        T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
201
+                        if (modelProduct == null)
202
+                            return Error("商品不存在:" + m.F_ProductId);
203
+                        T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
204
+                        modelDetail.F_ProductName = modelProduct.F_ProductName;
205
+                        modelDetail.F_ProductId = modelProduct.F_ProductId;
206
+                        modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
207
+                        modelDetail.F_OrderId = input.F_Id;
208
+                        modelDetail.F_Count = m.F_Count;
209
+                        modelDetail.F_Price = modelProduct.F_MemberPrice;
210
+                        //参加活动特价
211
+                        if (UseActivity4.Contains("," + modelProduct.F_ProductId + ","))
212
+                            modelDetail.F_DealPrice = modelProduct.F_SpecialPrice;
213
+                        else
214
+                            modelDetail.F_DealPrice = modelProduct.F_MemberPrice;
215
+                        //参加生日
216
+                        if (UseActivity2.Contains("," + modelProduct.F_ProductId + ","))
184 217
                         {
185
-                            ActivityMoney += act.money;
218
+                            modelDetail.F_DealPrice = 0.00M;
219
+                            modelDetail.F_Remark = "生日赠品-活动:";
186 220
                         }
187
-                        else if (act.type == 4)
221
+
222
+                        modelDetail.F_Sort = n;
223
+                        modelDetail.F_AddTime = DateTime.Now;
224
+
225
+                        modelDetail.F_AddUser = modelOrder.F_AddUser;
226
+                        modelDetail.F_AddUserName = modelOrder.F_AddUserName;
227
+                        modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
228
+                        modelDetail.F_Activity = 0;
229
+                        if (modelProduct.F_Tag.IndexOf(".") > -1)
188 230
                         {
189
-                            UseActivity4 += act.gift + ",";
231
+                            string[] tagarry = modelProduct.F_Tag.Split(',');
232
+                            string tag = tagarry.First(a => a.StartsWith(".")).ToString();
233
+                            T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => ("," + b.F_Commodity + ",").Contains(("," + tag + ",")));
234
+
235
+                            //此商品参加活动
236
+                            if (modelactive != null)
237
+                            {
238
+                                modelDetail.F_Activity = modelactive.F_ID;
239
+                            }
190 240
                         }
241
+
242
+                        totle += modelDetail.F_TotlePrice;
243
+                        modelDetailList.Add(modelDetail);
244
+
245
+                        n++;
191 246
                     }
192
-                    UseActivity = UseActivity.Trim(',');
247
+                    #endregion
248
+
249
+                    modelOrder.F_TotlePrice = totle;
250
+                    modelOrder.F_ActivityMoney = ActivityMoney;
251
+                    modelOrder.F_UseActivity = UseActivity;
252
+                }
253
+                else
254
+                {
255
+                    //不改变订单
193 256
                 }
194 257
                 #endregion
195 258
 
196
-                #region 商品核算
197
-                foreach (OrderDetailInput m in input.OrderDetailList)
259
+                //订单完成后也不计算积分
260
+                modelOrder.F_Score = 0.00M;
261
+                T_Cus_ScoreSet modelscore = await cus_score_setRepository.GetSingle(x => x.F_State == 1);
262
+                if (modelscore == null)
198 263
                 {
199
-                    T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
200
-                    if (modelProduct == null)
201
-                        return Error("商品不存在:" + m.F_ProductId);
202
-                    T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
203
-                    modelDetail.F_ProductName = modelProduct.F_ProductName;
204
-                    modelDetail.F_ProductId = modelProduct.F_ProductId;
205
-                    modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
206
-                    modelDetail.F_OrderId = input.F_Id;
207
-                    modelDetail.F_Count = m.F_Count;
208
-                    modelDetail.F_Price = modelProduct.F_MemberPrice;
209
-                    //参加活动特价
210
-                    if (UseActivity4.Contains("," + modelProduct.F_ProductId + ","))
211
-                        modelDetail.F_DealPrice = modelProduct.F_SpecialPrice;
212
-                    else
213
-                        modelDetail.F_DealPrice = modelProduct.F_MemberPrice;
214
-                    //参加生日
215
-                    if (UseActivity2.Contains("," + modelProduct.F_ProductId + ","))
216
-                    {
217
-                        modelDetail.F_DealPrice = 0.00M;
218
-                        modelDetail.F_Remark = "生日赠品-活动:";
219
-                    }
264
+                    modelscore = new T_Cus_ScoreSet();
265
+                    modelscore.F_Start = 0;
266
+                    modelscore.F_StartDebit = 0;
267
+                    modelscore.F_GetPercent = 1000;
268
+                }
220 269
 
221
-                    modelDetail.F_Sort = n;
222
-                    modelDetail.F_AddTime = DateTime.Now;
223 270
 
224
-                    modelDetail.F_AddUser = modelOrder.F_AddUser;
225
-                    modelDetail.F_AddUserName = modelOrder.F_AddUserName;
226
-                    modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
227
-                    modelDetail.F_Activity = 0;
228
-                    if (modelProduct.F_Tag.IndexOf(".") > -1)
229
-                    {
230
-                        string[] tagarry = modelProduct.F_Tag.Split(',');
231
-                        string tag = tagarry.First(a => a.StartsWith(".")).ToString();
232
-                        T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => ("," + b.F_Commodity + ",").Contains(("," + tag + ",")));
271
+                #region 直接提交  锁库存log  锁积分log
233 272
 
234
-                        //此商品参加活动
235
-                        if (modelactive != null)
236
-                        {
237
-                            modelDetail.F_Activity = modelactive.F_ID;
238
-                        }
273
+                if (input.F_State == 1)
274
+                {
275
+                    if (string.IsNullOrEmpty(input.F_Stock))
276
+                    {
277
+                        return Error("请选择货仓");
278
+                    } if (modelscore.F_StartDebit != 1)
279
+                    {
280
+                        modelOrder.F_UseScore = 0;
281
+                    }
282
+                    modelOrder.F_FlowNum = Guid.NewGuid().ToString().Replace("-", "");
283
+                    string strStock = await ChangeStockOne(modelOrder, 1, modelDetailList);
284
+                    if (strStock != "1")
285
+                    { return Error(strStock); }
286
+                    if (modelscore.F_Start == 1)
287
+                    {
288
+                        //订单完成后计算积分
289
+                        modelOrder.F_Score = -0.01M;
239 290
                     }
240 291
 
241
-                    totle += modelDetail.F_TotlePrice;
242
-                    modelDetailList.Add(modelDetail);
243
-
244
-                    n++;
292
+                    modelOrder.F_SubmitTime = DateTime.Now;
245 293
                 }
246
-                #endregion
247 294
 
248
-                modelOrder.F_TotlePrice = totle;
249
-                modelOrder.F_ActivityMoney = ActivityMoney;
250
-                modelOrder.F_UseActivity = UseActivity;
251
-            }
252
-            else
253
-            {
254
-                //不改变订单
255
-            }
256
-            #endregion
257
-
258
-            //订单完成后也不计算积分
259
-            modelOrder.F_Score = 0.00M;
260
-            T_Cus_ScoreSet modelscore = await cus_score_setRepository.GetSingle(x => x.F_State == 1);
261
-            if (modelscore == null)
262
-            {
263
-                modelscore = new T_Cus_ScoreSet();
264
-                modelscore.F_Start = 0;
265
-                modelscore.F_StartDebit = 0;
266
-                modelscore.F_GetPercent = 1000;
267
-            }
268
-            
269
-
270
-            #region 直接提交  锁库存log  锁积分log
295
+                #endregion
296
+                //计算结果  积分有规则            
297
+                modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - ActivityMoney + modelOrder.F_ExpressFee;
271 298
 
272
-            if (input.F_State == 1)
273
-            {
274
-                if (string.IsNullOrEmpty(input.F_Stock))
275
-                {
276
-                    return Error("请选择货仓");
277
-                }if (modelscore.F_StartDebit != 1)
299
+                #region 核算是否支付完成
300
+                if ((modelOrder.F_RealPrice + modelOrder.F_UseScore / modelscore.F_GetPercent) >= modelOrder.F_ShouldPrice)
278 301
                 {
279
-                    modelOrder.F_UseScore = 0;
302
+                    modelOrder.F_PayState = 1;
280 303
                 }
281
-                modelOrder.F_FlowNum = Guid.NewGuid().ToString().Replace("-", "");
282
-              string strStock= await ChangeStockOne(modelOrder, 1, modelDetailList);
283
-                if (strStock != "1")
284
-                { return Error(strStock); }
285
-                if (modelscore.F_Start == 1)
304
+                else
286 305
                 {
287
-                    //订单完成后计算积分
288
-                    modelOrder.F_Score = -0.01M;
306
+                    modelOrder.F_PayState = 0;
289 307
                 }
290
-             
291
-                modelOrder.F_SubmitTime = DateTime.Now;
292
-            }
293
-
294
-            #endregion
295
-            //计算结果  积分有规则            
296
-            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - ActivityMoney + modelOrder.F_ExpressFee;
297
-
298
-            #region 核算是否支付完成
299
-            if ((modelOrder.F_RealPrice + modelOrder.F_UseScore / modelscore.F_GetPercent) >= modelOrder.F_ShouldPrice)
300
-            {
301
-                modelOrder.F_PayState = 1;
302
-            }
303
-            else
304
-            {
305
-                modelOrder.F_PayState = 0;
306
-            }
307
-            #endregion
308
+                #endregion
308 309
 
309 310
 
310
-            if (await bus_OrderRepository.AddReturnCount(modelOrder))
311
-            {
312
-                if (await bus_OrderDetailRepository.AddMany(modelDetailList))
313
-                    return Success("订单添加成功");
311
+                if (await bus_OrderRepository.AddReturnCount(modelOrder))
312
+                {
313
+                    if (await bus_OrderDetailRepository.AddMany(modelDetailList))
314
+                        return Success("订单添加成功");
315
+                    else
316
+                        return Error("订单添加失败,请重试!");
317
+                }
314 318
                 else
319
+                {
315 320
                     return Error("订单添加失败,请重试!");
321
+                }
316 322
             }
317
-            else
318
-            {
319
-                return Error("订单添加失败,请重试!");
320
-            }
321
-
323
+            catch (Exception ex)
324
+            { return Error(ex.Message); }
322 325
         }
323 326
 
324 327
         /// <summary>
@@ -388,8 +391,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
388 391
 
389 392
 
390 393
             modelOrder.F_State = input.F_State;
391
-            modelOrder.F_Belong = 0;
392
-            modelOrder.F_BelongName = "";
394
+            modelOrder.F_Belong = UserLogin.UserId.ObjToInt();
395
+            modelOrder.F_BelongName = UserLogin.UserName;
393 396
             modelOrder.F_Status = 0;
394 397
 
395 398
 
@@ -865,7 +868,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
865 868
             conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = "0" });
866 869
 
867 870
             //状态
868
-            if (input.F_State > -1)
871
+            if (input.F_State > -2)
869 872
             {
870 873
                 conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = input.F_State.ToString() });
871 874
             }

+ 20 - 9
代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

@@ -65,10 +65,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
65 65
                 return Error("请输入分类简写");
66 66
 
67 67
             #endregion
68
-            Expression<Func<T_Bus_ProductClass, bool>> eq = a => a.F_ClassName == input.ClassName;
69
-            if (await _productClassRepository.GetCount(eq.Or(b => b.F_ClassShortName == input.ClassShortName)) > 0)
68
+
69
+            if (await _productClassRepository.GetCount(a => a.F_ClassName == input.ClassName) > 0)
70
+            {
71
+                return Error("分类名称重复");
72
+            }
73
+            if (await _productClassRepository.GetCount(b => b.F_ClassShortName == input.ClassShortName) > 0)
70 74
             {
71
-                return Error("分类/简写名称重复");
75
+                return Error("简写重复");
72 76
             }
73 77
             T_Bus_ProductClass T_Bus_ProductClassModel = new T_Bus_ProductClass();
74 78
             if (input.ClassId != 0)
@@ -194,9 +198,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
194 198
             {
195 199
                 TreeModel treeModel = new TreeModel();
196 200
                 treeModel.id = item.F_ClassId;
197
-                treeModel.iconcls = "";
201
+                treeModel.iconcls = item.F_Sort.ToString();
198 202
                 treeModel.text = item.F_ClassName;
199 203
                 treeModel.parentid = item.F_ParentId;
204
+                treeModel.code = item.F_ClassShortName;
200 205
                 treeList.Add(treeModel);
201 206
             }
202 207
             return Success("获取产品分类树成功", treeList.TreeRecursion(0));
@@ -301,12 +306,18 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
301 306
             if (string.IsNullOrEmpty(input.PinyinShort))
302 307
                 return Error("请输入正确拼音简码");
303 308
             #endregion
304
-            Expression<Func<T_Bus_Product, bool>> eq = a => a.F_ProductName == input.ProductName;
305
-            eq = eq.Or(b => b.F_ProductId == input.ProductId);
306
-            eq = eq.Or(b => b.F_ProductShortName == input.ProductShortName);
307
-            if (await _productRepository.GetCount(eq) > 0)
309
+
310
+            if (await _productRepository.GetCount(a => a.F_ProductName == input.ProductName) > 0)
311
+            {
312
+                return Error("产品名称 有重复");
313
+            }
314
+            if (await _productRepository.GetCount(b => b.F_ProductId == input.ProductId) > 0)
315
+            {
316
+                return Error("产品ID 有重复");
317
+            }
318
+            if (await _productRepository.GetCount(b => b.F_ProductShortName == input.ProductShortName) > 0)
308 319
             {
309
-                return Error("名称/简称 有重复");
320
+                return Error("产品副标题 有重复");
310 321
             }
311 322
             if (!string.IsNullOrEmpty(input.Tag))
312 323
             {