1.利润接口

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -1999,5 +1999,13 @@ public interface ApiService {
     @POST("/stock-quantity/dept-product/startOrderProductsCountCheck")
     Observable<BaseBean> proNumCheck(@Body RequestBody requestBody);
 
+    /**
+     * year=2020&month=6&launchDeptId=436
+     * 利润分析
+     *
+     * @return
+     */
+    @GET("/receive-order/info")
+    Observable<BaseBean> receiveOrderInfo(@QueryMap Map<String,Object> param);
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java

@@ -228,7 +228,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
                 tvTime.setText(dataBean.getCreatedTime());
                 tvSendTime.setText(dataBean.getRequireTime());
                 tvOrderDesc.setText(dataBean.getAttrName());
-                tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
+                tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
                 tvSupplier.setText(dataBean.getSupplierName());
                 OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
                 tvClaim1.setText(expandInfo.getDemond4());

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialProfitActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -14,11 +13,13 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.ProfitBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
 import com.wd.workoffice.ui.adapter.WorkProfitAdapter;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.PickTimeUtils;
+import com.wd.workoffice.util.UserKeeper;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.text.SimpleDateFormat;
@@ -58,9 +59,8 @@ public class WorkFinancialProfitActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_sale)
     TextView tvSale;
     private Map<String, Object> param;
-    private List<ProPriceBean.RecordsBean> dataList;
+    private List<ProfitBean.PageBean.RecordsBean> dataList;
     private WorkProfitAdapter dataAdapter;
-    private int page = 1;
 
     @Override
     protected void initView() {
@@ -71,18 +71,18 @@ public class WorkFinancialProfitActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        tvDepName.setText(UserKeeper.getInstance().getUserDepName());
         dataList = new ArrayList<>();
         dataAdapter = new WorkProfitAdapter(R.layout.item_profit, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
-        param = WorkUtils.pageKey();
-        param.put("productId", getIntent().getStringExtra("id"));
-        param.put("current", page);
+        param = WorkUtils.simpleParam();
+        param.put("launchDeptId", UserKeeper.getInstance().getUserDepId());
 //        getData();
     }
 
     private void getData() {
-        RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().receiveOrderInfo(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -100,23 +100,16 @@ public class WorkFinancialProfitActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
-
-                if (page == 1) {
+                ProfitBean profitBean = JSON.parseObject(data.getData().toString(), ProfitBean.class);
+                List<ProfitBean.PageBean.RecordsBean> getList = profitBean.getPage().getRecords();
                 dataList.clear();
                 dataList.addAll(getList);
                 dataAdapter.notifyDataSetChanged();
                 dataAdapter.loadMoreComplete();
-                } else {
-                    dataAdapter.loadMoreComplete();
-                    dataList.addAll(getList);
-                    dataAdapter.notifyDataSetChanged();
-                }
-                if (getList.size() == 0) {
-                    dataAdapter.loadMoreEnd();
-                } else {
-                    page++;
-                }
+                tvCost.setText(MathUtils.converData(profitBean.getInnerPrice(),3));
+                tvSale.setText(MathUtils.converData(profitBean.getOuterPrice(),3));
+                tvMonthProfit.setText(MathUtils.converData(profitBean.getProfitPrice(),3));
+
             }
         });
     }
@@ -124,17 +117,10 @@ public class WorkFinancialProfitActivity extends WorkToolBarActivity {
 
     @Override
     protected void initEvent() {
-        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-                getData();
-            }
-        }, rvData);
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkFinancialProfitDetailActivity.class);
+                startActivity(WorkFinancialProfitDetailActivity.class,"info",JSON.toJSONString(dataList.get(position)));
             }
         });
     }
