Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
takeout_sbk
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yunpeng.song
takeout_sbk
Commits
cf8250b2
Commit
cf8250b2
authored
Jun 30, 2018
by
wuyang.zou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug: 调通 MSR_NO + 新增 更新本地数据库信息
parent
64b5e5f3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
fmTakeout/Control/flowControl.cpp
+8
-4
No files found.
fmTakeout/Control/flowControl.cpp
View file @
cf8250b2
...
@@ -1329,8 +1329,8 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
...
@@ -1329,8 +1329,8 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
}
}
****/
****/
/***** 更新 POS本地数据库的打印信息是否成功;begin:*********/
/***** 更新 POS本地数据库的打印信息是否成功;begin:*********/
int
retSyncOrderPrintInfo
=
1
;
//
int retSyncOrderPrintInfo = 1;
//
int retSyncOrderPrintInfo = 0;
int
retSyncOrderPrintInfo
=
0
;
/***** 更新 POS本地数据库的打印信息是否成功;end:********/
/***** 更新 POS本地数据库的打印信息是否成功;end:********/
/***** 解析 同步更新POS本地数据库是否成功:retSyncOrderPrintInfo:1->成功********/
/***** 解析 同步更新POS本地数据库是否成功:retSyncOrderPrintInfo:1->成功********/
if
(
retSyncOrderPrintInfo
){
if
(
retSyncOrderPrintInfo
){
...
@@ -1347,7 +1347,9 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
...
@@ -1347,7 +1347,9 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
cObj
.
insert
(
"pos_sale_id"
,
posCheckNo
);
cObj
.
insert
(
"pos_sale_id"
,
posCheckNo
);
cObj
.
insert
(
"products_fee"
,
order_p
->
productPrice
);
// 商品金额
cObj
.
insert
(
"products_fee"
,
order_p
->
productPrice
);
// 商品金额
cObj
.
insert
(
"discount_fee"
,
0
);
// 优惠总额
cObj
.
insert
(
"discount_fee"
,
0
);
// 优惠总额
cObj
.
insert
(
"msr_card_no"
,
(
order_p
->
msr_no
.
length
()
==
0
)
?
order_p
->
customerId
:
order_p
->
msr_no
);
// MSR卡号
QString
temp_MSR_NO
=
(
order_p
->
msr_no
.
length
()
==
0
)
?
order_p
->
customerId
:
order_p
->
msr_no
;
temp_MSR_NO
=
(
temp_MSR_NO
.
length
()
==
0
)
?
QString
::
fromLocal8Bit
(
"no_MsrNo_no_CustomerId"
)
:
temp_MSR_NO
;
cObj
.
insert
(
"msr_card_no"
,
temp_MSR_NO
)
;
// MSR卡号
rObj
.
insert
(
"pay_id"
,
cObj
);
rObj
.
insert
(
"pay_id"
,
cObj
);
data
=
rObj
;
data
=
rObj
;
}
}
...
@@ -1496,7 +1498,9 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
...
@@ -1496,7 +1498,9 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
cObj
.
insert
(
"service_fee"
,
/*orderObject->service_fee*/
0
);
// 平台佣金
cObj
.
insert
(
"service_fee"
,
/*orderObject->service_fee*/
0
);
// 平台佣金
cObj
.
insert
(
"discount_fee"
,
/*orderObject->discount_fee*/
0
);
// 优惠总额
cObj
.
insert
(
"discount_fee"
,
/*orderObject->discount_fee*/
0
);
// 优惠总额
cObj
.
insert
(
"dis_shop_fee"
,
/*orderObject->dis_shop_fee*/
0
);
// 商家承担优惠金额
cObj
.
insert
(
"dis_shop_fee"
,
/*orderObject->dis_shop_fee*/
0
);
// 商家承担优惠金额
cObj
.
insert
(
"msr_card_no"
,
(
orderObject
->
msr_no
.
length
()
==
0
)
?
orderObject
->
customerId
:
orderObject
->
msr_no
);
// MSR卡号
QString
temp_MSR_NO
=
(
orderObject
->
msr_no
.
length
()
==
0
)
?
orderObject
->
customerId
:
orderObject
->
msr_no
;
temp_MSR_NO
=
(
temp_MSR_NO
.
length
()
==
0
)
?
QString
::
fromLocal8Bit
(
"no_MsrNo_no_CustomerId"
)
:
temp_MSR_NO
;
cObj
.
insert
(
"msr_card_no"
,
temp_MSR_NO
);
// MSR卡号
cObj
.
insert
(
"retSyncOrderPrintInfo"
,
0
);
// 同步POS本地数据库打印信息结果:[1:同步成功;0:同步失败; 默认:0]
cObj
.
insert
(
"retSyncOrderPrintInfo"
,
0
);
// 同步POS本地数据库打印信息结果:[1:同步成功;0:同步失败; 默认:0]
cObj
.
insert
(
"dis_platform_fee"
,
/*orderObject->dis_platform_fee*/
0
);
// 平台承担优惠金额
cObj
.
insert
(
"dis_platform_fee"
,
/*orderObject->dis_platform_fee*/
0
);
// 平台承担优惠金额
cObj
.
insert
(
"send_fee"
,
orderObject
->
deliveryPrice
);
// 配送费
cObj
.
insert
(
"send_fee"
,
orderObject
->
deliveryPrice
);
// 配送费
...
...
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