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
c01b360e
Commit
c01b360e
authored
Feb 05, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化
parent
69d1c69b
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
31 deletions
+30
-31
OrderModule.cs
Mall.Module.Product/OrderModule.cs
+20
-22
MiniProgramMsgModule.cs
Mall.Module.User/MiniProgramMsgModule.cs
+1
-1
UserCommonModule.cs
Mall.Module.User/UserCommonModule.cs
+6
-4
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+0
-1
ERPOrderCommissionController.cs
...ebApi/Controllers/Finance/ERPOrderCommissionController.cs
+1
-1
AppletOrderController.cs
Mall.WebApi/Controllers/Product/AppletOrderController.cs
+2
-2
No files found.
Mall.Module.Product/OrderModule.cs
View file @
c01b360e
...
...
@@ -1171,11 +1171,8 @@ namespace Mall.Module.Product
/// 获取售后页面
/// </summary>
/// <param name="orderDetailId"></param>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public
ApiResult
GetAppletMyOrderAfterSaleInfo
(
int
orderDetailId
,
int
userId
,
int
tenantId
,
int
mallBaseId
)
public
ApiResult
GetAppletMyOrderAfterSaleInfo
(
int
orderDetailId
)
{
var
dModel
=
goods_OrderDetailRepository
.
GetEntity
<
RB_Goods_OrderDetail_Extend
>(
orderDetailId
);
if
(
dModel
==
null
)
...
...
@@ -2647,7 +2644,7 @@ namespace Mall.Module.Product
var
IntegralObj
=
new
{
can_use
=
IsPointsDeduction
,
use
=
demodel
.
Use_Integral
==
1
?
true
:
false
,
use
=
demodel
.
Use_Integral
==
1
,
use_num
=
Total_use_integral
,
deduction_price
=
Total_integral_price
};
...
...
@@ -2747,7 +2744,7 @@ namespace Mall.Module.Product
//custom_currency_all= [],
//allZiti= false,
//hasCity= false,
template_message_list
=
template_message_list
//new List<string>() { "WPELErDfYO3JnizA5Zikta6Y8qrBBAgecuj2aLoucuY", "pCmTJwvTqNpyRREo7vvqIYBcrATNWoitfbLS61fLhzU", "i6QPsaOHgfNwlIRMwmvFGSCqX28g0cRa8XaLZ5_gpgc" }
template_message_list
//new List<string>() { "WPELErDfYO3JnizA5Zikta6Y8qrBBAgecuj2aLoucuY", "pCmTJwvTqNpyRREo7vvqIYBcrATNWoitfbLS61fLhzU", "i6QPsaOHgfNwlIRMwmvFGSCqX28g0cRa8XaLZ5_gpgc" }
};
#
endregion
return
ApiResult
.
Success
(
""
,
Robj
);
...
...
@@ -2980,10 +2977,12 @@ namespace Mall.Module.Product
{
return
ApiResult
.
Failed
(
"您在黑名单状态无法下单,请联系管理员核实"
);
}
List
<
int
>
disList
=
new
List
<
int
>();
disList
.
Add
(
demodel
.
Province
??
0
);
disList
.
Add
(
demodel
.
City
??
0
);
disList
.
Add
(
demodel
.
District
??
0
);
List
<
int
>
disList
=
new
List
<
int
>
{
demodel
.
Province
??
0
,
demodel
.
City
??
0
,
demodel
.
District
??
0
};
decimal
TotalExpress
=
0
;
...
...
@@ -4280,10 +4279,12 @@ namespace Mall.Module.Product
{
return
ApiResult
.
Failed
(
"您在黑名单状态无法下单,请联系管理员核实"
);
}
List
<
int
>
disList
=
new
List
<
int
>();
disList
.
Add
(
demodel
.
Province
??
0
);
disList
.
Add
(
demodel
.
City
??
0
);
disList
.
Add
(
demodel
.
District
??
0
);
List
<
int
>
disList
=
new
List
<
int
>
{
demodel
.
Province
??
0
,
demodel
.
City
??
0
,
demodel
.
District
??
0
};
decimal
TotalMoney
=
0
;
string
GoodsIds
=
""
;
...
...
@@ -8006,10 +8007,8 @@ namespace Mall.Module.Product
/// 获取买家发货界面信息
/// </summary>
/// <param name="reOrderId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public
ApiResult
GetAppletOrderBuyerToDeliverInfo
(
int
reOrderId
,
int
tenantId
,
int
mallBaseId
)
public
ApiResult
GetAppletOrderBuyerToDeliverInfo
(
int
reOrderId
)
{
var
omodel
=
goods_OrderAfterSaleRepository
.
GetEntity
(
reOrderId
);
if
(
omodel
==
null
)
...
...
@@ -10056,7 +10055,7 @@ namespace Mall.Module.Product
if
(
flag
)
{
//记录流程
string
Content
=
""
;
string
Content
;
if
(
type
==
1
)
{
Content
=
"卖家同意售后"
;
...
...
@@ -10128,7 +10127,7 @@ namespace Mall.Module.Product
{
//2020-07-03 屏蔽 改每日自动生成
//2020-09-15 电商erp订单 财务单据生成
OrderRefundFinanceModule
(
model
,
tenantId
,
mallBaseId
);
OrderRefundFinanceModule
(
model
);
}
}
goods_OrderAfterSaleLogRepository
.
Insert
(
new
RB_Goods_OrderAfterSaleLog
()
...
...
@@ -10150,7 +10149,7 @@ namespace Mall.Module.Product
/// 生成退款单据
/// </summary>
/// <returns></returns>
public
bool
OrderRefundFinanceModule
(
RB_Goods_OrderAfterSale
dmodel
,
int
TenantId
,
int
MallBaseId
)
public
bool
OrderRefundFinanceModule
(
RB_Goods_OrderAfterSale
dmodel
)
{
var
flag
=
false
;
try
...
...
@@ -12481,9 +12480,8 @@ namespace Mall.Module.Product
/// <param name="money"></param>
/// <param name="otherType"></param>
/// <param name="type"></param>
/// <param name="remark"></param>
/// <returns></returns>
public
bool
SetECUpdateOrderOtherMoney
(
RB_Goods_OrderDetail_Extend
model
,
int
money
,
int
otherType
,
int
type
,
string
remark
)
public
bool
SetECUpdateOrderOtherMoney
(
RB_Goods_OrderDetail_Extend
model
,
int
money
,
int
otherType
,
int
type
)
{
Dictionary
<
string
,
object
>
keyValues
=
new
Dictionary
<
string
,
object
>()
{
};
if
(
type
==
1
)
...
...
Mall.Module.User/MiniProgramMsgModule.cs
View file @
c01b360e
...
...
@@ -1023,7 +1023,7 @@ namespace Mall.Module.User
string
Url
=
"https://api.weixin.qq.com/wxa/msg_sec_check?access_token="
+
token
;
var
postdata
=
new
{
content
=
content
content
};
wenXinResult
=
HttpHelper
.
HttpPost
(
Url
,
JsonHelper
.
Serialize
(
postdata
),
""
);
LogHelper
.
WriteInfo
(
"下单成功发送订阅消息:"
+
wenXinResult
);
...
...
Mall.Module.User/UserCommonModule.cs
View file @
c01b360e
...
...
@@ -432,10 +432,12 @@ namespace Mall.Module.User
TransactionPriceInfo
transactionPriceInfo
=
CacheManager
.
User
.
UserReidsCache
.
GetTransactionPriceInfo
(
oldOrder
.
MallBaseId
);
if
(
transactionPriceInfo
==
null
)
{
transactionPriceInfo
=
new
TransactionPriceInfo
();
transactionPriceInfo
.
TenantId
=
oldOrder
.
TenantId
;
transactionPriceInfo
.
MallBaseId
=
oldOrder
.
MallBaseId
;
transactionPriceInfo
.
TotalPrice
=
totalPrice
;
transactionPriceInfo
=
new
TransactionPriceInfo
{
TenantId
=
oldOrder
.
TenantId
,
MallBaseId
=
oldOrder
.
MallBaseId
,
TotalPrice
=
totalPrice
};
}
else
{
...
...
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
c01b360e
...
...
@@ -1674,7 +1674,6 @@ namespace Mall.WebApi.Controllers.Education
[
HttpPost
]
public
ApiResult
GetDynamicMessageCount
()
{
var
req
=
RequestParm
;
var
userInfo
=
AppletUserInfo
;
int
messageCount
=
0
;
if
(
userInfo
!=
null
&&
userInfo
.
UserId
>
0
)
...
...
Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs
View file @
c01b360e
...
...
@@ -405,7 +405,7 @@ namespace Mall.WebApi.Controllers.Finance
return
ApiResult
.
ParamIsNull
(
"只能修改和平的"
);
}
bool
flag
=
orderModule
.
SetECUpdateOrderOtherMoney
(
model
,
Money
,
OtherType
,
Type
,
Remark
);
bool
flag
=
orderModule
.
SetECUpdateOrderOtherMoney
(
model
,
Money
,
OtherType
,
Type
);
if
(
flag
)
{
return
ApiResult
.
Success
();
...
...
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @
c01b360e
...
...
@@ -1032,7 +1032,7 @@ namespace Mall.WebApi.Controllers.MallBase
return
ApiResult
.
ParamIsNull
();
}
return
orderModule
.
GetAppletMyOrderAfterSaleInfo
(
OrderDetailId
,
userInfo
.
UserId
,
userInfo
.
TenantId
,
userInfo
.
MallBaseId
);
return
orderModule
.
GetAppletMyOrderAfterSaleInfo
(
OrderDetailId
);
}
/// <summary>
...
...
@@ -1137,7 +1137,7 @@ namespace Mall.WebApi.Controllers.MallBase
return
ApiResult
.
ParamIsNull
();
}
return
orderModule
.
GetAppletOrderBuyerToDeliverInfo
(
ReOrderId
,
userInfo
.
TenantId
,
userInfo
.
MallBaseId
);
return
orderModule
.
GetAppletOrderBuyerToDeliverInfo
(
ReOrderId
);
}
/// <summary>
...
...
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