订单

Mall.Model/Extend/Product/RB_Goods_ExpressRelevance_Extend.cs

@@ -13,6 +13,9 @@ namespace Mall.Model.Extend.Product
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Goods_ExpressRelevance_Extend : RB_Goods_ExpressRelevance
     {
-        
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -25,5 +25,9 @@ namespace Mall.Model.Extend.Product
         /// 明细ids
         /// </summary>
         public string OrderDetailIds { get; set; }
+        /// <summary>
+        /// 是否已发货
+        /// </summary>
+        public int? IsBindExpress { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -13,6 +13,10 @@ namespace Mall.Model.Extend.Product
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Goods_Order_Extend : RB_Goods_Order
     {
+        /// <summary>
+        /// 收货地址id
+        /// </summary>
+        public int? ShippingAddressId { get; set; }
         /// <summary>
         /// 商品id
         /// </summary>

Mall.Repository/Product/RB_Goods_ExpressRelevanceRepository.cs

@@ -34,6 +34,10 @@ namespace Mall.Repository.Product
             {
                 where += $@" and {nameof(RB_Goods_ExpressRelevance.OrderId)}={dmodel.OrderId}";
             }
+            if (!string.IsNullOrEmpty(dmodel.OrderIds)) 
+            {
+                where += $@" and {nameof(RB_Goods_ExpressRelevance.OrderId)} in({dmodel.OrderIds})";
+            }
             if (dmodel.OrderDetailId > 0)
             {
                 where += $@" and {nameof(RB_Goods_ExpressRelevance.OrderDetailId)}={dmodel.OrderDetailId}";

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -181,6 +181,40 @@ namespace Mall.WebApi.Controllers.MallBase
             return orderModule.GetAppletGoodsSettlementInfo(demodel);
         }
 
+        /// <summary>
+        /// 结算页面修改快递，获取快递费用
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletGoodsSettlementExpress()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
+            if ((demodel.ShippingAddressId ?? 0) <= 0) {
+                return ApiResult.ParamIsNull("请传递收货地址id");
+            }
+            if (demodel.DetailList == null || !demodel.DetailList.Any())
+            {
+                return ApiResult.ParamIsNull("请传递商品信息");
+            }
+            foreach (var item in demodel.DetailList)
+            {
+                if ((item.GoodsId ?? 0) <= 0)
+                {
+                    return ApiResult.ParamIsNull("请传递商品id");
+                }
+                if ((item.Number ?? 0) <= 0)
+                {
+                    return ApiResult.ParamIsNull("请传递商品数量");
+                }
+            }
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.UserId = userInfo.UserId;
+            return orderModule.GetAppletGoodsSettlementExpress(demodel);
+        }
+
         /// <summary>
         /// 下单
         /// </summary>
@@ -196,10 +230,23 @@ namespace Mall.WebApi.Controllers.MallBase
             if (string.IsNullOrEmpty(demodel.Mobile)) {
                 return ApiResult.ParamIsNull("请传递收件人手机号码");
             }
-            if (demodel.DeliveryMethod != Common.Enum.Goods.OrderDeliveryMethodEnum.VerificationShop) {
-                if ((demodel.District ?? 0) <= 0) {
+            if (demodel.DeliveryMethod != Common.Enum.Goods.OrderDeliveryMethodEnum.VerificationShop)
+            {
+                if ((demodel.District ?? 0) <= 0)
+                {
                     return ApiResult.ParamIsNull("收货地址有误");
                 }
+                if (string.IsNullOrEmpty(demodel.ShippingAddress)) {
+                    return ApiResult.ParamIsNull("收货详细地址不能为空");
+                }
+            }
+            else {
+                if (string.IsNullOrEmpty(demodel.Consignee)) {
+                    return ApiResult.ParamIsNull("收件人不能为空");
+                }
+                if (string.IsNullOrEmpty(demodel.Mobile)) {
+                    return ApiResult.ParamIsNull("收件人手机不能为空");
+                }
             }
             if (demodel.DetailList == null || !demodel.DetailList.Any()) {
                 return ApiResult.ParamIsNull("请传递商品信息");
@@ -211,10 +258,29 @@ namespace Mall.WebApi.Controllers.MallBase
                 if ((item.Number ?? 0) <= 0) {
                     return ApiResult.ParamIsNull("请传递商品数量");
                 }
-
             }
+            
+            demodel.BuyerMessage ??= "";//买家留言
+            demodel.OrderSource ??= UserSourceEnum.WeiXin;
+            #region 赋默认值
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.OrderStatus = Common.Enum.Goods.OrderStatusEnum.NonPayment;
+            demodel.CreateDate = DateTime.Now;
+            demodel.Fee ??= 0;
+            demodel.FreightMoney ??= 0;
+            demodel.HistoryOrderStatus ??= 0;
+            demodel.IsApplyForCancel ??= 2;
+            demodel.IsOrderCommission ??= 2;
+            demodel.MerchantsNo ??= "";
+            demodel.Recycled ??= 2;
+            demodel.Refund ??= 0;
+            demodel.Status = 0;
+            demodel.UpdateDate = DateTime.Now;
+            demodel.UserId = userInfo.UserId;
+            #endregion
 
-            return ApiResult.Success();
+            return orderModule.SetAppletGoodsOrderInfo(demodel);            
         }
 
         #endregion

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -70,7 +70,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.Specification,
                     y.ProductCode,
                     y.Final_Price,
-                    y.Number
+                    y.Number,
+                    y.IsBindExpress
                 }),
                 x.Consignee,
                 x.Mobile,
@@ -234,6 +235,51 @@ namespace Mall.WebApi.Controllers.MallBase
 
         }
 
+        /// <summary>
+        /// 获取商品订单类型枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOrderTypeEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(OrderTypeEnum));
+            return ApiResult.Success("", list.Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
+        /// <summary>
+        /// 获取商品订单配送类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOrderDeliveryMethodEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(OrderDeliveryMethodEnum));
+            return ApiResult.Success("", list.Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
+        /// <summary>
+        /// 获取商品订单状态枚举
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOrderStatusEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(OrderStatusEnum));
+            return ApiResult.Success("", list.Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
         /// <summary>
         /// 下单
         /// </summary>