Skip to content

S
sbkpay
Commit 5b86310c by 李定达
Options

1.调整界面

parent 401c325c
Showing with 52 additions and 38 deletions
sbkpay/control.cpp
......@@ -111,6 +111,7 @@ bool Control::SendMessageToPayMent(const QJsonObject &json, QByteArray &outdata)
outdata = QByteArray(out);
return true;
}
else
QLOG_ERROR() << "get function (GetValue) failed";
}
else
......@@ -134,9 +135,9 @@ bool Control::GetRSA()
QEventLoop loop;
QtConcurrent::run( [ this, &loop, &rlt, getrsacret]()
{
int i = GetString(_request.Reserved1, 48).toInt();
QString storeID = GetString(_request.StoreNo, 20);
QString PosNO = GetString(_request.DeviceNo, 6);
int i = FMTool::GetString(_request.Reserved1, 48).toInt();
QString storeID = FMTool::GetString(_request.StoreNo, 20);
QString PosNO = FMTool::GetString(_request.DeviceNo, 6);
rlt = getrsacret(i, storeID.toLatin1().data(), PosNO.toLatin1().data());
......@@ -145,6 +146,7 @@ bool Control::GetRSA()
loop.exec();
}
else
QLOG_ERROR() << "get function (GetRSACret) failed";
}
else
......
sbkpay/fmtool.h
......@@ -7,10 +7,11 @@
#include "requestmodel.h"
#include "global.h"
int GBKToUTF8(unsigned char * lpGBKStr,int gbkLen, unsigned char * lpUTF8Str,int nUTF8StrLen)
class FMTool
{
public:
static int GBKToUTF8(unsigned char * lpGBKStr,int gbkLen, unsigned char * lpUTF8Str,int nUTF8StrLen)
{
wchar_t * lpUnicodeStr = NULL;
int nRetLen = 0;
......@@ -47,10 +48,10 @@ int GBKToUTF8(unsigned char * lpGBKStr,int gbkLen, unsigned char * lpUTF8Str,int
free(lpUnicodeStr);
return nRetLen;
}
}
int UTF8ToGBK(unsigned char * lpUTF8Str,unsigned char * lpGBKStr,int nGBKStrLen)
{
static int UTF8ToGBK(unsigned char * lpUTF8Str,unsigned char * lpGBKStr,int nGBKStrLen)
{
wchar_t * lpUnicodeStr = NULL;
int nRetLen = 0;
......@@ -86,11 +87,11 @@ int UTF8ToGBK(unsigned char * lpUTF8Str,unsigned char * lpGBKStr,int nGBKStrLen)
free(lpUnicodeStr);
return nRetLen;
}
}
//获取AlipayRequest中的值并过滤空格并进行编码转换
QString GetString(const void *beginptr, int size)
{
//获取AlipayRequest中的值并过滤空格并进行编码转换
static QString GetString(const void *beginptr, int size)
{
QString tmp = "";
......@@ -122,7 +123,11 @@ QString GetString(const void *beginptr, int size)
qDebug() << tmp.toLatin1().data();
return QString(tmpbuf);
}
}
};
#endif // FMTOOL
sbkpay/hostwidget.cpp
......@@ -2,6 +2,7 @@
#include "ui_hostwidget.h"
#include "QKeyEvent"
#include "QsLog.h"
#include "fmtool.h"
HostWidget::HostWidget(QWidget *parent) :
FMPWindow(parent),
......@@ -77,9 +78,10 @@ void HostWidget::keyPressEvent(QKeyEvent *ke)
}
}
void HostWidget::ShowWithRequest(const AlipayRequest &request)
void HostWidget::ShowWithRequest(AlipayRequest request)
{
QString reqtype;
_data = request;
reqtype.append(request.TransType[0]).append(request.TransType[1]);
......@@ -130,6 +132,10 @@ void HostWidget::on_btn_mananger_register_clicked()
QStringList list;
ShowWidget(ui->sign);
ui->btn_sign_sign->hide();
ui->label_sign_title->setText("签到中...");
ui->label_sign_msg->setText("");
ui->label_sign_storeid->setText(FMTool::GetString(_data.StoreNo, 20));
emit RequestWithType(sign, list);
}
......@@ -175,6 +181,5 @@ void HostWidget::on_btn_sign_sign_clicked()
QStringList list;
ui->btn_sign_sign->hide();
//ui->btn_sign_exit->setDisabled(true);
emit RequestWithType(sign, list);
}
sbkpay/hostwidget.h
......@@ -21,7 +21,7 @@ public:
~HostWidget();
void ShowWithRequest(const AlipayRequest &request);
void ShowWithRequest(AlipayRequest request);
void ShowWiteMGS(ReqType type, bool flag, QString message = QString());
......@@ -64,6 +64,8 @@ private:
QWidget *_curr_show_widget;
AlipayRequest _data;
};
......
sbkpay/jsonfactory.h
......@@ -34,17 +34,17 @@ private:
json.insert(JSON_KEY_VER, DEFAULT_JSON_VER_VALUE);
json.insert(JSON_KEY_REQTYPE, JSON_REQTYPE_PAY);
json.insert(JSON_KEY_PARTNERID, GetString((const void *)&(request.Reserved1), 48).toInt());
json.insert(JSON_KEY_STOREID, GetString((const void *)&(request.StoreNo), 20));
json.insert(JSON_KEY_STATIONID, GetString((const void *)&(request.DeviceNo), 6));
json.insert(JSON_KEY_OPERATORID, GetString((const void *)&(request.CashierNo), 6));
json.insert(JSON_KEY_TRANSID, GetString((const void *)&(request.CashTraceNo), 6));
json.insert(JSON_KEY_BUSINESSDATE, GetString((const void *)&(request.BusinessDay), 8));
json.insert(JSON_KEY_PARTNERID, FMTool::GetString((const void *)&(request.Reserved1), 48).toInt());
json.insert(JSON_KEY_STOREID, FMTool::GetString((const void *)&(request.StoreNo), 20));
json.insert(JSON_KEY_STATIONID, FMTool::GetString((const void *)&(request.DeviceNo), 6));
json.insert(JSON_KEY_OPERATORID, FMTool::GetString((const void *)&(request.CashierNo), 6));
json.insert(JSON_KEY_TRANSID, FMTool::GetString((const void *)&(request.CashTraceNo), 6));
json.insert(JSON_KEY_BUSINESSDATE, FMTool::GetString((const void *)&(request.BusinessDay), 8));
json.insert(JSON_KEY_CODE, list[0]);
json.insert(JSON_KEY_TRANSAMOUNT, GetString((const void *)&(request.Amount), 12).toInt());
json.insert(JSON_KEY_UNAMOUNT, GetString((const void *)&(request.non_sale_Amount), 12).toInt());
json.insert(JSON_KEY_TRANSAMOUNT, FMTool::GetString((const void *)&(request.Amount), 12).toInt());
json.insert(JSON_KEY_UNAMOUNT, FMTool::GetString((const void *)&(request.non_sale_Amount), 12).toInt());
QString len = GetString((const void *)&(request.item_line_qty), 2);
QString len = FMTool::GetString((const void *)&(request.item_line_qty), 2);
QJsonArray prod;
......@@ -54,17 +54,17 @@ private:
struct product *pro = (struct product *)request.item_information[i];
object.insert(JSON_KEY_PRODUCTS_CONSUMENUM, GetString((const void *)&(pro->buyCount), 4));
object.insert(JSON_KEY_PRODUCTS_PID, GetString((const void *)&(pro->productID), 8));
object.insert(JSON_KEY_PRODUCTS_NAME, GetString((const void *)&(pro->productName), 20));
object.insert(JSON_KEY_PRODUCTS_CONSUMENUM, FMTool::GetString((const void *)&(pro->buyCount), 4));
object.insert(JSON_KEY_PRODUCTS_PID, FMTool::GetString((const void *)&(pro->productID), 8));
object.insert(JSON_KEY_PRODUCTS_NAME, FMTool::GetString((const void *)&(pro->productName), 20));
object.insert(JSON_KEY_PRODUCTS_SALESTYPE, DEFAULT_JSON_PRODUCTS_NORMAL);
QString typebuf = GetString((const void *)&(pro->isCombo), 1);
QString typebuf = FMTool::GetString((const void *)&(pro->isCombo), 1);
if(typebuf == 0)
object.insert(JSON_KEY_PRODUCTS_SALESTYPE, DEFAULT_JSON_PRODUCTS_FREE);
object.insert(JSON_KEY_PRODUCTS_PRICE, GetString((const void *)&(pro->unitPrice), 8));
object.insert(JSON_KEY_PRODUCTS_PRICE, FMTool::GetString((const void *)&(pro->unitPrice), 8));
prod.append(object);
}
......@@ -82,14 +82,14 @@ private:
json.insert(JSON_KEY_VER, DEFAULT_JSON_VER_VALUE);
json.insert(JSON_KEY_REQTYPE, JSON_REQTYPE_REFUND);
json.insert(JSON_KEY_PARTNERID, GetString((const void *)&(request.Reserved1), 48));
json.insert(JSON_KEY_STOREID, GetString((const void *)&(request.StoreNo), 20));
json.insert(JSON_KEY_STATIONID, GetString((const void *)&(request.DeviceNo), 6));
json.insert(JSON_KEY_OPERATORID, GetString((const void *)&(request.CashierNo), 6));
json.insert(JSON_KEY_TRANSID, GetString((const void *)&(request.CashTraceNo), 6));
json.insert(JSON_KEY_BUSINESSDATE, GetString((const void *)&(request.BusinessDay), 8));
json.insert(JSON_KEY_PARTNERID, FMTool::GetString((const void *)&(request.Reserved1), 48));
json.insert(JSON_KEY_STOREID, FMTool::GetString((const void *)&(request.StoreNo), 20));
json.insert(JSON_KEY_STATIONID, FMTool::GetString((const void *)&(request.DeviceNo), 6));
json.insert(JSON_KEY_OPERATORID, FMTool::GetString((const void *)&(request.CashierNo), 6));
json.insert(JSON_KEY_TRANSID, FMTool::GetString((const void *)&(request.CashTraceNo), 6));
json.insert(JSON_KEY_BUSINESSDATE, FMTool::GetString((const void *)&(request.BusinessDay), 8));
json.insert(JSON_KEY_CODE, list[0]);
json.insert(JSON_KEY_REFUNDAMOUT, GetString((const void *)&(request.Amount), 12).toInt());
json.insert(JSON_KEY_REFUNDAMOUT, FMTool::GetString((const void *)&(request.Amount), 12).toInt());
return true;
......
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