Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Product/OrderModule.cs

@@ -2568,7 +2568,9 @@ namespace Mall.Module.Product
             var trans = goods_OrderRepository.DbTransaction;
             try
             {
-                demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssffffff");
+                Random R = new Random();
+                int Rstr = R.Next(111, 999);
+                demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
                 demodel.PaymentWay = OrderPaymentTypeEnum.OnlinePayment;//先默认在线支付
                 demodel.Remark ??= "";
                 demodel.ApplyForCancelStatus ??= 0;
@@ -3760,7 +3762,10 @@ namespace Mall.Module.Product
             demodel.OrderId = dModel.OrderId;
             demodel.ReExpressId ??= 0;
             demodel.ReExpressNumber ??= "";
-            demodel.ReOrderNo = "RE" + DateTime.Now.ToString("yyyyMMddHHmmssffffff");
+            Random R = new Random();
+            int Rstr = R.Next(111, 999);
+            demodel.ReOrderNo = "RE" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
+
             var oasList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = demodel.OrderDetialId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
             if (oasList.Any())
             {
@@ -3960,6 +3965,7 @@ namespace Mall.Module.Product
                 model.Refund,
                 model.RefundActual,
                 model.ReOrderStatus,
+                model.Remark,
                 ReOrderStatusName = model.ReOrderStatus.GetEnumName(),
                 AuditTime = model.AuditTime.HasValue ? model.AuditTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 FinishTime = model.FinishTime.HasValue ? model.FinishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
@@ -5356,8 +5362,25 @@ namespace Mall.Module.Product
                                        OperatorEnum=OperatorEnum.Equal
                                 }
                             };
-                            member_UserRepository.Update(keyValues1, wheres1, trans);
-
+                            bool flag2 = member_UserRepository.Update(keyValues1, wheres1, trans);
+                            if (flag2)
+                            {
+                                member_IntegralRepository.Insert(new Model.Entity.User.RB_Member_Integral()
+                                {
+                                    Id = 0,
+                                    CreateDate = DateTime.Now,
+                                    Description = "订单取消返回积分抵扣，订单号：" + omodel.OrderNo,
+                                    Image = 0,
+                                    Integral = TotalIntegralNumber,
+                                    MallBaseId = omodel.MallBaseId,
+                                    PlatformType = omodel.OrderSource,
+                                    Remarks = "",
+                                    TenantId = omodel.TenantId,
+                                    Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
+                                    UserId = omodel.UserId,
+                                    OrderId = omodel.OrderId
+                                }, trans);
+                            }
                         }
                         //优惠券回滚
                         if (!string.IsNullOrEmpty(omodel.CouponsIds))

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -408,7 +408,7 @@ WHERE od.GoodsId in({goodsIds}) and o.`Status`=0 and o.OrderStatus <> 7 group by
         /// <returns></returns>
         public List<RB_Goods_Order_Extend> GetAppletGoodsOrderNumStatistics(int userId, int tenantId, int mallBaseId)
         {
-            string sql = $" SELECT OrderStatus,COUNT(0) as OrderNum FROM rb_goods_order WHERE `Status`=0 and OrderStatus in (1,2,3) and UserId={userId} and TenantId={tenantId} and MallBaseId={mallBaseId}";
+            string sql = $" SELECT OrderStatus,COUNT(0) as OrderNum FROM rb_goods_order WHERE `Status`=0 and OrderStatus in (1,2,3) and UserId={userId} and TenantId={tenantId} and MallBaseId={mallBaseId} GROUP BY OrderStatus";
             return Get<RB_Goods_Order_Extend>(sql).ToList();
         }
 

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -522,7 +522,9 @@ namespace Mall.WebApi.Controllers.User
             demodel.UserId = userInfo.UserId;
             demodel.AuditStatus = DistributorRemitAuditStatusEnum.Auditing;
             demodel.CreateDate = DateTime.Now;
-            demodel.OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssffff");
+            Random R = new Random();
+            int Rstr = R.Next(111, 999);
+            demodel.OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
             string msg = userModule.SetDistrbutorWithdrawDeposit(demodel);
             if (msg == "")
             {

Mall.WebApi/Controllers/User/UserController.cs

@@ -1759,7 +1759,9 @@ namespace Mall.WebApi.Controllers.User
             demodel.MallBaseId = req.MallBaseId;
             demodel.AuditStatus = DistributorRemitAuditStatusEnum.Auditing;
             demodel.RemitMoney ??= 0;
-            demodel.OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssffff");
+            Random R = new Random();
+            int Rstr = R.Next(111, 999);
+            demodel.OrderNum = DateTime.Now.ToString("yyyyMMddHHmmssfff") + Rstr;
             demodel.CreateDate = DateTime.Now;
             string msg = userModule.SetDistributorRemitInfo(demodel);
             if (msg == "")