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

Mall.Module.User/SmallShopsModule.cs

@@ -704,6 +704,27 @@ namespace Mall.Module.User
                         }
                     };
                     item.IsPublic = 5;//默认平台虚拟账户
+
+                    #region 查询所有的订单
+                    List<Model.Entity.Finance.RB_ECFinanceId_Relation> ECList = new List<Model.Entity.Finance.RB_ECFinanceId_Relation>();
+                    if (!string.IsNullOrEmpty(remitModel.ReOrderIds))
+                    {
+                        List<int> reorderIdList = JsonConvert.DeserializeObject<List<int>>(remitModel.ReOrderIds);
+                        if (reorderIdList.Any())
+                        {
+                            reorderIdList = reorderIdList.Distinct().ToList();
+                            var orderDetailList = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, OrderIds = string.Join(",", reorderIdList) });
+                            foreach (var qitem in orderDetailList)
+                            {
+                                ECList.Add(new Model.Entity.Finance.RB_ECFinanceId_Relation()
+                                {
+                                    ECOrderId = qitem.OrderId,
+                                    ECOrderDetailId = qitem.Id
+                                });
+                            }
+                        }
+                    }
+                    #endregion
                     var financeObj = new
                     {
                         CreateBy = erpEmpId > 0 ? erpEmpId.ToString() : Config.ExpendDirector,
@@ -720,7 +741,8 @@ namespace Mall.Module.User
                         ReFinanceId = remitId,
                         Remark = "名称:" + umodel.Name + "（" + umodel.Id + "）" + "  微店:" + DisModel.Name + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据(微店提现)",
                         detailList,
-                        RB_Depart_Id = Config.ExpendDepartment
+                        RB_Depart_Id = Config.ExpendDepartment,
+                        ECOrderList = ECList
                     };
                     string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
                     var resultInfo = new