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

Mall.Module.Product/OrderModule.cs

@@ -2574,7 +2574,7 @@ namespace Mall.Module.Product
                     {
                         continue;
                     }
-
+                    //item.SupplierId = gmodel.SpplierID;
                     item.CouponMoney = 0;
                     var couponModel = GoodsCouponList.Where(x => x.GoodsId == item.GoodsId).FirstOrDefault();
                     if (couponModel != null)
@@ -3463,7 +3463,8 @@ namespace Mall.Module.Product
                     IntegralMoney = item.IntegralMoney,
                     IntegralNumber = item.IntegralNumber,
                     CouponMoney = item.CouponMoney,
-                    IntegralGoodsPresent = IntegralPresent
+                    IntegralGoodsPresent = IntegralPresent,
+                    SupplierId = item.SupplierId
                 }, trans);
                 item.Id = detailId;
 
@@ -5461,8 +5462,6 @@ namespace Mall.Module.Product
                         }
                         //余额支付回滚
 
-                        //同意 创建财务单据
-                        OrderRefundFinanceModule(omodel);
                     }
                     //记录日志
                     string Content = $"客人申请取消订单，审核：{(type == 1 ? "同意" : "拒绝")}";
@@ -5482,6 +5481,10 @@ namespace Mall.Module.Product
                     });
                 }
                 goods_OrderRepository.DBSession.Commit();
+                if (flag && type == 1) {
+                    //同意 创建财务单据
+                    OrderRefundFinanceModule(omodel);
+                }
                 return flag;
             }
             catch (Exception ex)

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -408,6 +408,10 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
                 item.Specification = JsonConvert.SerializeObject(item.SpecificationList);
             }
+
+            if ((demodel.Income ?? 0) <= 0) {
+                return ApiResult.ParamIsNull("订单金额不正确");
+            }
             
             demodel.BuyerMessage ??= "";//买家留言
             demodel.OrderSource ??= UserSourceEnum.WeiXin;

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -695,6 +695,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     }
                 }
                 else {
+                    LogHelper.Write(JsonConvert.SerializeObject(Robj));
                     return ApiResult.Failed();
                 }
             }

Mall.WebApi/Controllers/User/UserController.cs

@@ -1836,6 +1836,7 @@ namespace Mall.WebApi.Controllers.User
                         }
                         else
                         {
+                            LogHelper.Write("企业付款失败RemitId:" + RemitId);
                             return ApiResult.Failed("支付失败");
                         }
                     }