提交代码

Mall.Module.Product/OrderModule.cs

@@ -3652,7 +3652,7 @@ namespace Mall.Module.Product
             if (model.Type == 2)
             {
                 var oeModel = goods_OrderExpressRepository.GetList(new RB_Goods_OrderExpress_Extend() { AfterSaleOrderId = model.ReOrderId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
-                if (oeModel.Type == 1)
+                if (oeModel != null && oeModel.Type == 1)
                 {
                     var leModel = logistics_ExpressRepository.GetEntity(oeModel.ExpressId);
                     HExpressList.Add(new
@@ -3667,7 +3667,7 @@ namespace Mall.Module.Product
                     HExpressList.Add(new
                     {
                         ExpressName = "",
-                        ExpressNumber = oeModel.Remark,
+                        ExpressNumber = oeModel?.Remark,
                         Type = 2
                     });
                 }
@@ -4500,7 +4500,7 @@ namespace Mall.Module.Product
                 var omodel = goods_OrderRepository.GetEntity(dmodel.OrderId);
                 if (omodel == null) { return false; }
                 //先查询规则
-                var financeConfigurineList = financeConfigurineRepository.GetList(new Model.Extend.Finance.RB_Finance_Configurine_Extend { Type = 3 });                
+                var financeConfigurineList = financeConfigurineRepository.GetList(new Model.Extend.Finance.RB_Finance_Configurine_Extend { Type = 3 });
 
                 string dstr = "已收货，客人付款:" + (dmodel.Income ?? 0) + "金额，申请退款:" + (dmodel.Refund ?? 0);
                 if (financeConfigurineList != null && financeConfigurineList.Any())
@@ -4569,7 +4569,7 @@ namespace Mall.Module.Product
                         goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog()
                         {
                             Id = 0,
-                            Content = "自动生成财务退款单据："+ apir.data.ToString(),
+                            Content = "自动生成财务退款单据：" + apir.data.ToString(),
                             CreateDate = DateTime.Now,
                             MallBaseId = dmodel.MallBaseId,
                             ReOrderId = dmodel.ReOrderId,

Mall.WebApi/App_Code/PayUtil.cs

@@ -66,6 +66,8 @@ namespace Mall.WebApi.App_Code
             req.SetParameter("sign", req.CreateMd5Sign(_accessor, model.WeChatApiSecret));
 
             var reqXml = req.ParseXml();
+
+            LogHelper.Write(null, "订单号【" + sOrderNo + "】请求参数：" + reqXml);
             var result = Common.Pay.WeChatPat.HttpHelper.Post(new HttpParam()
             {
                 Url = Mall.Common.Pay.WeChatPat.Model.ApiList.UnifiedOrderUrl,