@@ -150,10 +136,16 @@ public class WorkFinancialProfitActivity extends WorkToolBarActivity {
         PickTimeUtils.showPickTwo(this, new OnTimeSelectListener() {
             @Override
             public void onTimeSelect(Date date, View v) {
-                tvTime.setText(TimeUtils.date2String(date,new SimpleDateFormat("yyyy-MM")));
+                String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM"));
+                tvTime.setText(time);
+                String[] timeArray = time.split("-");
+                param.put("year",timeArray[0]);
+                param.put("month",timeArray[1]);
+                getData();
             }
-        },true).show();
+        }, true).show();
     }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_rule, menu);

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialProfitDetailActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
+import android.text.TextUtils;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -8,10 +9,14 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.OrderDetail;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.ProfitBean;
+import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.ProfitProductAdapter;
+import com.wd.workoffice.util.MathUtils;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
@@ -23,6 +28,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -50,10 +56,10 @@ public class WorkFinancialProfitDetailActivity extends WorkToolBarActivity {
     LinearLayout llSale;
     @BindView(R.id.rv_data)
     RecyclerView rvData;
-    private Map<String, Object> param;
-    private List<ProPriceBean.RecordsBean> dataList;
+    private List<OrderDetail.OrderItemsBean> dataList;
     private ProfitProductAdapter dataAdapter;
-    private int page = 1;
+    private String orderType;
+    private ProfitBean.PageBean.RecordsBean info;
 
     @Override
     protected void initView() {
@@ -64,18 +70,34 @@ public class WorkFinancialProfitDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        info = JSON.parseObject(getIntent().getStringExtra("info"), ProfitBean.PageBean.RecordsBean.class);
+        orderType = info.getOrderType();
         dataList = new ArrayList<>();
         dataAdapter = new ProfitProductAdapter(R.layout.item_profit_product, dataList);
         dataAdapter.bindToRecyclerView(rvData);
         dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
-        param = WorkUtils.pageKey();
-        param.put("productId", getIntent().getStringExtra("id"));
-        param.put("current", page);
         getData();
     }
 
     private void getData() {
-        RtfUtils.getRtf().getProHistoryPrice(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            Observable<BaseBean> observable;
+            if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+                observable = RtfUtils.getRtf().saleOrderDetail(info.getOrderId(), "1");
+            } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+                observable = RtfUtils.getRtf().purchaseOrderDetail(info.getOrderId(), "1");
+            } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+                observable = RtfUtils.getRtf().supplierOrderDetail(info.getOrderId(), "1");
+            } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
+                observable = RtfUtils.getRtf().productOrderDetail(info.getOrderId(), "1");
+            } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
+                observable = RtfUtils.getRtf().insideOrderDetail(info.getOrderId(), "1");
+            } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
+                observable = RtfUtils.getRtf().crucibleSaleOrderDetail(info.getOrderId(), "1");
+            } else {
+                observable = RtfUtils.getRtf().saleOrderDetail(info.getOrderId(), "1");
+            }
+            observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+
                 @Override
                 public void doOnSubscribe(Disposable d) {
                 }
@@ -93,23 +115,18 @@ public class WorkFinancialProfitDetailActivity extends WorkToolBarActivity {
                         toast(data.getMessage());
                         return;
                     }
-                List<ProPriceBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ProPriceBean.class).getRecords();
-
-                if (page == 1) {
-                    dataList.clear();
-                    dataList.addAll(getList);
+                    OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                    tvName.setText(dataBean.getCustomerName());
+                    tvOrderPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
+                    tvPeople.setText(dataBean.getLaunchUserName());
+                    tvDep.setText(dataBean.getLaunchDeptName());
+                    tvOrderType.setText(WorkUtils.getOrderName(dataBean.getOrderType()));
+                    tvOrderNo.setText(dataBean.getId());
+                    tvTime.setText(dataBean.getCreatedTime());
+
+                    dataList.addAll(dataBean.getOrderItems());
                     dataAdapter.notifyDataSetChanged();
-                    dataAdapter.loadMoreComplete();
-                } else {
-                    dataAdapter.loadMoreComplete();
-                    dataList.addAll(getList);
-                    dataAdapter.notifyDataSetChanged();
-                }
-                if (getList.size() == 0) {
-                    dataAdapter.loadMoreEnd();
-                } else {
-                    page++;
-                }
+
                 }
             });
         }
@@ -117,13 +134,6 @@ public class WorkFinancialProfitDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initEvent() {
-        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-                getData();
-            }
-        }, rvData);
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/adapter/ProfitProductAdapter.java

@@ -27,7 +27,7 @@ public class ProfitProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItem
         helper.setText(R.id.tv_card, item.getProductSoleCode());
         helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
         helper.setText(R.id.tv_spec, item.getProductSpec());
-        helper.setText(R.id.tv_sale_price, "￥".concat(MathUtils.converData(item.getInnerPrice(),3)));
+        helper.setText(R.id.tv_sale_price, "￥".concat(MathUtils.converData(item.getOuterPrice(),3)));
         helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInnerPrice(),3)));
         helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(MathUtils.converData(item.getProductCount(),3),
                 MathUtils.converData(item.getInnerPrice(),3),3)));

app/src/main/java/com/wd/workoffice/ui/adapter/WorkProfitAdapter.java

@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
 import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.bean.ProfitBean;
 import com.wd.workoffice.util.MathUtils;
 
 import java.util.List;
@@ -13,7 +14,7 @@ import java.util.List;
  * Created by flexible on 2018/8/13.
  */
 
-public class WorkProfitAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean, BaseViewHolder> {
+public class WorkProfitAdapter extends BaseQuickAdapter<ProfitBean.PageBean.RecordsBean, BaseViewHolder> {
 
     public WorkProfitAdapter(int layoutResId, List data) {
         super(layoutResId, data);
@@ -21,11 +22,11 @@ public class WorkProfitAdapter extends BaseQuickAdapter<ProPriceBean.RecordsBean
 
 
     @Override
-    protected void convert(BaseViewHolder helper, ProPriceBean.RecordsBean item) {
-        helper.setText(R.id.tv_price, MathUtils.converData(item.getNewPrice(),3));
-        helper.setText(R.id.tv_time, item.getCreatedTime());
-        helper.setText(R.id.tv_person, "提交人:".concat(item.getCreatedByName()));
-        helper.setText(R.id.tv_remark, "备注:".concat(item.getRemark()));
+    protected void convert(BaseViewHolder helper, ProfitBean.PageBean.RecordsBean item) {
+        helper.setText(R.id.tv_no, item.getOrderId());
+        helper.setText(R.id.tv_time, item.getLaunchOrderDate());
+        helper.setText(R.id.tv_cost, MathUtils.converData(item.getInnerPrice(),3));
+        helper.setText(R.id.tv_sale, MathUtils.converData(item.getOuterPrice(),3));
     }
 }
 

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

@@ -31,7 +31,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="3mm"
-                    android:text="销售二公司" />
+                     />
 
             </LinearLayout>
 
@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10mm"
-            android:text="0.00"
+            android:text="0"
             android:textColor="@color/red"
             android:textSize="20mm"
             android:textStyle="bold" />
@@ -103,7 +103,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4mm"
-                    android:text="0.00"
+                    android:text="0"
                     android:textSize="15sp" />
             </LinearLayout>
 
@@ -130,7 +130,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4mm"
-                    android:text="0.00"
+                    android:text="0"
                     android:textSize="15sp" />
             </LinearLayout>
         </LinearLayout>

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

@@ -83,7 +83,6 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:text="王紫逸"
                             android:textColor="@color/flexible_text_gray"
                             android:textSize="13sp" />
                     </RelativeLayout>
@@ -109,7 +108,6 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:text="王紫逸"
                             android:textColor="@color/flexible_text_gray"
                             android:textSize="13sp" />
                     </RelativeLayout>
@@ -135,7 +133,6 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:text="王紫逸"
                             android:textColor="@color/flexible_text_gray"
                             android:textSize="13sp" />
                     </RelativeLayout>
@@ -161,7 +158,6 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:text="王紫逸"
                             android:textColor="@color/flexible_text_gray"
                             android:textSize="13sp" />
                     </RelativeLayout>
@@ -187,7 +183,6 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentRight="true"
                             android:layout_centerVertical="true"
-                            android:text="王紫逸"
                             android:textColor="@color/flexible_text_gray"
                             android:textSize="13sp" />
                     </RelativeLayout>