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
689f9821
Commit
689f9821
authored
Apr 26, 2021
by
宁斌
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、折扣彈窗cash問題
parent
5699dacf
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
68 deletions
+75
-68
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java
+2
-1
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
+6
-6
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
+46
-46
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/DiscountDialog.java
+0
-0
component-table/src/main/res/layout/table_dialog_discout.xml
+21
-15
No files found.
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java
View file @
689f9821
...
...
@@ -4,6 +4,7 @@ import android.content.Intent;
import
com.gingersoft.gsa.cloud.common.bean.BaseResult
;
import
com.gingersoft.gsa.cloud.common.core.table.TableBean
;
import
com.gingersoft.gsa.cloud.database.bean.Discount
;
import
com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse
;
import
com.gingersoft.gsa.cloud.table.mvp.ui.fragment.RegionTableFragment
;
import
com.jess.arms.base.DefaultAdapter
;
...
...
@@ -71,7 +72,7 @@ public interface OrderContentContract {
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface
Model
extends
BaseOrderContract
.
Model
{
//
List<Discount> queryDB_DiscountList(byte discountScope, byte discountType);
List
<
Discount
>
queryDB_DiscountList
(
byte
discountScope
,
byte
discountType
);
Observable
<
BaseOrderResponse
>
createOrder
(
RequestBody
requestBody
);
...
...
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
View file @
689f9821
...
...
@@ -76,12 +76,12 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
.
loadOrder
(
orderId
);
}
//
@Override
//
public List<Discount> queryDB_DiscountList(byte discountScope, byte discountType) {
//
DiscountDaoUtils discountDaoUtils = new DiscountDaoUtils(mApplication);
//
List<Discount> discountList = discountDaoUtils.queryDiscountByQueryBuilder();
//
return MealConditionFilterUtils.discountConditionFilter(discountList,discountScope,discountType);
//
}
@Override
public
List
<
Discount
>
queryDB_DiscountList
(
byte
discountScope
,
byte
discountType
)
{
DiscountDaoUtils
discountDaoUtils
=
new
DiscountDaoUtils
(
mApplication
);
List
<
Discount
>
discountList
=
discountDaoUtils
.
queryDiscountByQueryBuilder
();
return
MealConditionFilterUtils
.
discountConditionFilter
(
discountList
,
discountScope
,
discountType
);
}
@Override
public
Observable
<
BaseOrderResponse
>
createOrder
(
RequestBody
requestBody
)
{
...
...
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
View file @
689f9821
...
...
@@ -814,42 +814,12 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
}
private
void
showDiscountDialog
()
{
if
(
IActivity
.
findFragment
(
DiscountDialogFragment
.
class
)
==
null
)
{
DiscountDialogFragment
dialogFragment
=
DiscountDialogFragment
.
newInstance
();
dialogFragment
.
setOnDiscountItemClickListener
(
new
DiscountDialogFragment
.
OnDiscountItemClickListener
()
{
@Override
public
void
onBillDiscountClick
(
Discount
item
,
int
position
)
{
if
(
item
.
getMinBillAmount
()
>
mShoppingCart
.
getWholeAmount
())
{
//小於最小賬單金額
mRootView
.
showMessage
(
"小於最小賬單金額"
+
cashStr
+
item
.
getMinBillAmount
()
+
" 無法使用此折扣"
);
return
;
}
mNomalDiscountAction
.
setNomalDiscountList
(
mShoppingCart
.
getNomalDiscoutByMultyDiscountList
());
mNomalDiscountAction
.
action
(
item
);
dialogFragment
.
dismiss
();
}
@Override
public
void
onCouponClick
(
MemberCoupon
item
,
int
position
)
{
if
(
item
.
getBillMinAmount
()
>
mShoppingCart
.
getWholeAmount
())
{
//小於最小賬單金額
mRootView
.
showMessage
(
"小於最小賬單金額"
+
cashStr
+
item
.
getBillMinAmount
()
+
" 無法使用此優惠券"
);
return
;
}
mNomalDiscountAction
.
setNomalDiscountList
(
mShoppingCart
.
getNomalDiscoutByMultyDiscountList
());
mNomalDiscountAction
.
action
(
item
.
castDiscount
());
dialogFragment
.
dismiss
();
}
});
dialogFragment
.
show
(
IActivity
.
getSupportFragmentManager
(),
"DiscountDialogFragment"
);
}
// if (mDiscountDialog == null) {
// mDiscountDialog = new DiscountDialog.Builder(IActivity);
// mDiscountDialog.setCanScan(true);
// mDiscountDialog.setOnClickListener(new DiscountDialog.Builder.OnClickListener() {
// if (IActivity.findFragment(DiscountDialogFragment.class) == null) {
// DiscountDialogFragment dialogFragment = DiscountDialogFragment.newInstance();
// dialogFragment.setOnDiscountItemClickListener(new DiscountDialogFragment.OnDiscountItemClickListener() {
//
// @Override
// public void on
Item
Click(Discount item, int position) {
// public void on
BillDiscount
Click(Discount item, int position) {
// if (item.getMinBillAmount() > mShoppingCart.getWholeAmount()) {
// //小於最小賬單金額
// mRootView.showMessage("小於最小賬單金額" + cashStr + item.getMinBillAmount() + " 無法使用此折扣");
...
...
@@ -857,23 +827,53 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
// }
// mNomalDiscountAction.setNomalDiscountList(mShoppingCart.getNomalDiscoutByMultyDiscountList());
// mNomalDiscountAction.action(item);
// dialogFragment.dismiss();
// }
//
// @Override
// public void onScan() {
// toScanActivity();
// public void onCouponClick(MemberCoupon item, int position) {
// if (item.getBillMinAmount() > mShoppingCart.getWholeAmount()) {
// //小於最小賬單金額
// mRootView.showMessage("小於最小賬單金額" + cashStr + item.getBillMinAmount() + " 無法使用此優惠券");
// return;
// }
// mNomalDiscountAction.setNomalDiscountList(mShoppingCart.getNomalDiscoutByMultyDiscountList());
// mNomalDiscountAction.action(item.castDiscount());
// dialogFragment.dismiss();
// }
// });
// dialogFragment.show(IActivity.getSupportFragmentManager(), "DiscountDialogFragment");
// }
// List<Discount> discountList;
// if (BaseOrder.isCurrentOrderType(FoodSummaryConstans.TAKEAWAY_TYPE)) {
// discountList = mModel.queryDB_DiscountList(Discount.discount_scope_bill, Discount.ORDER_TYPE_TAKEAWAY);
// } else {
// discountList = mModel.queryDB_DiscountList(Discount.discount_scope_bill, Discount.ORDER_TYPE_MEAL_STAND);
// }
//
// mDiscountDialog.addItems(discountList);
// mDiscountDialog.build().show();
if
(
mDiscountDialog
==
null
)
{
mDiscountDialog
=
new
DiscountDialog
.
Builder
(
IActivity
);
mDiscountDialog
.
setCanScan
(
true
);
mDiscountDialog
.
setOnClickListener
(
new
DiscountDialog
.
Builder
.
OnClickListener
()
{
@Override
public
void
onItemClick
(
Discount
item
,
int
position
)
{
if
(
item
.
getMinBillAmount
()
>
mShoppingCart
.
getWholeAmount
())
{
//小於最小賬單金額
mRootView
.
showMessage
(
"小於最小賬單金額"
+
cashStr
+
item
.
getMinBillAmount
()
+
" 無法使用此折扣"
);
return
;
}
mNomalDiscountAction
.
setNomalDiscountList
(
mShoppingCart
.
getNomalDiscoutByMultyDiscountList
());
mNomalDiscountAction
.
action
(
item
);
}
@Override
public
void
onScan
()
{
toScanActivity
();
}
});
}
List
<
Discount
>
discountList
;
if
(
BaseOrder
.
isCurrentOrderType
(
FoodSummaryConstans
.
TAKEAWAY_TYPE
))
{
discountList
=
mModel
.
queryDB_DiscountList
(
Discount
.
discount_scope_bill
,
Discount
.
ORDER_TYPE_TAKEAWAY
);
}
else
{
discountList
=
mModel
.
queryDB_DiscountList
(
Discount
.
discount_scope_bill
,
Discount
.
ORDER_TYPE_MEAL_STAND
);
}
mDiscountDialog
.
addItems
(
discountList
);
mDiscountDialog
.
build
().
show
();
}
/**
...
...
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/DiscountDialog.java
View file @
689f9821
This diff is collapsed.
Click to expand it.
component-table/src/main/res/layout/table_dialog_discout.xml
View file @
689f9821
...
...
@@ -4,23 +4,30 @@
android:id=
"@+id/ll_container"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/theme_white_color"
android:orientation=
"vertical"
>
<!-- <com.qmuiteam.qmui.widget.QMUITopBar-->
<!-- android:id="@+id/topbar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="@dimen/head_height"-->
<!-- app:qmui_topbar_title_color="@color/theme_white_color" />-->
<com.qmuiteam.qmui.widget.tab.QMUITabSegment
android:id=
"@+id/tabSegment"
<com.qmuiteam.qmui.widget.QMUITopBar
android:id=
"@+id/topbar"
android:layout_width=
"match_parent"
android:layout_height=
"
@dimen/dp_45
"
a
ndroid:background=
"@drawable/shape_tab_panel_bg
"
/>
android:layout_height=
"
?attr/qmui_topbar_height
"
a
pp:qmui_topbar_title_color=
"@color/theme_white_color
"
/>
<androidx.
viewpager.widget.ViewPager
android:id=
"@+id/
contentViewPager
"
<androidx.
recyclerview.widget.RecyclerView
android:id=
"@+id/
recycler_discount
"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
android:divider=
"@null"
android:fadeScrollbars=
"false"
android:orientation=
"vertical"
app:layoutManager=
"androidx.recyclerview.widget.GridLayoutManager"
app:spanCount=
"3"
/>
<!-- <ImageView-->
<!-- android:id="@+id/btn_close"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_margin="@dimen/dp_20"-->
<!-- android:src="@drawable/icon_dialog_close" />-->
</com.qmuiteam.qmui.layout.QMUILinearLayout>
\ No newline at end of file
</com.qmuiteam.qmui.layout.QMUILinearLayout>
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