退货判断

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -111,14 +111,20 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
     @Override
     public void getOrderDetailSuss(Saleorder mSaleorder) {
-
         mViewBinding.viewOrderDetail.getViewStub().inflate();
         ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
+        switch (mSaleorder.getOrderStatus()) {
+            case 9:
+                viewOrderDetailBinding.tvAmtHint.setText("退货金额");
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "退货" : mSaleorder.getSalepay().getPayName());
+                break;
+            default:
+                viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
+        }
         viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
         viewOrderDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(mSaleorder.getCreateTime()));
         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.setOperName(mSaleorder.getOperName());
         viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
@@ -153,12 +159,12 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
             mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
                 @Override
                 protected void myOnClickListener(View v) {
-                   new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消",null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
-                       @Override
-                       public void onClick(DialogInterface dialogInterface, int i) {
-                           mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
-                       }
-                   }).create().show();
+                    new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消", null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
+                        }
+                    }).create().show();
 
 
                 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsOrderAdapter.java

@@ -32,7 +32,12 @@ public class StatisticsOrderAdapter extends BaseAdapter<Saleorder, ItemStatistic
             }else {
                 mViewBinding.tvLeftTop.setText(item.getOrderNo());
             }
-              mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
+            if (item.getOrderPayAmt()>0){
+                mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
+            }else {
+                mViewBinding.tvRightTop.setText(item.getPayAmt());
+            }
+
               mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
               switch (item.getPayType()){
                   case C.PAY_CHANNEL.CASH:

app/src/main/res/layout/view_order_detail.xml

@@ -83,7 +83,7 @@
                     android:gravity="center"
                     android:paddingBottom="@dimen/all_padding"
                     android:paddingTop="@dimen/all_margin"
-                    android:text="实收金额"
+                    android:text="订单金额"
                     android:textColor="@color/black_baozheng"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"