Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
supplier
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
王宇航
supplier
Commits
ab94d949
Commit
ab94d949
authored
Dec 04, 2020
by
宁斌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
堂食打印實體適配類
parent
a64b7e94
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
54 additions
and
1 deletions
+54
-1
base-module/src/main/java/com/gingersoft/gsa/cloud/common/core/print/bean/adapter/AdaptationContent.java
+6
-0
base-module/src/main/java/com/gingersoft/gsa/cloud/common/core/print/bean/adapter/PrintContentAdapter.java
+34
-0
print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
+7
-0
print-module/src/main/java/com/joe/print/mvp/print/PrintQRCode.java
+1
-1
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
+6
-0
No files found.
base-module/src/main/java/com/gingersoft/gsa/cloud/common/core/print/bean/adapter/AdaptationContent.java
View file @
ab94d949
package
com
.
gingersoft
.
gsa
.
cloud
.
common
.
core
.
print
.
bean
.
adapter
;
package
com
.
gingersoft
.
gsa
.
cloud
.
common
.
core
.
print
.
bean
.
adapter
;
import
com.gingersoft.gsa.cloud.common.core.order.order.DoshokuOrder
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.OrderDetails
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.OrderDetails
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintContent
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintContent
;
import
com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport
;
import
com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport
;
...
@@ -20,4 +21,9 @@ public interface AdaptationContent {
...
@@ -20,4 +21,9 @@ public interface AdaptationContent {
PrintContent
adaptationPrintCleanMachineContent
(
SettlementReport
settlementReport
);
PrintContent
adaptationPrintCleanMachineContent
(
SettlementReport
settlementReport
);
PrintContent
adaptationPrintSlipContent
(
DoshokuOrder
doshokuOrder
);
PrintContent
adaptationServingPaperContent
();
PrintContent
adaptationBillContent
();
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/common/core/print/bean/adapter/PrintContentAdapter.java
View file @
ab94d949
...
@@ -8,7 +8,9 @@ import com.gingersoft.gsa.cloud.common.R;
...
@@ -8,7 +8,9 @@ import com.gingersoft.gsa.cloud.common.R;
import
com.gingersoft.gsa.cloud.common.constans.AppConstans
;
import
com.gingersoft.gsa.cloud.common.constans.AppConstans
;
import
com.gingersoft.gsa.cloud.common.constans.ExpandConstant
;
import
com.gingersoft.gsa.cloud.common.constans.ExpandConstant
;
import
com.gingersoft.gsa.cloud.common.core.order.commodity.OrderDetail
;
import
com.gingersoft.gsa.cloud.common.core.order.commodity.OrderDetail
;
import
com.gingersoft.gsa.cloud.common.core.order.order.DoshokuOrder
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintCleanMachineContent
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintCleanMachineContent
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintSlipContent
;
import
com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager
;
import
com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.OrderDetails
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.OrderDetails
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintContent
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintContent
;
...
@@ -19,6 +21,7 @@ import com.gingersoft.gsa.cloud.common.core.print.bean.base.PrintFoodItem;
...
@@ -19,6 +21,7 @@ import com.gingersoft.gsa.cloud.common.core.print.bean.base.PrintFoodItem;
import
com.gingersoft.gsa.cloud.common.core.print.bean.base.PrintPayTypeItem
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.base.PrintPayTypeItem
;
import
com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils
;
import
com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils
;
import
com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport
;
import
com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport
;
import
com.gingersoft.gsa.cloud.common.core.table.TableBean
;
import
com.gingersoft.gsa.cloud.common.utils.MoneyUtil
;
import
com.gingersoft.gsa.cloud.common.utils.MoneyUtil
;
import
com.gingersoft.gsa.cloud.common.utils.other.TextUtil
;
import
com.gingersoft.gsa.cloud.common.utils.other.TextUtil
;
import
com.gingersoft.gsa.cloud.common.utils.time.TimeUtils
;
import
com.gingersoft.gsa.cloud.common.utils.time.TimeUtils
;
...
@@ -70,6 +73,37 @@ public class PrintContentAdapter implements AdaptationContent {
...
@@ -70,6 +73,37 @@ public class PrintContentAdapter implements AdaptationContent {
return
cleanMachineContent
;
return
cleanMachineContent
;
}
}
@Override
public
PrintContent
adaptationPrintSlipContent
(
DoshokuOrder
doshokuOrder
)
{
List
<
OrderDetail
>
foodList
=
doshokuOrder
.
getShoppingCart
().
getOrderCommodityList
();
TableBean
.
DataBean
tableBean
=
doshokuOrder
.
getOpenTableInfo
();
PrintSlipContent
slipContent
=
new
PrintSlipContent
();
slipContent
.
setBrand
(
ResturantInfoManager
.
newInstance
().
getBrandName
());
slipContent
.
setResturantName
(
ResturantInfoManager
.
newInstance
().
getRestaurantName
());
slipContent
.
setTableName
(
tableBean
.
getTableName
());
slipContent
.
setOrderNo
(
tableBean
);
slipContent
.
setPerson
();
slipContent
.
setFoodItemList
();
slipContent
.
setBillItemList
();
slipContent
.
setWholeAmount
();
slipContent
.
setTotalAmount
();
slipContent
.
setPoliteLanguage
();
slipContent
.
setCreateTime
();
return
slipContent
;
}
@Override
public
PrintContent
adaptationServingPaperContent
()
{
return
null
;
}
@Override
public
PrintContent
adaptationBillContent
()
{
return
null
;
}
public
PrintTakeawayFormContent
getPrintTakeawayFormContent
(
OrderDetails
.
DataBean
data
,
int
type
)
{
public
PrintTakeawayFormContent
getPrintTakeawayFormContent
(
OrderDetails
.
DataBean
data
,
int
type
)
{
PrintTakeawayFormContent
takeawayPrintContent
;
PrintTakeawayFormContent
takeawayPrintContent
;
if
(
type
==
1
)
{
if
(
type
==
1
)
{
...
...
print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
View file @
ab94d949
...
@@ -92,6 +92,13 @@ public class PrintBill extends PrinterRoot {
...
@@ -92,6 +92,13 @@ public class PrintBill extends PrinterRoot {
return
pritContent
;
return
pritContent
;
}
}
// private String getHtmlContent() {
//
//
//
//
// }
@Override
@Override
public
int
getPrintCount
(
Context
context
)
{
public
int
getPrintCount
(
Context
context
)
{
return
RestaurantExpandInfoUtils
.
getValue
(
ExpandConstant
.
TableModeClosingPC
,
1
);
return
RestaurantExpandInfoUtils
.
getValue
(
ExpandConstant
.
TableModeClosingPC
,
1
);
...
...
print-module/src/main/java/com/joe/print/mvp/print/PrintQRCode.java
View file @
ab94d949
...
@@ -71,7 +71,7 @@ public class PrintQRCode extends PrinterRoot<PrintQRCodeContent> {
...
@@ -71,7 +71,7 @@ public class PrintQRCode extends PrinterRoot<PrintQRCodeContent> {
new
HtmlLable
.
Attributes
(
HtmlContract
.
ATTRIBUTES_FONT_SIZE
,
"25"
)));
new
HtmlLable
.
Attributes
(
HtmlContract
.
ATTRIBUTES_FONT_SIZE
,
"25"
)));
//qrcode
//qrcode
htmlLables
.
add
(
new
HtmlLable
(
LABLE_QRCODE
,
mQRCodeBean
.
getPrintQrcode
(),
new
HtmlLable
.
Attributes
(
HtmlContract
.
ATTRIBUTES_SCALE
,
HtmlContract
.
value_scale_1
,
HtmlContract
.
value_type_string
)));
htmlLables
.
add
(
new
HtmlLable
(
LABLE_QRCODE
,
mQRCodeBean
.
getPrintQrcode
()
.
substring
(
0
,
30
)
,
new
HtmlLable
.
Attributes
(
HtmlContract
.
ATTRIBUTES_SCALE
,
HtmlContract
.
value_scale_1
,
HtmlContract
.
value_type_string
)));
//底部
//底部
htmlLables
.
add
(
new
HtmlLable
(
HtmlContract
.
LABLE_P
,
mQRCodeBean
.
getPrintTime
(),
new
HtmlLable
.
Attributes
(
HtmlContract
.
ATTRIBUTES_FONT_SIZE
,
"25"
)));
htmlLables
.
add
(
new
HtmlLable
(
HtmlContract
.
LABLE_P
,
mQRCodeBean
.
getPrintTime
(),
new
HtmlLable
.
Attributes
(
HtmlContract
.
ATTRIBUTES_FONT_SIZE
,
"25"
)));
...
...
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
View file @
ab94d949
...
@@ -7,6 +7,8 @@ import android.util.Log;
...
@@ -7,6 +7,8 @@ import android.util.Log;
import
android.view.View
;
import
android.view.View
;
import
com.billy.cc.core.component.CC
;
import
com.billy.cc.core.component.CC
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.PrintContent
;
import
com.gingersoft.gsa.cloud.common.core.print.bean.adapter.PrintContentAdapter
;
import
com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager
;
import
com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager
;
import
com.gingersoft.gsa.cloud.common.bean.BaseResult
;
import
com.gingersoft.gsa.cloud.common.bean.BaseResult
;
import
com.gingersoft.gsa.cloud.common.core.member.MemberInfo
;
import
com.gingersoft.gsa.cloud.common.core.member.MemberInfo
;
...
@@ -423,8 +425,12 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
...
@@ -423,8 +425,12 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
//合并主食品
//合并主食品
mergeMainFoodNumber
(
mOrderMealList
);
mergeMainFoodNumber
(
mOrderMealList
);
}
}
PrintContent
printContent
=
new
PrintContentAdapter
().
adaptationPrintSlipContent
(
DoshokuOrder
.
getInstance
());
CC
.
obtainBuilder
(
ComponentName
.
COMPONENT_PRINT
)
CC
.
obtainBuilder
(
ComponentName
.
COMPONENT_PRINT
)
.
addParam
(
PrintConstans
.
PRINT_TYPE
,
PrintConstans
.
PRINT_SLIP
)
//印單
.
addParam
(
PrintConstans
.
PRINT_TYPE
,
PrintConstans
.
PRINT_SLIP
)
//印單
.
addParam
(
PrintConstans
.
PRINT_CONTENT
,
printContent
)
.
setActionName
(
"printActivity"
)
.
setActionName
(
"printActivity"
)
.
build
()
.
build
()
.
callAsyncCallbackOnMainThread
((
cc
,
result
)
->
{
.
callAsyncCallbackOnMainThread
((
cc
,
result
)
->
{
...
...
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