Skip to content

T
TangKuPos
Commit b9de7b1d authored by 姜敏's avatar 姜敏
Browse files
Options

更改线的粗细

parent 15acef1d
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 48 deletions
app/src/main/java/com/xingdata/zzdpos/model/Ticket.java
View file @ b9de7b1d
......@@ -77,6 +77,8 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
private Long ticketValAmt;
private Long truleStatus;
private String getOrderNo;
private String useOrderNo;
......@@ -237,4 +239,12 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
this.truleOrderAmt = truleOrderAmt;
}
public Long getTruleStatus() {
return truleStatus;
}
public void setTruleStatus(Long truleStatus) {
this.truleStatus = truleStatus;
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/vip/VipActivity.java
View file @ b9de7b1d
......@@ -83,7 +83,7 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override
public void getTruleSus(Pager<Trule> trulePager) {
mPresenter.vipMscardListFragment.getTruleSus(trulePager);
mPresenter.vipInfoFragment.getTruleSus(trulePager);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java
View file @ b9de7b1d
......@@ -6,6 +6,7 @@ import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemVipMscardItemBinding;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil;
......@@ -17,23 +18,23 @@ import java.util.List;
* Created by JM_DEV on 2017/12/25.
*/
public class VipTruleAdapter extends BaseAdapter<Trule, ItemVipMscardItemBinding> {
public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBinding> {
private Context mContext;
private String shopName;
public VipTruleAdapter(Context mContext, @Nullable List<Trule> data) {
public VipTruleAdapter(Context mContext, @Nullable List<Ticket> data) {
super(R.layout.item_vip_mscard_item, data);
this.mContext = mContext;
}
@Override
protected void convert(ItemVipMscardItemBinding mViewBinding, Trule item) {
mViewBinding.truleName.setText(ConvertUtil.fenToYuanNoZero(item.getTruleValAmt()));
mViewBinding.truleMoney.setText("满"+ConvertUtil.fenToYuanNoZero(item.getTruleValAmt())+"元使用");
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTruleExp()), "yyyy.MM.dd"), StringUtil.format(new Date(item.getTruleExp()), "yyyy.MM.dd")));
protected void convert(ItemVipMscardItemBinding mViewBinding, Ticket item) {
mViewBinding.truleName.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()));
mViewBinding.truleMoney.setText("满"+ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())+"元使用");
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd"), StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd")));
// mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
if (item.getTruleStatus().toString().equals("0")) {
if (item.getTruleStatus()!=null&&item.getUsedFlag()!=null&&item.getTruleStatus().toString().equals("0")&&item.getUsedFlag().toString().equals("1")) {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.return_ticket_one);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.return_ticket_two);
} else {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java
View file @ b9de7b1d
......@@ -5,6 +5,8 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseSheetDialog;
import com.xingdata.zzdpos.databinding.DialogVipMenuBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
......@@ -20,6 +22,7 @@ import java.util.List;
public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMenuBinding> {
private Vip mVip;
private List<Level> mLevel;
private List<Ticket> tickets;
@Override
public int getLayoutId() {
......@@ -43,6 +46,7 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
//優惠券詳情
case R.id.voucherDetails:
mPresenter.vipMscardListFragment.setVip(mVip);
mPresenter.vipMscardListFragment.setTickets(tickets);
((BaseActivity) getActivity()).start(mPresenter.vipMscardListFragment);
break;
//消費記錄
......@@ -70,4 +74,7 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
this.mLevel = mLevel;
}
public void setTickets(List<Ticket> tickets) {
this.tickets = tickets;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipInfoFragment.java
View file @ b9de7b1d
......@@ -5,7 +5,9 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipInfoBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
......@@ -21,6 +23,8 @@ import java.util.List;
public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoBinding> {
private Vip mVip;
private List<Trule>trules ;
private List<Ticket> tickets;
@Override
......@@ -38,6 +42,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
VipEditMenuDialog dialog = new VipEditMenuDialog();
dialog.setLevel(mPresenter.levels);
dialog.setVip(mVip);
dialog.setTickets(tickets);
dialog.show((BaseActivity) getActivity());
});
if (mVip != null) {
......@@ -59,8 +64,9 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
mViewBinding.vipMoble.setText(mVip.getVipMobile() + "");
mViewBinding.crtTime.setText(StringUtil.format(new Date(mVip.getCreateTime())));
mViewBinding.vipSex.setText(getVipSex(mVip.getVipSex()));
mViewBinding.vipDiscounts.setText(getString(R.string.vip_discount, ConvertUtil.discount(mVip.getVipDefDiscount() )+ ""));
mViewBinding.vipDiscounts.setText(mVip.getVipDefDiscount()==100?"无折扣":ConvertUtil.discount(mVip.getVipDefDiscount())+"折");
mPresenter.ticketQuery(mVip.getVipId());
// mPresenter.truleQuery(mVip.getVipId());
}
}
......@@ -95,14 +101,15 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
mViewBinding.vipMoble.setText(vip.getVipMobile() + "");
mViewBinding.vipSex.setText(getVipSex(vip.getVipSex()));
mViewBinding.vipDiscounts.setText(getString(R.string.vip_discount, vip.getVipDefDiscount() + ""));
mPresenter.ticketQuery(vip.getVipId());
// initView();
}
public void ticketQuerySus(List<Ticket> ticketPager) {
this.tickets=ticketPager;
mViewBinding.ticketCount.setText(String.valueOf(ticketPager.size()));
}
public void getTruleSus(Pager<Trule> trulePager) {
this.trules=trulePager.getList();
mViewBinding.ticketCount.setText(String.valueOf(trulePager.getList().size()+""));
}
}
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ b9de7b1d
......@@ -253,7 +253,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mPresenter.vipInfoFragment.setVip(vip);
start(mPresenter.vipInfoFragment);
} else {
mPresenter.vipInfoFragment.setVip(vip);
mPresenter.vipRechargeFragment.setVip(vip);
start(mPresenter.vipRechargeFragment);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipRechargeFragment.java
View file @ b9de7b1d
......@@ -115,11 +115,11 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
}
@Override
public boolean onBackPressedSupport() {
popTo(mPresenter.vipListFragment.getClass(), false);
return true;
}
// @Override
// public boolean onBackPressedSupport() {
// popTo(mPresenter.vipListFragment.getClass(), false);
// return true;
// }
public void setVip(Vip mVip) {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipTruleListFragment.java
View file @ b9de7b1d
......@@ -13,8 +13,8 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentVipMscardListBinding;
import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ticket;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
......@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.ui.vip.adapter.VipTruleAdapter;
import com.xingdata.zzdpos.ui.vip.dialog.VipEditMenuDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -31,7 +30,8 @@ import java.util.List;
@SuppressLint("ValidFragment")
public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVipMscardListBinding> {
private VipTruleAdapter adapter;
private List<Trule> trules = new ArrayList<>();
// private List<Trule> trules;
private List <Ticket> tickets;
private int valid = 0;
private int inValid = 0;
......@@ -46,7 +46,7 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
@Override
public void initView() {
mViewBinding.infoTitle.tvTitle.setText("优惠券详情");
adapter = new VipTruleAdapter(getActivity(), trules);
adapter = new VipTruleAdapter(getActivity(), tickets);
mViewBinding.rechargeRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.rechargeRecyclerView.setAdapter(adapter);
mViewBinding.rechargeRefresh.setOnRefreshListener(this::onRefresh);
......@@ -61,7 +61,12 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
pop();
});
onRefresh();
adapter.setEnableLoadMore(false);
adapter.loadMoreComplete();
mViewBinding.rechargeRefresh.setRefreshing(false);
mViewBinding.rechargeRefresh.setEnabled(false);
getMscardValid();
// onRefresh();
}
private void onLoadMore() {
......@@ -70,7 +75,7 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
}
private void onRefresh() {
mPresenter.truleQuery(mVip.getVipId());
// mPresenter.truleQuery(mVip.getVipId());
}
@Override
......@@ -85,38 +90,47 @@ public class VipTruleListFragment extends BaseFragment<VipPresenter, FragmentVip
}
public void getTruleSus(Pager<Trule> trulePager) {
if (trulePager.isFirstPage()) {
trules.clear();
}
if (trulePager.getList().size() != 0) {
trules.addAll(trulePager.getList());
adapter.notifyDataSetChanged();
// pageNumber = mscardPager.getPageNumber() + 1;
}
getMscardValid();
if (trulePager.getPageNumber()!=1&&trulePager.isLastPage()) {
ToastUtils.showShort("没有更多数据");
}
mViewBinding.mscardValid.setText(valid+ "");
mViewBinding.macardInvalid.setText(inValid+"");
adapter.setEnableLoadMore(false);
adapter.loadMoreComplete();
mViewBinding.rechargeRefresh.setRefreshing(false);
}
// public void getTruleSus(Pager<Trule> trulePager) {
//
// if (trulePager.isFirstPage()) {
// trules.clear();
// }
// if (trulePager.getList().size() != 0) {
// trules.addAll(trulePager.getList());
// adapter.notifyDataSetChanged();
//// pageNumber = mscardPager.getPageNumber() + 1;
// }
// getMscardValid();
// if (trulePager.getPageNumber()!=1&&trulePager.isLastPage()) {
// ToastUtils.showShort("没有更多数据");
// }
//
// adapter.setEnableLoadMore(false);
// adapter.loadMoreComplete();
// mViewBinding.rechargeRefresh.setRefreshing(false);
//
// }
private void getMscardValid() {
valid=0;
inValid=0;
for (Trule t : trules) {
if (t.getTruleStatus().toString().equals("0")) {
for (Ticket t : tickets) {
if (t.getUsedFlag().toString().equals("1")) {
valid = valid + 1;
} else {
inValid = inValid + 1;
}
}
mViewBinding.mscardValid.setText(valid+ "");
mViewBinding.macardInvalid.setText(inValid+"");
}
// public void setTrules(List<Trule> trules) {
// this.trules = trules;
// }
public void setTickets(List<Ticket> tickets) {
this.tickets = tickets;
}
}
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