Skip to content

F
fmPOS
Commit d61bfafa by 刘帅
Options

redeem适配接口

parent 4bad61b3
Showing with 71 additions and 52 deletions
.gitignore
...@@ -7,13 +7,15 @@ ...@@ -7,13 +7,15 @@
*.pdb *.pdb
*.zip *.zip
*.rar *.rar
*.map
*.db
*_manifest.rc *_manifest.rc
*/plugins/*.dll */plugins/*.dll
*/plugins/*.lib */plugins/*.lib
*/plugins/*.pdb */plugins/*.pdb
*/plugins/*.rc */plugins/*.rc
*/bin/*.exe */bins/*.exe
*/bin/configuration/* */bins/configuration/*
*/res/resource.h */res/resource.h
*/res/MANIFEST.MF */res/MANIFEST.MF
*/res/*.rc */res/*.rc
debug/bins/FreemudPOS.ini
[Service] [Service]
Name=FMPService Name=FMPService
Desc=非码 POS 插件服务 Desc=\x975e\x7801 POS \x63d2\x4ef6\x670d\x52a1
;0 自动启动， 1 手动启动
StartType=0 StartType=0
[Plugin] [Plugin]
Path=../plugins Path=../plugins
EntryService=com.fmp.home EntryService=com.fmp.home
;动画开关，0:关闭 1:开启
Animation=1 Animation=1
[Log] [Log]
Path=log Path=log
Size=1 Size=1
;0:关闭 1:错误 2:警告 3:信息 4:调试
Level=1 Level=1
[Home] [Home]
...@@ -21,7 +18,7 @@ Server=http://115.159.226.87:20001/api/user/login ...@@ -21,7 +18,7 @@ Server=http://115.159.226.87:20001/api/user/login
PartnerId=1371 PartnerId=1371
StoreId=M023 StoreId=M023
PosId=fm1802 PosId=fm1802
Position=339, 251 Position=1391, 497
CashierId=001 CashierId=001
[Pay] [Pay]
...@@ -37,4 +34,3 @@ Interval=3 ...@@ -37,4 +34,3 @@ Interval=3
TaskUrl=http://115.159.33.143/api/fork/checkupdate TaskUrl=http://115.159.33.143/api/fork/checkupdate
DeployPath=.. DeployPath=..
DownloadPath=download DownloadPath=download
fmPos.pro
...@@ -7,13 +7,13 @@ SUBDIRS += fmp_manager \ ...@@ -7,13 +7,13 @@ SUBDIRS += fmp_manager \
#fmp_uiloader \ #fmp_uiloader \
fmp_network \ fmp_network \
#fmp_syncer \ #fmp_syncer \
# fmp_epay \ fmp_epay \
fmp_home \ fmp_home \
fmp_vip \ fmp_vip \
#fmp_takeout \ fmp_takeout \
#fmp_printer \ #fmp_printer \
FreemudPOS \ FreemudPOS \
#FreemudSyncer \ #FreemudSyncer \
#fmp_redeem fmp_redeem
CONFIG += ordered CONFIG += ordered
fmp_epay @ 78ebdf3e
Subproject commit 288a78693a258d632277c7443c0dd41bfb6fe869 Subproject commit 78ebdf3ee8f4c7313e7016d42e3efa0cd7163856
fmp_home @ a2cb0e9f
Subproject commit 88ad1f82fd2efcc870d76855d641e72dd3988218 Subproject commit a2cb0e9f9698b33928a15a2adfc8277c31ce5e6f
fmp_logger/res/MANIFEST.MF
Plugin-SymbolicName: fmp.logger Plugin-SymbolicName: fmp.logger
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.logger Plugin-Name: fmp.logger
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2019
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
fmp_logger/version.h
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 74 #define VER_BUILD 81
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.logger\0" #define RES_FILE_DESC "fmp.logger\0"
#define RES_INTER_NAME "fmp.logger\0" #define RES_INTER_NAME "fmp.logger\0"
#define RES_FILE_NAME "fmp.logger\0" #define RES_FILE_NAME "fmp.logger\0"
......
fmp_manager/res/MANIFEST.MF
Plugin-SymbolicName: fmp.manager Plugin-SymbolicName: fmp.manager
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.manager Plugin-Name: fmp.manager
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2019
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
fmp_manager/version.h
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 74 #define VER_BUILD 81
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.manager\0" #define RES_FILE_DESC "fmp.manager\0"
#define RES_INTER_NAME "fmp.manager\0" #define RES_INTER_NAME "fmp.manager\0"
#define RES_FILE_NAME "fmp.manager\0" #define RES_FILE_NAME "fmp.manager\0"
......
fmp_network/res/fmp_network.qrc 0 → 100644
<RCC>
<qresource prefix="/fmp.network/META-INF">
<file>MANIFEST.MF</file>
</qresource>
</RCC>
fmp_network/version.h
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 74 #define VER_BUILD 81
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.network\0" #define RES_FILE_DESC "fmp.network\0"
#define RES_INTER_NAME "fmp.network\0" #define RES_INTER_NAME "fmp.network\0"
#define RES_FILE_NAME "fmp.network\0" #define RES_FILE_NAME "fmp.network\0"
......
fmp_redeem/fmp_redeem.cpp
...@@ -51,8 +51,9 @@ FMPRedeem::~FMPRedeem() ...@@ -51,8 +51,9 @@ FMPRedeem::~FMPRedeem()
void FMPRedeem::InitService() void FMPRedeem::InitService()
{ {
if (_inited) return; // if (_inited) return;
_inited = true; _inited = true;
Redeem(QJsonObject());
} }
void FMPRedeem::UninitService() void FMPRedeem::UninitService()
...@@ -119,10 +120,19 @@ QJsonObject FMPRedeem::Redeem(const QJsonObject& redeemInfo) ...@@ -119,10 +120,19 @@ QJsonObject FMPRedeem::Redeem(const QJsonObject& redeemInfo)
FMP_DEBUG() << "Recv redeem data: " << QJsonDocument(redeemInfo).toJson(QJsonDocument::Compact); FMP_DEBUG() << "Recv redeem data: " << QJsonDocument(redeemInfo).toJson(QJsonDocument::Compact);
_redeem_info = redeemInfo; _redeem_info = redeemInfo;
//保存门店信息 //保存门店信息
_store_id = SearchJsonObject(_redeem_info, "store_id").toString(); // _store_id = SearchJsonObject(_redeem_info, "store_id").toString();
_station_id = SearchJsonObject(_redeem_info, "pos_id").toString(); // _station_id = SearchJsonObject(_redeem_info, "pos_id").toString();
_operator_id = SearchJsonObject(_redeem_info, "operator_id").toString(); // _operator_id = SearchJsonObject(_redeem_info, "operator_id").toString();
_partner_id = SearchJsonObject(_redeem_info, "partner_id").toInt(); // _partner_id = SearchJsonObject(_redeem_info, "partner_id").toInt();
//读取门店信息
QString apppath = QCoreApplication::applicationDirPath();
QSettings settings(QString("%1/FreemudPOS.ini").arg(apppath), QSettings::IniFormat);
_store_id = settings.value(FMP_INIKEY_LOGINSTOREID).toString();
_station_id = settings.value(FMP_INIKEY_LOGINPOSID).toString();
_operator_id = settings.value(FMP_INIKEY_LOGINCASHIER).toString();
_url = settings.value(FMP_INIKEY_EPAYURL).toString();
_partner_id = settings.value(FMP_INIKEY_LOGINPARTNERID).toInt();
//显示扫码界面获取券码 //显示扫码界面获取券码
ScanningDialog scanningDialog; ScanningDialog scanningDialog;
...@@ -265,19 +275,28 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json) ...@@ -265,19 +275,28 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
QString serverPid = SearchJsonObject(serverProduct, "pid").toString(); QString serverPid = SearchJsonObject(serverProduct, "pid").toString();
int serverNum = SearchJsonObject(serverProduct, "number").toInt(); int serverNum = SearchJsonObject(serverProduct, "number").toInt();
for(int i = 0; i < posProducts.size(); i++) if (posProducts.isEmpty()) {
{ QJsonObject redeemProduct;
QJsonObject posProduct = posProducts[i].toObject(); redeemProduct.insert("seq", seq);
QString posPid = SearchJsonObject(posProduct, "pid").toString(); redeemProduct.insert("pid", serverPid);
int posNum = SearchJsonObject(posProduct, "consume_num").toInt(); redeemProduct.insert("consume_num", serverNum);
if(posPid == serverPid) redeemProducts.append(redeemProduct);
seq++;
} else {
for(int i = 0; i < posProducts.size(); i++)
{ {
QJsonObject redeemProduct; QJsonObject posProduct = posProducts[i].toObject();
redeemProduct.insert("seq", seq); QString posPid = SearchJsonObject(posProduct, "pid").toString();
redeemProduct.insert("pid", posPid); int posNum = SearchJsonObject(posProduct, "consume_num").toInt();
redeemProduct.insert("consume_num", posNum); if(posPid == serverPid)
redeemProducts.append(redeemProduct); {
seq++; QJsonObject redeemProduct;
redeemProduct.insert("seq", seq);
redeemProduct.insert("pid", posPid);
redeemProduct.insert("consume_num", posNum);
redeemProducts.append(redeemProduct);
seq++;
}
} }
} }
} }
......
fmp_redeem/version.h
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 74 #define VER_BUILD 81
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2019\0"
#define RES_FILE_DESC "fmp.redeem\0" #define RES_FILE_DESC "fmp.redeem\0"
#define RES_INTER_NAME "fmp.redeem\0" #define RES_INTER_NAME "fmp.redeem\0"
#define RES_FILE_NAME "fmp.redeem\0" #define RES_FILE_NAME "fmp.redeem\0"
......
fmp_vip @ a0f5f1d0
Subproject commit d964b52f59480aedcc3ec47585e0f9d5e725ad52 Subproject commit a0f5f1d03b4629425e5abb3d70edec419fa8a5d0
include/interface/fmp_takeout_i.h
#include "../../fmp_takeout/fmp_takeout/fmp_takeout_i.h" #include "../../fmp_takeout/fmp_takeout_i.h"
release/bins/FreemudPOS.ini
[Service] [Service]
Name=FMPService Name=FMPService
Desc=非码 POS 插件服务 Desc=\x975e\x7801 POS \x63d2\x4ef6\x670d\x52a1
;0 自动启动， 1 手动启动
StartType=0 StartType=0
[Plugin] [Plugin]
Path=../plugins Path=../plugins
EntryService=com.fmp.home EntryService=com.fmp.home
;动画开关，0:关闭 1:开启
Animation=1 Animation=1
[Log] [Log]
Path=log Path=log
Size=1 Size=1
;0:关闭 1:错误 2:警告 3:信息 4:调试
Level=1 Level=1
[Home] [Home]
Server=http://115.159.226.87:20001/api/user/login Server=http://115.159.226.87:20001/api/user/login
PartnerId=1371 PartnerId=1371
StoreId=pos_coco_CN9999 StoreId=fm99999
PosId=fm1802 PosId=FM0001
Position=339, 251 Position=1162, 407
CashierId=001 CashierId=001
[Pay] [Pay]
...@@ -31,9 +28,9 @@ Timeout=60 ...@@ -31,9 +28,9 @@ Timeout=60
[Vip] [Vip]
Server=http://micro-service.sandload.cn/member-pos/pos/member Server=http://micro-service.sandload.cn/member-pos/pos/member
NeedSocketHeader=0 NeedSocketHeader=0
[Syncer] [Syncer]
Interval=3 Interval=3
TaskUrl=http://115.159.33.143/api/fork/checkupdate TaskUrl=http://115.159.33.143/api/fork/checkupdate
DeployPath=.. DeployPath=..
DownloadPath=download DownloadPath=download
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