Commit c4310cba by NitefullWind

1. 修复pay_ids拼写问题。 2. pos传来数据编码转成utf8.

parent e0532a6c
...@@ -29,9 +29,8 @@ BOOL FMVipDispatcher::Transfer(LPSTR data, LPSTR &rsp, UINT &rsp_len) ...@@ -29,9 +29,8 @@ BOOL FMVipDispatcher::Transfer(LPSTR data, LPSTR &rsp, UINT &rsp_len)
{ {
if (strcmp(data, QuitCMD) != 0) { if (strcmp(data, QuitCMD) != 0) {
emit startSocketTimer(); emit startSocketTimer();
mutex.lock(); mutex.lock();
reqData = QByteArray(data); reqData = QString::fromLocal8Bit(data).toUtf8();
emit doTask(); emit doTask();
condition.wait(&mutex); condition.wait(&mutex);
mutex.unlock(); mutex.unlock();
......
...@@ -85,7 +85,7 @@ void TaskPay::packagePOSRsp() ...@@ -85,7 +85,7 @@ void TaskPay::packagePOSRsp()
pay_id[PosProps.Coupon_code] = cp[ServerProps(PosProps.Coupon_code)]; pay_id[PosProps.Coupon_code] = cp[ServerProps(PosProps.Coupon_code)];
pay_ids.append(pay_id); pay_ids.append(pay_id);
} }
posRspJsonObj[PosProps.Pay_id] = pay_ids; posRspJsonObj[PosProps.Pay_ids] = pay_ids;
posRspJsonObj["total_amount"] = session()->data(PosProps.OrderAmount).toInt(); posRspJsonObj["total_amount"] = session()->data(PosProps.OrderAmount).toInt();
posRspJsonObj[PosProps.Paid_total_amount] = paidTotalAmount; posRspJsonObj[PosProps.Paid_total_amount] = paidTotalAmount;
posRspJsonObj["invoice_amount"] = paidTotalAmount; posRspJsonObj["invoice_amount"] = paidTotalAmount;
......
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