Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
9cd6c9e7
Commit
9cd6c9e7
authored
Aug 05, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
6d57c7ea
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
663 additions
and
91 deletions
+663
-91
CoursePriceDiscountEnum.cs
Mall.Common/Enum/Goods/CoursePriceDiscountEnum.cs
+43
-0
RB_Goods_Order.cs
Mall.Model/Entity/Product/RB_Goods_Order.cs
+5
-0
RB_Goods_OrderDetail.cs
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
+6
-0
RB_Goods_Preferential.cs
Mall.Model/Entity/Product/RB_Goods_Preferential.cs
+110
-0
RB_Goods_SpecificationValue.cs
Mall.Model/Entity/Product/RB_Goods_SpecificationValue.cs
+5
-0
RB_Goods_Preferential_Extend.cs
Mall.Model/Extend/Product/RB_Goods_Preferential_Extend.cs
+23
-0
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+217
-19
ProductModule.cs
Mall.Module.Product/ProductModule.cs
+17
-0
UserCommonModule.cs
Mall.Module.User/UserCommonModule.cs
+51
-5
RB_Goods_PreferentialRepository.cs
Mall.Repository/Product/RB_Goods_PreferentialRepository.cs
+72
-0
RB_Goods_SpecificationValueRepository.cs
...pository/Product/RB_Goods_SpecificationValueRepository.cs
+36
-7
appsettings.json
Mall.WebApi/appsettings.json
+2
-0
FinanceModule.cs
Mall.WindowsService/Module/FinanceModule.cs
+22
-7
appsettings.json
Mall.WindowsService/appsettings.json
+54
-53
No files found.
Mall.Common/Enum/Goods/CoursePriceDiscountEnum.cs
0 → 100644
View file @
9cd6c9e7
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
Mall.Common.Plugin
;
namespace
Mall.Common.Enum.Goods
{
/// <summary>
/// 课程价格优惠类型
/// </summary>
public
enum
CoursePriceDiscountEnum
{
/// <summary>
/// 买送
/// </summary>
[
EnumField
(
"买送"
)]
BuySend
=
1
,
/// <summary>
/// 单人报名优惠
/// </summary>
[
EnumField
(
"单人报名优惠"
)]
SingleJoin
=
2
,
/// <summary>
/// 两人报名优惠
/// </summary>
[
EnumField
(
"两人报名优惠"
)]
DoubleJoin
=
3
,
/// <summary>
/// 续费报名优惠
/// </summary>
[
EnumField
(
"续费报名优惠"
)]
Renewal
=
4
,
///// <summary>
///// 刷卡分期
///// </summary>
//[EnumField("刷卡分期")]
//Staging =5,
}
}
Mall.Model/Entity/Product/RB_Goods_Order.cs
View file @
9cd6c9e7
...
...
@@ -356,5 +356,10 @@ namespace Mall.Model.Entity.Product
/// 储值卡抵扣金额
/// </summary>
public
decimal
DepositMoney
{
get
;
set
;
}
/// <summary>
/// 教育erp对应的人员id
/// </summary>
public
int
EduUserId
{
get
;
set
;
}
}
}
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @
9cd6c9e7
...
...
@@ -393,5 +393,11 @@ namespace Mall.Model.Entity.Product
/// 储值卡退回金额
/// </summary>
public
decimal
DepositRefundMoney
{
get
;
set
;
}
/// <summary>
/// 规格对应的班级(甲鹤小程序)
/// </summary>
public
int
ClassId
{
get
;
set
;
}
}
}
Mall.Model/Entity/Product/RB_Goods_Preferential.cs
0 → 100644
View file @
9cd6c9e7
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
Mall.Common.Enum.Goods
;
using
VT.FW.DB
;
namespace
Mall.Model.Entity.Product
{
/// <summary>
/// 甲鹤小程序优惠表实体类
/// </summary>
[
Serializable
]
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Goods_Preferential
{
/// <summary>
/// 主键编号
/// </summary>
public
int
Id
{
get
;
set
;
}
/// <summary>
/// 商品编号
/// </summary>
public
int
GoodsId
{
get
;
set
;
}
/// <summary>
/// 优惠条件
/// </summary>
public
string
PreferentialTerms
{
get
;
set
;
}
/// <summary>
/// 销售返佣类型(0-百分比,1-固定金额)
/// </summary>
public
int
SaleCommissionType
{
get
;
set
;
}
/// <summary>
/// 销售返佣
/// </summary>
public
decimal
SaleCommissionMoney
{
get
;
set
;
}
/// <summary>
/// 同行返佣类型(0-百分比,1-固定金额)
/// </summary>
public
int
B2BCommissionType
{
get
;
set
;
}
/// <summary>
/// 同行返佣
/// </summary>
public
decimal
B2BCommissionMoney
{
get
;
set
;
}
/// <summary>
/// 课程价格优惠类型(见枚举)
/// </summary>
public
CoursePriceDiscountEnum
PriceDiscountType
{
get
;
set
;
}
/// <summary>
/// 购买人数
/// </summary>
public
int
BuyNum
{
get
;
set
;
}
/// <summary>
/// 赠送人数
/// </summary>
public
int
SendNum
{
get
;
set
;
}
/// <summary>
/// 优惠价格类型(0-百分比,1-固定金额)
/// </summary>
public
int
PriceType
{
get
;
set
;
}
/// <summary>
/// 优惠金额
/// </summary>
public
decimal
PriceMoney
{
get
;
set
;
}
/// <summary>
/// 商户号
/// </summary>
public
int
TenantId
{
get
;
set
;
}
/// <summary>
/// 小程序id
/// </summary>
public
int
MallBaseId
{
get
;
set
;
}
/// <summary>
/// 状态
/// </summary>
public
Common
.
Enum
.
DateStateEnum
Status
{
get
;
set
;
}
/// <summary>
/// 教育返佣类型(0-百分比,1-固定金额)
/// </summary>
public
int
EduCommissionType
{
get
;
set
;
}
/// <summary>
/// 教育同行佣金
/// </summary>
public
decimal
EduCommissionMoney
{
get
;
set
;
}
}
}
Mall.Model/Entity/Product/RB_Goods_SpecificationValue.cs
View file @
9cd6c9e7
...
...
@@ -94,5 +94,10 @@ namespace Mall.Model.Entity.Product
get
;
set
;
}
/// <summary>
/// 班级id
/// </summary>
public
int
ClassId
{
get
;
set
;
}
}
}
Mall.Model/Extend/Product/RB_Goods_Preferential_Extend.cs
0 → 100644
View file @
9cd6c9e7
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
Mall.Model.Entity.Product
;
namespace
Mall.Model.Extend.Product
{
/// <summary>
/// 商品优惠表扩展实体类
/// </summary>
public
class
RB_Goods_Preferential_Extend
:
RB_Goods_Preferential
{
/// <summary>
/// 商品编号
/// </summary>
public
string
QGoodsIds
{
get
;
set
;
}
/// <summary>
/// 优惠类型字符串
/// </summary>
public
string
PriceDiscountTypeStr
{
get
{
return
Common
.
Plugin
.
EnumHelper
.
GetEnumName
(
this
.
PriceDiscountType
);
}
}
}
}
Mall.Module.Product/OrderModule.cs
View file @
9cd6c9e7
This diff is collapsed.
Click to expand it.
Mall.Module.Product/ProductModule.cs
View file @
9cd6c9e7
...
...
@@ -92,6 +92,11 @@ namespace Mall.Module.Product
/// 商品规格价格
/// </summary>
private
readonly
RB_Goods_SpecificationPriceRepository
goods_SpecificationPriceRepository
=
new
RB_Goods_SpecificationPriceRepository
();
/// <summary>
/// 商品优惠仓储类
/// </summary>
private
readonly
RB_Goods_PreferentialRepository
RB_Goods_PreferentialRepository
=
new
RB_Goods_PreferentialRepository
();
/// <summary>
/// 分销商等级
/// </summary>
...
...
@@ -2452,6 +2457,13 @@ namespace Mall.Module.Product
tempLogo
=
new
MarketingLogoItem
();
}
}
List
<
RB_Goods_Preferential_Extend
>
goodsPreferentialList
=
new
List
<
RB_Goods_Preferential_Extend
>();
goodsPreferentialList
=
RB_Goods_PreferentialRepository
.
GetGoodsPreferentialListRepostory
(
new
RB_Goods_Preferential_Extend
{
TenantId
=
model
.
TenantId
,
MallBaseId
=
model
.
MallBaseId
,
GoodsId
=
model
.
Id
});
return
new
{
goods
=
new
...
...
@@ -2598,6 +2610,11 @@ namespace Mall.Module.Product
fatcode
=
model
.
FatCode
,
goodsurl
=
model
.
GoodsUrl
,
goodsLogo
=
model
.
goodsLogo
,
goodsPreferentialList
=
goodsPreferentialList
?.
Select
(
x
=>
new
{
x
.
Id
,
x
.
PriceDiscountTypeStr
,
x
.
PriceDiscountType
,
x
.
PriceMoney
})
},
delivery
=
""
};
...
...
Mall.Module.User/UserCommonModule.cs
View file @
9cd6c9e7
...
...
@@ -389,7 +389,7 @@ namespace Mall.Module.User
keyValues
.
Add
(
nameof
(
RB_Goods_Order_Extend
.
OrderStatus
),
Common
.
Enum
.
Goods
.
OrderStatusEnum
.
WaitReceiving
);
keyValues
.
Add
(
nameof
(
RB_Goods_Order_Extend
.
DeliveryTime
),
DateTime
.
Now
);
}
else
if
(
oldOrder
.
OrderClassify
==
2
)
else
if
(
oldOrder
.
OrderClassify
==
2
||
oldOrder
.
VersionSource
==
1
)
{
//教育订单 下单后 直接完成 无法取消订单 无法申请售后
keyValues
.
Add
(
nameof
(
RB_Goods_Order_Extend
.
OrderStatus
),
Common
.
Enum
.
Goods
.
OrderStatusEnum
.
Completed
);
...
...
@@ -581,13 +581,18 @@ namespace Mall.Module.User
//赠送粉象等级(+VIP返佣) ld 2020-08-03
var
FXCOrder
=
oldOrder
.
RefMapperTo
<
RB_Goods_Order_Extend
>();
FXCOrder
.
DetailList
=
orderGoodsList
;
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
InsertPresentFXGradeCommission
(
FXCOrder
,
Out_Trade_No
,
oldOrder
.
UserId
??
0
,
oldOrder
.
OrderId
));
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
InsertPresentFXGradeCommission
(
FXCOrder
,
Out_Trade_No
,
oldOrder
.
UserId
??
0
,
oldOrder
.
OrderId
));
if
(
oldOrder
.
OrderClassify
==
2
)
{
//教育订单付款后订单状态为已完成 直接返佣
InsertOrderCommissionCompleted
(
oldOrder
.
RefMapperTo
<
RB_Goods_Order_Extend
>());
}
if
(
oldOrder
.
VersionSource
==
1
&&
orderGoodsList
!=
null
&&
orderGoodsList
.
Any
(
x
=>
x
.
ClassId
>
0
))
//教育订单并且订单商品是教育erp同步过来的
{
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
Synchro
(
orderGoodsList
,
oldOrder
));
}
//发送订阅消息
string
goodsName
=
orderGoodsList
.
FirstOrDefault
().
GoodsName
;
...
...
@@ -675,7 +680,7 @@ namespace Mall.Module.User
}
}
}
}
return
flag
;
...
...
@@ -883,7 +888,7 @@ namespace Mall.Module.User
//获取订单商品
var
orderGoodsList
=
goodsOrderDetailRepository
.
GetOrderDetailList
(
new
RB_Goods_OrderDetail_Extend
{
TenantId
=
oldOrder
.
TenantId
,
MallBaseId
=
oldOrder
.
MallBaseId
,
OrderId
=
oldOrder
.
OrderId
});
oldOrder
.
DetailList
=
orderGoodsList
;
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
InsertPresentFXGradeCommission
(
oldOrder
,
oldOrder
.
MerchantsNo
,
oldOrder
.
UserId
??
0
,
oldOrder
.
OrderId
));
System
.
Threading
.
Tasks
.
Task
.
Run
(()
=>
InsertPresentFXGradeCommission
(
oldOrder
,
oldOrder
.
MerchantsNo
,
oldOrder
.
UserId
??
0
,
oldOrder
.
OrderId
));
}
...
...
@@ -1449,7 +1454,7 @@ namespace Mall.Module.User
/// <param name="OrderId">vip购买单号id</param>
/// <param name="BuyUserId">购买人</param>
/// <returns></returns>
public
bool
InsertVipBuyCommission
(
int
BuyUserId
,
int
OrderId
,
string
Out_Trade_No
,
decimal
Money
,
DateTime
Time_End
)
public
bool
InsertVipBuyCommission
(
int
BuyUserId
,
int
OrderId
,
string
Out_Trade_No
,
decimal
Money
,
DateTime
Time_End
)
{
bool
flag
=
false
;
try
...
...
@@ -2037,5 +2042,46 @@ namespace Mall.Module.User
return
flag
;
}
#
endregion
#
region
同步甲鹤小程序订单到教育
erp
中去
public
void
Synchro
(
List
<
RB_Goods_OrderDetail_Extend
>
orderDetailList
,
Model
.
Entity
.
Product
.
RB_Goods_Order
model
)
{
List
<
object
>
classList
=
new
List
<
object
>();
foreach
(
var
item
in
orderDetailList
.
Where
(
x
=>
x
.
ClassId
>
0
))
{
classList
.
Add
(
new
{
ClassId
=
item
.
ClassId
,
GuestNum
=
item
.
Number
,
Unit_Price
=
item
.
Unit_Price
,
PreferPrice
=
item
.
Final_Price
,
SaleRemark
=
model
.
Remark
,
IsLessPrice
=
(
item
.
CouponMoney
??
0
)
>
0
?
1
:
0
,
LessPrice
=
(
item
.
CouponMoney
??
0
),
Income
=
item
.
Final_Price
-
item
.
ServiceCharge
,
DiscountMoney
=
0
,
PlatformTax
=
item
.
ServiceCharge
,
EnterID
=
model
.
EduUserId
>
0
?
model
.
EduUserId
:
1
,
GuestName
=
model
.
Consignee
+
","
+
model
.
Mobile
});
}
if
(
classList
!=
null
&&
classList
.
Any
())
{
var
resultInfo
=
new
{
Msg
=
new
{
Order
=
classList
,
EnterID
=
model
.
EduUserId
>
0
?
model
.
EduUserId
:
1
},
};
string
apiResult
=
Common
.
Plugin
.
HttpHelper
.
HttpPost
(
Config
.
ReadConfigKey
(
"EduOrderApi"
),
JsonHelper
.
Serialize
(
resultInfo
),
""
);
Newtonsoft
.
Json
.
Linq
.
JObject
parmsJob
=
Newtonsoft
.
Json
.
Linq
.
JObject
.
Parse
(
apiResult
);
string
resultCode
=
parmsJob
.
GetStringValue
(
"Code"
);
if
(
resultCode
==
"1"
)
//新增记录
{
}
}
}
#
endregion
}
}
Mall.Repository/Product/RB_Goods_PreferentialRepository.cs
0 → 100644
View file @
9cd6c9e7
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
Mall.Common.Enum
;
using
Mall.Model.Entity.Product
;
using
Mall.Model.Extend.Product
;
namespace
Mall.Repository.Product
{
/// <summary>
/// 商品优惠仓储类
/// </summary>
public
class
RB_Goods_PreferentialRepository
:
BaseRepository
<
RB_Goods_Preferential
>
{
/// <summary>
/// 获取商品优惠列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public
List
<
RB_Goods_Preferential_Extend
>
GetGoodsPreferentialListRepostory
(
RB_Goods_Preferential_Extend
query
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT *
FROM RB_Goods_Preferential
WHERE 1=1 "
);
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Goods_Preferential_Extend
.
Status
),
(
int
)
DateStateEnum
.
Normal
);
if
(
query
==
null
)
{
return
new
List
<
RB_Goods_Preferential_Extend
>();
}
else
{
if
(
query
.
TenantId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Goods_Preferential_Extend
.
TenantId
),
query
.
TenantId
);
}
if
(
query
.
MallBaseId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Goods_Preferential_Extend
.
MallBaseId
),
query
.
MallBaseId
);
}
if
(
query
.
GoodsId
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Goods_Preferential_Extend
.
GoodsId
),
query
.
GoodsId
);
}
if
(!
string
.
IsNullOrEmpty
(
query
.
QGoodsIds
))
{
builder
.
AppendFormat
(
" AND {0} IN({1}) "
,
nameof
(
RB_Goods_Preferential_Extend
.
GoodsId
),
query
.
QGoodsIds
);
}
if
(
query
.
Id
>
0
)
{
builder
.
AppendFormat
(
" AND {0}={1} "
,
nameof
(
RB_Goods_Preferential_Extend
.
Id
),
query
.
Id
);
}
}
return
Get
<
RB_Goods_Preferential_Extend
>(
builder
.
ToString
()).
ToList
();
}
/// <summary>
/// 根据商品编号删除优惠信息
/// </summary>
/// <param name="GoodsId">商品编号</param>
/// <returns></returns>
public
bool
DeleteGoodsPreferentialRepostory
(
int
GoodsId
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
" DELETE FROM RB_Goods_Preferential WHERE GoodsId={0} "
,
GoodsId
);
return
base
.
Execute
(
builder
.
ToString
())
>
0
;
}
}
}
Mall.Repository/Product/RB_Goods_SpecificationValueRepository.cs
View file @
9cd6c9e7
...
...
@@ -21,25 +21,31 @@ namespace Mall.Repository.Product
public
List
<
RB_Goods_SpecificationValue_Extend
>
GetList
(
RB_Goods_SpecificationValue_Extend
dmodel
)
{
string
where
=
$" 1=1 and
{
nameof
(
RB_Goods_SpecificationValue
.
Status
)}
=0"
;
if
(
dmodel
.
TenantId
>
0
)
{
if
(
dmodel
.
TenantId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Goods_SpecificationValue
.
TenantId
)}
=
{
dmodel
.
TenantId
}
"
;
}
if
(
dmodel
.
MallBaseId
>
0
)
{
if
(
dmodel
.
MallBaseId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Goods_SpecificationValue
.
MallBaseId
)}
=
{
dmodel
.
MallBaseId
}
"
;
}
if
(
dmodel
.
Id
>
0
)
{
if
(
dmodel
.
Id
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Goods_SpecificationValue
.
Id
)}
=
{
dmodel
.
Id
}
"
;
}
if
(
dmodel
.
SpecificationId
>
0
)
{
if
(
dmodel
.
SpecificationId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Goods_SpecificationValue
.
SpecificationId
)}
=
{
dmodel
.
SpecificationId
}
"
;
}
if
(
dmodel
.
GoodsId
>
0
)
{
if
(
dmodel
.
GoodsId
>
0
)
{
where
+=
$@" and
{
nameof
(
RB_Goods_SpecificationValue
.
GoodsId
)}
=
{
dmodel
.
GoodsId
}
"
;
}
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
GoodsIds
))
{
if
(!
string
.
IsNullOrEmpty
(
dmodel
.
GoodsIds
))
{
where
+=
$@" and
{
nameof
(
RB_Goods_SpecificationValue
.
GoodsId
)}
in(
{
dmodel
.
GoodsIds
}
)"
;
}
string
sql
=
$@"select * from RB_Goods_SpecificationValue where
{
where
}
order by Id asc"
;
return
Get
<
RB_Goods_SpecificationValue_Extend
>(
sql
).
ToList
();
}
...
...
@@ -68,5 +74,28 @@ namespace Mall.Repository.Product
return
""
;
}
}
/// <summary>
/// 获取规格值图片
/// </summary>
/// <param name="goodsId"></param>
/// <param name="specificationSort"></param>
/// <returns></returns>
public
List
<
RB_Goods_SpecificationValue_Extend
>
GetSpecificationListImage
(
int
goodsId
,
string
specificationSort
)
{
try
{
int
Sort
=
Convert
.
ToInt32
(
specificationSort
.
Split
(
":"
)[
0
]);
string
sql
=
$@"select * from RB_Goods_SpecificationValue where Status=0 and GoodsId=
{
goodsId
}
and Sort=
{
Sort
}
order by Id asc "
;
return
Get
<
RB_Goods_SpecificationValue_Extend
>(
sql
).
ToList
();
}
catch
(
Exception
)
{
return
new
List
<
RB_Goods_SpecificationValue_Extend
>();
}
}
}
}
Mall.WebApi/appsettings.json
View file @
9cd6c9e7
...
...
@@ -58,6 +58,8 @@
"PaymentFinanceApi"
:
"http://192.168.20.7:8083/api/Mall/InsertFinanceBatchForMallOut"
,
"ZYRefundFinanceApi"
:
"http://192.168.20.7:8083/api/Mall/SetMallOrderSalesTheWayRefund"
,
"PropertyApi"
:
"http://192.168.1.13:8087/api/ECWorkFlow/SetECSuppliesStockInFlow"
,
"EduOrderApi"
:
"http://192.168.20.17:8017/api/Order/SetBatchClassOrder"
,
"EduUpdateGoodsSpecification"
:
"http://192.168.20.17:8017/api/Order/UpdateGoodsSpecification"
,
"FinanceKey"
:
"FinanceMallInsertToERPViitto2020"
,
"SettlementRate"
:
"0.60"
,
"EduActivityIncomeFinanceId"
:
"9"
,
...
...
Mall.WindowsService/Module/FinanceModule.cs
View file @
9cd6c9e7
...
...
@@ -279,9 +279,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
-
orderGoodsItem
.
DepositMoney
,
Final_Price
=
orderGoodsItem
.
Final_Price
-
orderGoodsItem
.
DepositMoney
,
Number
=
1
,
FreightMoney
=
orderGoodsItem
.
FreightMoney
-
orderGoodsItem
.
DepositFreightMoney
,
FreightMoney
=
orderGoodsItem
.
FreightMoney
-
orderGoodsItem
.
DepositFreightMoney
,
GoodsName
=
orderGoodsItem
.
GoodsName
,
OrderNo
=
orderGoodsItem
.
OrderNo
,
Id
=
orderGoodsItem
.
Id
,
...
...
@@ -505,7 +505,7 @@ and DATE_FORMAT(a.PayTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND a
var
goodsDetailList
=
member_DepositBuyRepository
.
Get
<
RB_Member_DepositBuy_Extend
>(
builder
.
ToString
()).
ToList
();
// var result = new List<RB_Goods_OrderDetail_Extend>();
// var result = new List<RB_Goods_OrderDetail_Extend>();
RB_Finance_Record_Extend
record
=
new
RB_Finance_Record_Extend
();
record
.
MallBaseId
=
item
.
MallBaseId
;
...
...
@@ -577,7 +577,7 @@ and DATE_FORMAT(a.PayTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND a
if
(
goodsDetailList
!=
null
&&
goodsDetailList
.
Any
())
{
decimal
OriginalFee
=
0
;
foreach
(
var
goodsDetailGroupItem
in
goodsDetailList
)
{
decimal
totalPrice
=
goodsDetailGroupItem
.
SalePrice
*
(
Convert
.
ToDecimal
(
Config
.
SettlementRate
)
/
100
);
...
...
@@ -586,9 +586,9 @@ and DATE_FORMAT(a.PayTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND a
}
var
detailList
=
goodsDetailList
.
Select
(
x
=>
new
{
CostTypeId
=
item
.
DepositIncomeTypeId
,
Number
=
1
,
OriginalMoney
=
x
.
SalePrice
,
CostTypeId
=
item
.
DepositIncomeTypeId
,
Number
=
1
,
OriginalMoney
=
x
.
SalePrice
,
UnitPrice
=
x
.
SalePrice
,
Remark
=
x
.
Name
+
x
.
OrderNo
});
...
...
@@ -671,6 +671,7 @@ and DATE_FORMAT(a.PayTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND a
{
//查询未付款的所有订单
var
olist
=
goods_OrderRepository
.
GetCanCancelOrderList
(
item
.
CancelTime
,
item
.
TenantId
,
item
.
MallBaseId
);
List
<
int
>
classIdList
=
new
List
<
int
>();
foreach
(
var
qitem
in
olist
)
{
try
...
...
@@ -872,6 +873,10 @@ and DATE_FORMAT(a.PayTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND a
{
TotalIntegralNumber
+=
(
ditem
.
IntegralNumber
??
0
);
}
if
(
ditem
.
ClassId
>
0
)
{
classIdList
.
Add
(
ditem
.
ClassId
);
}
}
}
var
umodel
=
member_UserRepository
.
GetEntity
(
qitem
.
UserId
);
...
...
@@ -1025,6 +1030,16 @@ and DATE_FORMAT(a.PayTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND a
continue
;
}
}
if
(
classIdList
!=
null
&&
classIdList
.
Any
())
{
var
resultInfo
=
new
{
Msg
=
new
{
Order
=
classIdList
},
};
string
apiResult
=
Common
.
Plugin
.
HttpHelper
.
HttpPost
(
Config
.
ReadConfigKey
(
"EduUpdateGoodsSpecification"
),
JsonHelper
.
Serialize
(
resultInfo
),
""
);
}
}
}
return
true
;
...
...
Mall.WindowsService/appsettings.json
View file @
9cd6c9e7
{
"ConnectionStrings"
:
{
"DefaultConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; "
,
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
},
"Logging"
:
{
"LogLevel"
:
{
"Default"
:
"Information"
,
"Microsoft"
:
"Warning"
,
"Microsoft.Hosting.Lifetime"
:
"Information"
"ConnectionStrings"
:
{
"DefaultConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall;CharSet=utf8; Convert Zero Datetime=true; "
,
"DefaultConnectionPName"
:
"MySql.Data.MySqlClient"
,
"FinanceConnection"
:
"server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; "
,
"FinanceConnectionPName"
:
"MySql.Data.MySqlClient"
},
"Logging"
:
{
"LogLevel"
:
{
"Default"
:
"Information"
,
"Microsoft"
:
"Warning"
,
"Microsoft.Hosting.Lifetime"
:
"Information"
}
},
"JwtSecretKey"
:
"@VIITTOREBORN*2018"
,
"JwtExpirTime"
:
2592000
,
"ApiExpirTime"
:
2592000
,
"AllowedHosts"
:
"*"
,
"OpenValidation"
:
"False"
,
"UploadSiteUrl"
:
"http://192.168.2.214:8120"
,
"ViewFileSiteUrl"
:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com"
,
"ImKey"
:
"b612b31e837c79c68f141aeb719d2b20"
,
"ImSecret"
:
"66000451fb72"
,
"Mongo"
:
"mongodb://192.168.2.214:27017"
,
"MongoDBName"
:
"Mall"
,
"ProjectUrl"
:
"D:/project/GitProject/tripfriend"
,
"DeveloperKitsPort"
:
"63994"
,
"FirstPage"
:
"pages/index/index.html"
,
"ByteDanceSendTemplate"
:
"https://developer.toutiao.com/api/apps/game/template/send"
,
"sTenpayNotify"
:
"http://mallapi.oytour.com/api/WeChatNotify/Notify"
,
//微信回调地址
"IncomeDirector"
:
1756
,
//财务收入创建人
"IncomeBranchId"
:
49
,
//财务收入创建人公司
"IncomeDepartment"
:
331
,
"ExpendDirector"
:
1756
,
//财务支出创建人
"ExpendBranchId"
:
49
,
//财务支出创建人公司
"ExpendDepartment"
:
331
,
"NetworkDirector"
:
1756
,
//网络主管的id,用于新建供应商账户的时候的创建人
"RB_Branch_Id"
:
49
,
//所属公司id
"RebornDMC"
:
"reborn_dmc"
,
"IncomeFinanceApi"
:
"http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn"
,
"PaymentFinanceApi"
:
"http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut"
,
"EduUpdateGoodsSpecification"
:
"http://192.168.20.17:8017/api/Order/UpdateGoodsSpecification"
,
"PayCertificateUrl"
:
"D:/project/GitProject/Shopping/Mall.WebApi/"
,
"SettlementRate"
:
"0.60"
,
//
"FinanceKey"
:
"FinanceMallInsertToERPViitto2020"
,
"FinanceKey"
:
"FinanceMallInsertToERPViitto2020"
,
"RedisSetting"
:
{
"RedisServer"
:
"192.168.2.214"
,
"RedisPort"
:
"6379"
,
"RedisPwd"
:
"123456"
},
"VirtualDirectory"
:
"WebFile"
,
"FileService"
:
"2"
,
"InitializeImages"
:
{
"GradeEntranceImage"
:
"1234566778"
}
},
"JwtSecretKey"
:
"@VIITTOREBORN*2018"
,
"JwtExpirTime"
:
2592000
,
"ApiExpirTime"
:
2592000
,
"AllowedHosts"
:
"*"
,
"OpenValidation"
:
"False"
,
"UploadSiteUrl"
:
"http://192.168.2.214:8120"
,
"ViewFileSiteUrl"
:
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com"
,
"ImKey"
:
"b612b31e837c79c68f141aeb719d2b20"
,
"ImSecret"
:
"66000451fb72"
,
"Mongo"
:
"mongodb://192.168.2.214:27017"
,
"MongoDBName"
:
"Mall"
,
"ProjectUrl"
:
"D:/project/GitProject/tripfriend"
,
"DeveloperKitsPort"
:
"63994"
,
"FirstPage"
:
"pages/index/index.html"
,
"ByteDanceSendTemplate"
:
"https://developer.toutiao.com/api/apps/game/template/send"
,
"sTenpayNotify"
:
"http://mallapi.oytour.com/api/WeChatNotify/Notify"
,
//微信回调地址
"IncomeDirector"
:
1756
,
//财务收入创建人
"IncomeBranchId"
:
49
,
//财务收入创建人公司
"IncomeDepartment"
:
331
,
"ExpendDirector"
:
1756
,
//财务支出创建人
"ExpendBranchId"
:
49
,
//财务支出创建人公司
"ExpendDepartment"
:
331
,
"NetworkDirector"
:
1756
,
//网络主管的id,用于新建供应商账户的时候的创建人
"RB_Branch_Id"
:
49
,
//所属公司id
"RebornDMC"
:
"reborn_dmc"
,
"IncomeFinanceApi"
:
"http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn"
,
"PaymentFinanceApi"
:
"http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut"
,
"PayCertificateUrl"
:
"D:/project/GitProject/Shopping/Mall.WebApi/"
,
"SettlementRate"
:
"0.60"
,
//
"FinanceKey"
:
"FinanceMallInsertToERPViitto2020"
,
"FinanceKey"
:
"FinanceMallInsertToERPViitto2020"
,
"RedisSetting"
:
{
"RedisServer"
:
"192.168.2.214"
,
"RedisPort"
:
"6379"
,
"RedisPwd"
:
"123456"
},
"VirtualDirectory"
:
"WebFile"
,
"FileService"
:
"2"
,
"InitializeImages"
:
{
"GradeEntranceImage"
:
"1234566778"
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment