Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王海
TangKuPos
Commits
2b26af2a
Commit
2b26af2a
authored
Feb 02, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
无法使用储值卡消费的问题;
parent
441f0a28
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
24 deletions
+31
-24
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
...java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
+22
-16
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
...om/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
+7
-2
app/src/main/res/layout/activity_store.xml
app/src/main/res/layout/activity_store.xml
+2
-6
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java
View file @
2b26af2a
...
@@ -144,26 +144,32 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
...
@@ -144,26 +144,32 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
case
C
.
MS_EDITOR_MODE
.
ADD
:
case
C
.
MS_EDITOR_MODE
.
ADD
:
ApiFactory
.
Ms
.
add
(
ms
)
ApiFactory
.
Ms
.
add
(
ms
)
.
doOnSubscribe
(
disposable
->
mView
.
dismissLoadingDialog
())
.
doOnSubscribe
(
disposable
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
ms1
->
{
.
subscribe
(
ms1
->
{
mView
.
showMsg
(
"添加成功"
);
mView
.
showMsg
(
"添加成功"
);
isNeedSync
=
true
;
isNeedSync
=
true
;
mView
.
backToManagerFragment
();
mView
.
backToManagerFragment
();
mView
.
addMs
(
ms1
);
mView
.
addMs
(
ms1
);
},
throwable
->
{
},
throwable
->
{
mView
.
showMsg
(
"添加失败"
);
mView
.
showMsg
(
"添加失败"
);
});
}
);
break
;
break
;
case
C
.
MS_EDITOR_MODE
.
UPDATE
:
case
C
.
MS_EDITOR_MODE
.
UPDATE
:
ApiFactory
.
Ms
.
update
(
ms
)
ApiFactory
.
Ms
.
update
(
ms
)
.
doOnSubscribe
(
disposable
->
mView
.
dismissLoadingDialog
())
.
doOnSubscribe
(
disposable
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
ms1
->
{
.
subscribe
(
ms1
->
{
mView
.
showMsg
(
"修改成功"
);
mView
.
showMsg
(
"修改成功"
);
isNeedSync
=
true
;
isNeedSync
=
true
;
mView
.
backToManagerFragment
();
mView
.
backToManagerFragment
();
mView
.
updateMs
(
ms1
);
mView
.
updateMs
(
ms1
);
},
throwable
->
{
},
throwable
->
{
mView
.
showMsg
(
"修改失败"
);
mView
.
showMsg
(
"修改失败"
);
});
}
);
break
;
break
;
}
}
}
}
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/SettleFragment.java
View file @
2b26af2a
...
@@ -34,6 +34,8 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
...
@@ -34,6 +34,8 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
private
SaledetailAdapter
mSaledetailAdapter
;
private
SaledetailAdapter
mSaledetailAdapter
;
private
DisAdapter
mDisAdapter
;
private
DisAdapter
mDisAdapter
;
private
Vip
mVip
;
@Override
@Override
public
int
getLayoutId
()
{
public
int
getLayoutId
()
{
return
R
.
layout
.
fragment_settle
;
return
R
.
layout
.
fragment_settle
;
...
@@ -41,6 +43,8 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
...
@@ -41,6 +43,8 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mVip
=
Vip
.
createDefault
();
mPays
=
new
ArrayList
<>();
mPays
=
new
ArrayList
<>();
mViewBinding
.
setDefualtVip
(
true
);
mViewBinding
.
setDefualtVip
(
true
);
...
@@ -149,8 +153,6 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
...
@@ -149,8 +153,6 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
* @param vip 会员信息
* @param vip 会员信息
*/
*/
public
void
loadVip
(
Vip
vip
)
{
public
void
loadVip
(
Vip
vip
)
{
mPayAdapter
.
setNewData
(
getAvlPays
(
vip
));
mViewBinding
.
setDefualtVip
(
vip
.
isDefaultVip
());
mViewBinding
.
setDefualtVip
(
vip
.
isDefaultVip
());
mViewBinding
.
setName
(
vip
.
getVipName
());
mViewBinding
.
setName
(
vip
.
getVipName
());
mViewBinding
.
setPhone
(
vip
.
getVipMobile
());
mViewBinding
.
setPhone
(
vip
.
getVipMobile
());
...
@@ -171,6 +173,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
...
@@ -171,6 +173,7 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
mViewBinding
.
ivLevel
.
setImageResource
(
R
.
mipmap
.
mk_grade03
);
mViewBinding
.
ivLevel
.
setImageResource
(
R
.
mipmap
.
mk_grade03
);
break
;
break
;
}
}
this
.
mVip
=
vip
;
}
}
...
@@ -203,6 +206,8 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
...
@@ -203,6 +206,8 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
mViewBinding
.
tvVipOffAmt
.
setText
(
ConvertUtil
.
fenToYuan
(
saleorder
.
getOrderVipOffAmt
(),
true
));
mViewBinding
.
tvVipOffAmt
.
setText
(
ConvertUtil
.
fenToYuan
(
saleorder
.
getOrderVipOffAmt
(),
true
));
mViewBinding
.
tvOrderCnt
.
setText
(
String
.
valueOf
(
saleorder
.
getOrderCnt
()));
mViewBinding
.
tvOrderCnt
.
setText
(
String
.
valueOf
(
saleorder
.
getOrderCnt
()));
}
}
mPayAdapter
.
setNewData
(
getAvlPays
(
mVip
));
}
}
...
...
app/src/main/res/layout/activity_store.xml
View file @
2b26af2a
...
@@ -80,14 +80,12 @@
...
@@ -80,14 +80,12 @@
<ImageButton
<ImageButton
android:id=
"@+id/btn_payment"
android:id=
"@+id/btn_payment"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_marginStart=
"@dimen/all_spacing"
android:background=
"@color/transparent"
android:background=
"@color/transparent"
android:contentDescription=
"@string/store_scan"
android:contentDescription=
"@string/store_scan"
android:foreground=
"?android:attr/actionBarItemBackground"
android:foreground=
"?android:attr/actionBarItemBackground"
android:paddingEnd=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:src=
"@mipmap/but_collection"
android:src=
"@mipmap/but_collection"
android:visibility=
"@{titleMode>1?View.GONE:View.VISIBLE}"
android:visibility=
"@{titleMode>1?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintBottom_toTopOf=
"parent"
...
@@ -96,14 +94,12 @@
...
@@ -96,14 +94,12 @@
<ImageButton
<ImageButton
android:id=
"@+id/btn_scan"
android:id=
"@+id/btn_scan"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
?attr/actionBarSize
"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginStart=
"@dimen/all_spacing"
android:layout_marginStart=
"@dimen/all_spacing"
android:background=
"@color/transparent"
android:background=
"@color/transparent"
android:contentDescription=
"@string/store_scan"
android:contentDescription=
"@string/store_scan"
android:foreground=
"?android:attr/actionBarItemBackground"
android:foreground=
"?android:attr/actionBarItemBackground"
android:paddingEnd=
"@dimen/all_padding"
android:paddingStart=
"@dimen/all_bounced_padding"
android:src=
"@mipmap/but_sweep_yard"
android:src=
"@mipmap/but_sweep_yard"
android:visibility=
"@{titleMode>1?View.GONE:View.VISIBLE}"
android:visibility=
"@{titleMode>1?View.GONE:View.VISIBLE}"
app:layout_constraintBottom_toTopOf=
"parent"
app:layout_constraintBottom_toTopOf=
"parent"
...
...
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