Skip to content

T
TangKuPos
Commit 662b2f76 authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 5e52b950 77206edf
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 108 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ 662b2f76
......@@ -54,15 +54,18 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
if (mInventoryAddFragment != null && mInventoryAddFragment.isAdded()) {
mInventoryAddFragment.popThis();
return;
}
if (mScanFragment != null && mScanFragment.isAdded()) {
mScanFragment.pop();
return;
} else {
if (mInventoryAddFragment != null && mInventoryAddFragment.isAdded()) {
mInventoryAddFragment.popThis();
return;
}
}
finish();
}
});
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java
View file @ 662b2f76
package com.xingdata.zzdpos.ui.statistics;
import android.content.Intent;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Pager;
......@@ -10,7 +8,7 @@ import com.xingdata.zzdpos.model.Smt;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.TicketListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
......@@ -23,7 +21,9 @@ public interface StatisticsContract {
interface View extends BaseView {
void isShowLoading(Boolean is);
void getSmtListSucc(Pager<Smt> smtPager);
void getSmtListSucc(Pager<Smt> smtPager);
/**
* 设置统计信息
*/
......@@ -83,8 +83,6 @@ public interface StatisticsContract {
public abstract void clickDate(Integer integer);
/**
* 跳转营销页
*/
......@@ -114,12 +112,12 @@ public interface StatisticsContract {
/**
* 获取已用优惠券列表
*/
public abstract void getTicketList(int pageNumber, UsedTicketListFragment msListFragment);
public abstract void getTicketList(int pageNumber, TicketListFragment msListFragment, int usedFlag);
/**
* 获取已用优惠券列表
*/
public abstract void getTicketList(int pageNumber, long startDate, long endDate);
public abstract void getTicketList(int pageNumber, long startDate, long endDate, int usedFlag);
/**
* 获取订单列表
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ 662b2f76
......@@ -92,8 +92,18 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
ViewTicketBinding viewTicketBinding = DataBindingUtil.bind(mViewBinding.viewTicket
.getRoot());
viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
viewTicketBinding.setUpdateDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
.getUpdateTime()));
viewTicketBinding.setCreateDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
.getCreateTime()));
switch (ticket.getUsedFlag()){
case 1:
viewTicketBinding.setIsUsed(false);
break;
case 2:
viewTicketBinding.setIsUsed(true);
break;
}
viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
viewTicketBinding.setVipName(ticket.getVipName());
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ 662b2f76
package com.xingdata.zzdpos.ui.statistics;
import android.content.Intent;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.TicketListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
import com.xingdata.zzdpos.util.StringUtil;
......@@ -74,8 +72,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
mView.isShowLoading(true);
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false))
ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize)
.subscribe(vipRechargeOrderPager -> {
msListFragment.setData(vipRechargeOrderPager);
}, throwable -> {
......@@ -88,7 +86,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
mView.isShowLoading(true);
ApiFactory.Smt.queryAll(1, 12).doFinally(() -> mView.isShowLoading(false))
.subscribe(smtPager -> {
mView.getSmtListSucc(smtPager);
mView.getSmtListSucc(smtPager);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
......@@ -111,9 +109,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
@Override
public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
mView.isShowLoading(true);
ApiFactory.Ticket.query(pageNumber, nowPageSize, 2).doFinally(() -> mView.isShowLoading(false))
public void getTicketList(int pageNumber, TicketListFragment msListFragment, int usedFlag) {
ApiFactory.Ticket.query(pageNumber, nowPageSize, usedFlag)
.subscribe(ticketPager -> {
msListFragment.setData(ticketPager);
}, throwable -> {
......@@ -122,9 +120,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
@Override
public void getTicketList(int pageNumber, long startDate, long endDate) {
public void getTicketList(int pageNumber, long startDate, long endDate, int usedFlag) {
mView.isShowLoading(true);
ApiFactory.Ticket.query(pageNumber, nowPageSize, 2, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
ApiFactory.Ticket.query(pageNumber, nowPageSize, usedFlag, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
.subscribe(ticketPager -> {
if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
ToastUtils.showShort("没有查询到相关优惠券");
......@@ -212,9 +210,11 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
getRechargeList(1, longStart, longEnd);
break;
case 1:
getTicketList(1, longStart, longEnd);
getTicketList(1, longStart, longEnd,TicketListFragment.NORMAL);
break;
case 2:
getTicketList(1, longStart, longEnd,TicketListFragment.USED);
break;
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ 662b2f76
......@@ -46,57 +46,6 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
mViewBinding.viewLine.setVisibility(View.GONE);
FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
// mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
// @Override
// public void onFocusChange(View view, boolean b) {
// if (b) {
// if (mViewBinding.viewStub.isInflated()) {
// mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
// } else {
// mViewBinding.viewStub.getViewStub().inflate();
// ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
// viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// switch (v.getId()) {
// case R.id.pay_cash:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
// break;
// case R.id.pay_alipay:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
// break;
// case R.id.pay_wechat:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
// break;
// case R.id.pay_bank:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
// break;
// case R.id.pay_vipcard:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
// break;
// case R.id.pay_tally:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
// break;
// }
//
//
// }
// });
// }
//
// } else {
// mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
// }
// }
// });
// mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
// if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
// mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
// hideSoftInput();
// }
//
// return false;
// });
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.tvTitle.setText("订单列表");
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/MsMainFragment.java
View file @ 662b2f76
......@@ -4,14 +4,12 @@ package com.xingdata.zzdpos.ui.statistics.fragment.ms;
import android.databinding.DataBindingUtil;
import android.graphics.Typeface;
import android.support.design.widget.TabLayout;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMsMainBinding;
import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
import com.xingdata.zzdpos.databinding.ItemStringBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
......@@ -26,12 +24,11 @@ import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBinding> {
private int[] titleInts = {R.string.statistics_menu_ms_recharge, R.string.statistics_menu_ms_usedTicket};
private int[] titleInts = {R.string.statistics_menu_ms_recharge, R.string.statistics_menu_ms_normalTicket,R.string.statistics_menu_ms_usedTicket};
private FragmentViewAdapter mFragmentStateAdapter;
private List<Long> dateLongs = new ArrayList<>();
private List<BaseFragment> fragments = new ArrayList<>();
......@@ -55,7 +52,8 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
public void initViewPager() {
if (fragments.size() == 0) {
fragments.add(new RechargeListFragment());
fragments.add(new UsedTicketListFragment());
fragments.add(TicketListFragment.getTicketListFragment(TicketListFragment.NORMAL));
fragments.add(TicketListFragment.getTicketListFragment(TicketListFragment.USED));
mFragmentStateAdapter = new FragmentViewAdapter(fragments, getChildFragmentManager());
......@@ -84,6 +82,7 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
Observable.create(new ObservableOnSubscribe<View>() {
@Override
public void subscribe(ObservableEmitter<View> e) throws Exception {
e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
e.onComplete();
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/UsedTicketListFragment.java → app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/TicketListFragment.java
View file @ 662b2f76
......@@ -32,11 +32,24 @@ import io.reactivex.functions.Action;
import io.reactivex.schedulers.Schedulers;
public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
public class TicketListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
public static final int NORMAL = 1;
public static final int USED = 2;
public static final int TIMEOUT = 3;
private StatisticsTicketGroupAdapter mStatisticsGroupAdapter;
private int pagerNum;
private String monthDate;
private int mode;
public static TicketListFragment getTicketListFragment(int i) {
TicketListFragment ticketListFragment = new TicketListFragment();
ticketListFragment.setMode(i);
return ticketListFragment;
}
public void setMode(int i) {
this.mode = i;
}
@Override
public int getLayoutId() {
......@@ -79,17 +92,17 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsGroupAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
mPresenter.getTicketList(pagerNum, this);
mPresenter.getTicketList(pagerNum, this, mode);
}
private void onRefresh() {
pagerNum = 1;
mPresenter.getTicketList(pagerNum, this);
mPresenter.getTicketList(pagerNum, this, mode);
}
private void onLoadMore() {
pagerNum++;
mPresenter.getTicketList(pagerNum, this);
mPresenter.getTicketList(pagerNum, this, mode);
}
......@@ -151,8 +164,13 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
@Override
public String getTabTitle() {
return "已用优惠券";
switch (mode) {
case 1:
return "已发优惠券";
case 2:
return "已用优惠券";
}
return "";
}
}
app/src/main/res/layout/activity_statistics_detail.xml
View file @ 662b2f76
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
>
<include
android:id="@+id/ic_title"
......@@ -15,6 +16,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
......@@ -27,25 +29,25 @@
android:id="@+id/view_order_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_order_detail" />
android:layout="@layout/view_order_detail"/>
<ViewStub
android:id="@+id/view_vip_recharge"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_vip_recharge" />
android:layout="@layout/view_vip_recharge"/>
<ViewStub
android:id="@+id/view_ticket"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_ticket" />
android:layout="@layout/view_ticket"/>
<ViewStub
android:id="@+id/view_cs"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_inventory_detail" />
android:layout="@layout/view_inventory_detail"/>
</FrameLayout>
<android.support.constraint.ConstraintLayout
......@@ -72,7 +74,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_return"
app:layout_constraintTop_toTopOf="parent"
tools:targetApi="lollipop" />
tools:targetApi="lollipop"/>
<Button
android:id="@+id/btn_return"
......@@ -88,13 +90,13 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginStart="@dimen/all_margin_big_big"
tools:targetApi="lollipop" />
tools:targetApi="lollipop"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_ticket.xml
View file @ 662b2f76
......@@ -7,9 +7,12 @@
<import type="android.view.View" />
<variable
name="date"
name="updateDate"
type="String" />
<variable
name="createDate"
type="String" />
<variable
name="orderNo"
......@@ -19,6 +22,10 @@
name="vipName"
type="String" />
<variable
name="isUsed"
type="Boolean" />
</data>
<FrameLayout
......@@ -118,6 +125,35 @@
android:singleLine="true"
android:text="@{vipName}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:weightSum="3">
<TextView
style="@style/dialog_textView_body_low"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:text="发券时间："
android:textSize="@dimen/all_text_size_low"
android:visibility="@{isUsed?View.GONE:View.VISIBLE}" />
<TextView
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{createDate}"
android:textColor="@color/black_likui"
android:visibility="@{isUsed?View.GONE:View.VISIBLE}" />
</LinearLayout>
<LinearLayout
......@@ -133,7 +169,8 @@
android:layout_weight="1"
android:singleLine="true"
android:text="使用时间："
android:textSize="@dimen/all_text_size_low" />
android:textSize="@dimen/all_text_size_low"
android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
<TextView
style="@style/dialog_textView_body_small"
......@@ -142,8 +179,9 @@
android:layout_weight="2"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui" />
android:text="@{updateDate}"
android:textColor="@color/black_likui"
android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
</LinearLayout>
<LinearLayout
......@@ -159,7 +197,8 @@
android:layout_weight="1"
android:singleLine="true"
android:text="销售单号："
android:textSize="@dimen/all_text_size_low" />
android:textSize="@dimen/all_text_size_low"
android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
<TextView
style="@style/dialog_textView_body_small"
......@@ -169,7 +208,8 @@
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui" />
android:textColor="@color/black_likui"
android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
</LinearLayout>
......
app/src/main/res/values/strings.xml
View file @ 662b2f76
......@@ -665,6 +665,7 @@
<string name="statistics_menu_ms">营销</string>
<string name="statistics_menu_ms_recharge">充值记录</string>
<string name="statistics_menu_ms_usedTicket">已用优惠券</string>
<string name="statistics_menu_ms_normalTicket">已发优惠券</string>
<string name="statistics_todayAmt_hint">今日销售额</string>
<string name="statistics_todayOrder_hint">今日订单数</string>
<string name="statistics_todayRecharge_hint">今日充值</string>
......
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