Skip to content

M
mall.oytour.com
Commit 9932eb88 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents 204dcabe 6ffca946
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
Mall.WindowsService/Module/FinanceModule.cs
View file @ 9932eb88
......@@ -272,16 +272,16 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
}
if (isAdd)
{
if (orderGoodsItem.Final_Price > 0)
if ((orderGoodsItem.Final_Price - orderGoodsItem.DepositMoney) > 0)
{
if (orderGoodsItem.OrderClassify == 1 && orderGoodsItem.CarType != GuideCarGoodsTypeEnum.Line)
{
var newOrderGoods = new RB_Goods_OrderDetail_Extend
{
FinanceType = 1,
Final_Price = orderGoodsItem.Final_Price,
Final_Price = orderGoodsItem.Final_Price-orderGoodsItem.DepositMoney,
Number = 1,
FreightMoney = orderGoodsItem.FreightMoney,
FreightMoney = orderGoodsItem.FreightMoney-orderGoodsItem.DepositFreightMoney,
GoodsName = orderGoodsItem.GoodsName,
OrderNo = orderGoodsItem.OrderNo,
Id = orderGoodsItem.Id,
......@@ -294,9 +294,9 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
var newOrderGoods = new RB_Goods_OrderDetail_Extend
{
FinanceType = 1,
Final_Price = orderGoodsItem.Final_Price,
Final_Price = orderGoodsItem.Final_Price - orderGoodsItem.DepositMoney,
Number = orderGoodsItem.Number,
FreightMoney = orderGoodsItem.FreightMoney,
FreightMoney = orderGoodsItem.FreightMoney - orderGoodsItem.DepositFreightMoney,
GoodsName = orderGoodsItem.GoodsName,
OrderNo = orderGoodsItem.OrderNo,
Id = orderGoodsItem.Id,
......@@ -318,9 +318,9 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
var newOrderGoods = new RB_Goods_OrderDetail_Extend
{
FinanceType = 2,
Final_Price = orderGoodsItem.Final_Price,
Final_Price = orderGoodsItem.Final_Price - orderGoodsItem.DepositMoney,
Number = 1,
FreightMoney = orderGoodsItem.FreightMoney,
FreightMoney = orderGoodsItem.FreightMoney - orderGoodsItem.DepositFreightMoney,
GoodsName = orderGoodsItem.GoodsName,
OrderNo = orderGoodsItem.OrderNo,
Id = orderGoodsItem.Id,
......@@ -337,9 +337,9 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
var newOrderGoods = new RB_Goods_OrderDetail_Extend
{
FinanceType = 3,
Final_Price = orderGoodsItem.Final_Price,
Final_Price = orderGoodsItem.Final_Price - orderGoodsItem.DepositMoney,
Number = 1,
FreightMoney = orderGoodsItem.FreightMoney,
FreightMoney = orderGoodsItem.FreightMoney - orderGoodsItem.DepositFreightMoney,
GoodsName = orderGoodsItem.GoodsName,
OrderNo = orderGoodsItem.OrderNo,
Id = orderGoodsItem.Id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment