风险管理3月13日提交代码-liu.bolan-期货交易请求

RMA/app/src/main/java/cn/muchinfo/rma/global/data/ContractData.kt

@@ -102,7 +102,10 @@ data class ContractData(
     val brandname : String? = "",//品牌名称
     val modelname : String? = "",//型号名称
     val goodsname : String? = "",
-    val amount : String? = ""//金额
+    val amount : String? = "",//金额
+    val wrstandardcode : String? = "",
+    val wrstandardid : String? = "",
+    val wrstandardname : String? = ""
 ) : Parcelable {
     constructor(parcel: Parcel) : this(
         parcel.readString(),
@@ -157,6 +160,9 @@ data class ContractData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.readString()
     ) {
     }
@@ -215,6 +221,9 @@ data class ContractData(
         parcel.writeString(modelname)
         parcel.writeString(goodsname)
         parcel.writeString(amount)
+        parcel.writeString(wrstandardcode)
+        parcel.writeString(wrstandardid)
+        parcel.writeString(wrstandardname)
     }
 
     override fun describeContents(): Int {

RMA/app/src/main/java/cn/muchinfo/rma/view/MainViewModel.kt

@@ -122,6 +122,7 @@ class MainViewModel : BaseViewModel() {
         }
 
         MyApplication.getInstance()?.futureManager?.queryErmcpTradePosition(params = params) { isSuccess, respData, error ->
+            isInitiaDataSuccess.postValue(isSuccess)
             if (isSuccess) {
                 loadingDialogStatus.postValue(TaskUiModel.success(msg = "数据初始化成功"))
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -9,11 +9,11 @@ object Constant {
     /**
      * 获取基础url的接口
      */
-//    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
+    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
 //    const val baseurl = "http://192.168.30.125:8080/cfg?key=test_125"
 //    const val baseurl = "http://192.168.31.114:8080/cfg?key=test_114" // shenzhen01  123123
 //    const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
-      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
+//      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
 
     /**
      * 用sp存储基础url的key

RMA/app/src/main/java/cn/muchinfo/rma/view/base/exposure/ExposureFragment.kt

@@ -48,10 +48,10 @@ class ExposureFragment : BaseFragment<ExposureViewModel>() {
     /** 实时敞口 **/
     private val realTimeExposureUI by lazy { RealTimeExposureUI(this, viewModel) }
 
-    /** 现货数量 **/
+    /** 现货头寸 **/
     private val numberSpotUI by lazy { NumberSpotUI(this, viewModel) }
 
-    /** 期货数量 **/
+    /** 期货头寸 **/
     private val numberFutureUI by lazy { NumberFutureUI(this, viewModel) }
 
     /** 历史敞口 **/
@@ -139,6 +139,7 @@ class ExposureFragment : BaseFragment<ExposureViewModel>() {
                         override fun onTabUnselected(index: Int) {}
                         override fun onTabSelected(index: Int) {
                             selectedTabIndex = index
+                            reFreshByIndex(index = index)
                         }
                     })
                     setIndicator(QMUITabIndicator(QMUIDisplayHelper.dp2px(context, 2), false, true))
@@ -163,6 +164,27 @@ class ExposureFragment : BaseFragment<ExposureViewModel>() {
 
         }.view
     }
+
+    /**
+     * 页面tab切换时进行相应页面数据请求
+     * @param index Int
+     */
+    fun reFreshByIndex(index : Int){
+        when (index) {
+            0 -> {
+                realTimeExposureUI.reFresh()
+            }
+            1 -> {
+                numberSpotUI.reFresh()
+            }
+            2 -> {
+                numberFutureUI.reFresh()
+            }
+            3 -> {
+                historyExposureUI.reFresh()
+            }
+        }
+    }
 }
 
 /**
@@ -330,6 +352,13 @@ class NumberSpotUI(
         viewModule.queryExposureSpot()
     }
 
+    /**
+     * 用于外部调用主动刷新
+     */
+    fun reFresh(){
+        viewModule.queryExposureSpot()
+    }
+
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
             linearLayout {
@@ -412,6 +441,7 @@ class NumberSpotUI(
                     if (swipeToLayout.getIsRefreshing()){
                         swipeToLayout.finishRefresh()
                     }
+                    statusLayout.showSuccess()
                     numberSpotAdapter.setNewData(it)
                 }
             }
@@ -441,6 +471,13 @@ class NumberFutureUI(
         viewModule.queryExposureHedgePosition()
     }
 
+    /**
+     * 用于外部调用主动刷新
+     */
+    fun reFresh(){
+        viewModule.queryExposureHedgePosition()
+    }
+
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
             linearLayout {
@@ -522,6 +559,7 @@ class NumberFutureUI(
                     if (swipeToLayout.getIsRefreshing()){
                         swipeToLayout.finishRefresh()
                     }
+                    statusLayout.showSuccess()
                     numberFutureAdapter.setNewData(it)
                 }
             }
@@ -546,10 +584,20 @@ class HistoryExposureUI(
 
     private val numberFutureAdapter: BaseAdapter<ExposureHistoryData, HistoryExposureViewholder> = BaseAdapter { _, _ -> HistoryExposureViewholder(baseFragment, viewModule) }
 
+    /**
+     * 初始化请求
+     */
     init {
         viewModule.queryHisExposure()
     }
 
+    /**
+     * 用于外部调用主动刷新
+     */
+    fun reFresh(){
+        viewModule.queryHisExposure()
+    }
+
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
             statusLayout(contentBlock = {
@@ -580,6 +628,7 @@ class HistoryExposureUI(
                     if (swipeToLayout.getIsRefreshing()){
                         swipeToLayout.finishRefresh()
                     }
+                    statusLayout.showSuccess()
                     numberFutureAdapter.setNewData(it)
                 }
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/exposure/ExposureViewModel.kt

@@ -196,8 +196,8 @@ class ExposureViewModel : BaseViewModel(){
             val newRightData = arrayListOf<String>()
             newRightData.add(NumberUtils.roundNum(it.TotalSpotQty,2) + it.ENUMDICNAME + "\n" + it.MiddleGoodsHedgeRatio?.toPercentage())
             newRightData.add(NumberUtils.roundNum(it.TotalNeedHedgeQty,2) + it.ENUMDICNAME + "\n" + NumberUtils.roundNum(it.TotalFutureQty,2) + it.ENUMDICNAME)
-            newRightData.add(NumberUtils.roundNum(it.NeedHedgeExposoure,2) + "\n" + it.NeedHedgeRatio?.toPercentage())
-            newRightData.add(NumberUtils.roundNum(it.TotalExposure,2) + "\n" +it.TotalHedgeRatio?.toPercentage())
+            newRightData.add(NumberUtils.roundNum(it.NeedHedgeExposoure,2) + it.ENUMDICNAME + "\n" + it.NeedHedgeRatio?.toPercentage())
+            newRightData.add(NumberUtils.roundNum(it.TotalExposure,2) + it.ENUMDICNAME + "\n" +it.TotalHedgeRatio?.toPercentage())
             newRightData.add(NumberUtils.roundNum(it.OriTotalSpotQty,2) + it.ENUMDICNAME + "\n" + NumberUtils.roundNum(it.DiffSpotQty,2) + it.ENUMDICNAME)
             newRightData.add(NumberUtils.roundNum(it.OriTotalFutuQty,2) + it.ENUMDICNAME + "\n" + NumberUtils.roundNum(it.DiffFutuQty,2) + it.ENUMDICNAME)
             val newData = it.copy(rightData = newRightData)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/future/deals/DealViewModel.kt

@@ -17,6 +17,7 @@ import cn.muchinfo.rma.global.data.futureOrders.FutureHoldData
 import cn.muchinfo.rma.global.isBlankString
 import cn.muchinfo.rma.global.toShowTime
 import cn.muchinfo.rma.view.MyApplication
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.future.interfaces.OnItemClickListener
 import com.blankj.utilcode.util.ActivityUtils
@@ -86,7 +87,7 @@ class DealViewModel : BaseViewModel() {
             holder.idGoodsName?.text = list?.get(position)?.goodsname
             holder.idTransType?.text = list?.get(position)?.channelbuildtype.toString().channelbuildtype()
             holder.idDealNum?.text = list?.get(position)?.tradeqty.toString().isBlankString()
-            holder.idDealPrice?.text = list?.get(position)?.tradeprice.toString()
+            holder.idDealPrice?.text = NumberUtils.roundNum(list?.get(position)?.tradeprice.toString(),2)
             holder.idDealTime?.text = list?.get(position)?.tradetime?.toShowTime()
 
             // 下面三个按钮的点击事件

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/business/BusinessManagementViewModel.kt

@@ -118,11 +118,12 @@ class BusinessManagementViewModel : BaseViewModel() {
     /**
      * 结算审核请求详情
      */
-    fun queryBusinessDetails(relatedid : String){
+    fun queryBusinessDetails(relatedid : String,operateapplyid : String){
         loadingDataDialogStatus.value = TaskUiModel.inFlight()
         val params = mutableMapOf<String, String>().apply {
             put("UserId", GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("relatedid",relatedid)
+            put("operateapplyid",operateapplyid)
         }
         MyApplication.getInstance()?.businessManager?.queryBusinessJSDetail(params = params){ isSuccess, respData, err ->
             if (isSuccess){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/business/SettlementAuditActivity.kt

@@ -45,7 +45,7 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
-            viewModel.queryBusinessDetails(data.relatedid ?: "")
+            viewModel.queryBusinessDetails(data.relatedid ?: "",data.operateapplyid ?: "")
             dialog.bindTaskStatus(context, viewModel.loadingDialogStatus)
             val margingPadding = autoSize(47)
             background = resources.getDrawable(R.color.segtabment_bg_color)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/contract/AddContractActivity.kt

@@ -50,7 +50,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
     private val imageString: MutableLiveData<String> =
         MutableLiveData<String>().apply { value = "" }//文件地址
 
-    private val operationtype by lazy {
+    private val operationtype by lazy { // 1是新增 2是修改
         intent.getStringExtra("operationtype")
     }
 
@@ -175,7 +175,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                     deliverygoodsid = data.deliverygoodsid.toString()
                 )
             )
-            viewModel.queryWrStandardDetail(data.deliverygoodscode ?: "")
+            viewModel.queryWrStandardDetail(data.wrstandardid ?: "")
             selectProductType.postValue(
                 SelectData(
                     id = data.producttype.toString(),
@@ -198,7 +198,11 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    text = "新增合同"
+                    if (operationtype == "1"){
+                        text = "新增合同"
+                    }else{
+                        text = "修改"
+                    }
                 }
             }
 

RMA/app/src/main/res/layout/deal_item.xml

@@ -11,24 +11,24 @@
         app:layout_constraintStart_toStartOf="parent"
         android:id="@+id/id_goods_name"
         style="@style/ListTextStyle"
-        android:text="水族"
+        android:text="--"
         android:layout_height="wrap_content"/>
     <TextView
         android:layout_width="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/id_goods_name"
         app:layout_constraintStart_toStartOf="parent"
         android:id="@+id/id_trans_type"
-        android:text="买多"
+        android:text="--"
         style="@style/ListSummaryTextStyle"
         android:layout_height="wrap_content"/>
 
     <TextView
         android:layout_width="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/id_deal_time"
+        app:layout_constraintEnd_toEndOf="@+id/id_goods_name"
         android:id="@+id/id_deal_num"
-        android:text="成交数量"
+        android:text="--"
         android:gravity="end"
         style="@style/ListTextStyle"
         android:layout_height="wrap_content"/>
@@ -37,16 +37,26 @@
         app:layout_constraintTop_toBottomOf="@+id/id_deal_num"
         app:layout_constraintEnd_toEndOf="@+id/id_deal_num"
         android:id="@+id/id_deal_price"
-        android:text="1552"
+        android:text="--"
         style="@style/ListSummaryTextStyle"
         android:layout_height="wrap_content"/>
 
     <TextView
         android:layout_width="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toEndOf="@+id/id_deal_price"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/id_deal_name"
         android:id="@+id/id_deal_time"
-        android:text="11:09:30"
+        android:text="--"
+        style="@style/ListTextStyle"
+        android:layout_height="wrap_content"/>
+<!--委托人-->
+    <TextView
+        android:layout_width="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:id="@+id/id_deal_name"
+        android:text="--"
         style="@style/ListTextStyle"
         android:layout_height="wrap_content"/>