Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 74be40ab 18cb65c7
Show whitespace changes
Inline Side-by-side
Showing with 378 additions and 279 deletions
app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java
View file @ d256b905
......@@ -13,15 +13,15 @@ import com.xingdata.zzdpos.util.ConvertUtil;
* 订单详情(购物车商品明细)
*/
public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
@JSONField(serialize = false)
public boolean isDiscount() {
return skuPrice.longValue() != skuPricePay.longValue();
}
@JSONField(serialize = false)
public double getDiscountRate() {
return skuPricePay / skuPrice * 100;
}
@JSONField(serialize = false)
public Long getPromotionDisRate() {
return skuPromotionPrice * 100 / skuPricePay;
}
......@@ -220,7 +220,7 @@ public class Saledetail implements BaseModel, BaseBean,BaseGoodPrint {
skuPricePay = skuOffFlag > 0 ? skuPrice * (vip.getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 : skuPrice;
detailAmt = skuPricePay * detailCnt;
}
@JSONField(serialize = false)
public Long getPromotionAmt() {
return detailAmt - (detailCnt * (skuOffFlag > 0 ? skuPromotionPrice * (vip
.getVipDefDiscount() > 0 ? vip.getVipDefDiscount() : 100) / 100 :
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java
View file @ d256b905
......@@ -57,12 +57,7 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
mStatisticsTitleFragment.searchSuc(saleorderPager, wd);
}
@Override
public void getOrderDetailSuss(Saleorder saleorder) {
Intent intent = new Intent(this, StatisticsDetailActivity.class);
intent.putExtra(Saleorder.class.getName(), JSON.toJSONString(saleorder));
ActivityUtils.startActivity(intent);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java
View file @ d256b905
......@@ -12,9 +12,9 @@ import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
*/
public interface StatisticsContract {
interface DetallView extends BaseView {
}
interface View extends BaseView {
/**
* 设置统计信息
......@@ -37,10 +37,10 @@ public interface StatisticsContract {
void searchSuc(Pager<Saleorder> saleorderPager, String wd);
void getOrderDetailSuss(Saleorder saleorder);
}
abstract class Presenter extends BasePresenter<View> {
/**
* 跳转营销页
*/
......@@ -51,10 +51,6 @@ public interface StatisticsContract {
*/
public abstract void clickOrderList();
/**
* 获取订单明细
*/
public abstract void getOrderDetail(Saleorder saleorder);
/**
* 获取订单列表
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ d256b905
......@@ -3,21 +3,23 @@ package com.xingdata.zzdpos.ui.statistics;
import android.databinding.DataBindingUtil;
import android.util.TimeUtils;
import android.view.LayoutInflater;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityStatisticsDetailBinding;
import com.xingdata.zzdpos.databinding.ItemSettleSaledetailBinding;
import com.xingdata.zzdpos.databinding.ViewOrderDetailBinding;
import com.xingdata.zzdpos.model.Saledetail;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.util.ConvertUtil;
import org.json.JSONObject;
public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter, ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
public class StatisticsDetailActivity extends BaseActivity<StatisticsPresenter, ActivityStatisticsDetailBinding> implements StatisticsContract.DetallView {
private Saleorder mSaleorder;
@Override
public int getLayoutId() {
......@@ -32,10 +34,24 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsPresenter,
private void initData() {
if (getIntent().getExtras() != null) {
String data = getIntent().getStringExtra(Saleorder.class.getName());
if (data != null) {
mSaleorder = new Gson().fromJson(data, Saleorder.class);
Long data = getIntent().getLongExtra(Saleorder.class.getName(), -1);
if (data > 0) {
mPresenter.getOrderDetail(String.valueOf(data));
mViewBinding.icTitle.tvTitle.setText(R.string.statistics_order_detail_hint);
}
}
}
@Override
public void onBackPressedSupport() {
super.onBackPressedSupport();
}
@Override
public void getOrderDetailSuss(Saleorder mSaleorder) {
mViewBinding.viewOrderDetail.getViewStub().inflate();
ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
......@@ -43,28 +59,38 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsPresenter,
viewOrderDetailBinding.setOrderNo(mSaleorder.getOrderNo());
viewOrderDetailBinding.setDisAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderReduAmt(), false));
viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(),false));
viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(), false));
viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt()+"");
if (mSaleorder.getCutAmt()==null||mSaleorder.getCutAmt()==0){
viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
if (mSaleorder.getCutAmt() == null || mSaleorder.getCutAmt() == 0) {
viewOrderDetailBinding.setCutAmtShow(false);
}else {
} else {
viewOrderDetailBinding.setCutAmtShow(true);
viewOrderDetailBinding.setCutAmt(ConvertUtil.fenToYuan(mSaleorder.getCutAmt(),false));
viewOrderDetailBinding.setCutAmt(ConvertUtil.fenToYuan(mSaleorder.getCutAmt(), false));
}
if (mSaleorder.getSaledetailList() != null) {
for (Saledetail saledetail : mSaleorder.getSaledetailList()) {
View view = LayoutInflater.from(this).inflate(R.layout.item_settle_saledetail, null);
ItemSettleSaledetailBinding itemSettleSaledetailBinding = DataBindingUtil.bind(view);
itemSettleSaledetailBinding.tvAmt.setText("￥" + saledetail.getSubtotal());
itemSettleSaledetailBinding.tvCount.setText(saledetail.getCnt());
itemSettleSaledetailBinding.tvPrice.setText("￥" + saledetail.getPrice());
itemSettleSaledetailBinding.tvName.setText(saledetail.getName());
// itemSettleSaledetailBinding.tvInitialPrice.setText(saledetail.getpr);
viewOrderDetailBinding.llGoodsList.addView(view);
}
}
}
viewOrderDetailBinding.tvGoodslistTitle.setOnClickListener(view -> {
viewOrderDetailBinding.tvGoodslistTitle.setCompoundDrawables(null, null, null, null);
viewOrderDetailBinding.tvGoodslistTitle.setClickable(false);
viewOrderDetailBinding.llGoodsList.setVisibility(View.VISIBLE);
});
@Override
public void onBackPressedSupport() {
super.onBackPressedSupport();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailContract.java 0 → 100644
View file @ d256b905
package com.xingdata.zzdpos.ui.statistics;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
/**
* Created by Administrator on 2017/12/23.
*/
public interface StatisticsDetailContract {
interface View extends BaseView {
void getOrderDetailSuss(Saleorder saleorder);
}
abstract class Presenter extends BasePresenter<View> {
/**
* 获取订单明细
*/
public abstract void getOrderDetail(String saleorderId);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailPresenter.java 0 → 100644
View file @ d256b905
package com.xingdata.zzdpos.ui.statistics;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
/**
* Created by Administrator on 2017/12/27.
*/
public class StatisticsDetailPresenter extends StatisticsDetailContract.Presenter {
@Override
public void onAttached() {
}
@Override
public void getOrderDetail(String mSaleorderId) {
ApiFactory.Test.getSaleOrderDetail(mSaleorderId).subscribe(saleorder -> {
mView.getOrderDetailSuss(saleorder);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ d256b905
......@@ -60,14 +60,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
@Override
public void getOrderDetail(Saleorder mSaleorder) {
ApiFactory.Test.getSaleOrderDetail(mSaleorder.getId() + "").subscribe(saleorder -> {
mView.getOrderDetailSuss(saleorder);
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderListFragment.java
View file @ d256b905
package com.xingdata.zzdpos.ui.statistics.fragment.order;
import android.content.Intent;
import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.ActivityUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -14,6 +17,7 @@ import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
......@@ -76,7 +80,9 @@ public class OrderListFragment extends BaseFragment<StatisticsPresenter, Fragmen
mStatisticsAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
mPresenter.getOrderDetail(mStatisticsAdapter.getData().get(position));
Intent intent = new Intent(getActivity(), StatisticsDetailActivity.class);
intent.putExtra(Saleorder.class.getName(), mStatisticsAdapter.getData().get(position).getId());
ActivityUtils.startActivity(intent);
}
});
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ d256b905
......@@ -15,10 +15,9 @@
app:layout_constraintTop_toTopOf="parent" />
<android.support.v7.widget.CardView
<FrameLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="@dimen/all_margin"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -29,7 +28,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/view_order_detail" />
</android.support.v7.widget.CardView>
</FrameLayout>
<LinearLayout
android:id="@+id/ll_bottom"
......
app/src/main/res/layout/view_order_detail.xml
View file @ d256b905
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
......@@ -42,10 +43,19 @@
type="Boolean" />
</data>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:padding="@dimen/dp_4">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -177,9 +187,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}"
android:text="@string/oder_detail_cutAmt"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/small_text_size"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
<LinearLayout
......@@ -266,9 +276,9 @@
android:gravity="right"
android:singleLine="true"
android:text="@{cutAmt}"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}"
android:textColor="@color/black_likui"
android:textSize="@dimen/small_text_size" />
android:textSize="@dimen/small_text_size"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
</LinearLayout>
......@@ -279,9 +289,11 @@
android:background="@color/gray_zhouyu" />
<TextView
android:id="@+id/tv_goodslist_title"
style="@style/textView_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@mipmap/but_unfurled"
android:text="商品详情" />
<View
......@@ -289,10 +301,23 @@
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu" />
<LinearLayout
android:padding="@dimen/dp_4"
android:id="@+id/ll_goods_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding"
android:orientation="vertical"
android:visibility="gone">
</LinearLayout>
</LinearLayout>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
</FrameLayout>
</layout>
\ No newline at end of file
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