风险管理10月28日提交代码-liu.bolan-天津麦顿/企业风管6期开发

RMA/app/src/main/AndroidManifest.xml

@@ -512,6 +512,8 @@
 
         <activity android:name=".view.base.home.commodity.modify.ChangeRateActivity"/>
 
+        <activity android:name=".view.base.spot.associated.relationalrecord.RemoveRelationalRecordActivity"/>
+
     </application>
 
 </manifest>

RMA/app/src/main/java/cn/muchinfo/rma/business/account/AccountManager.kt

@@ -421,6 +421,11 @@ class AccountManager {
         val params = mutableMapOf<String, String>().apply {
             put("loginID", GlobalDataCollection.instance?.loginRsp?.loginID.toString())
             put("clientType", "1")//终端类型，0：PC 1：Mobile
+            if (SPUtils.getInstance().getString(Constant.oem) == "qyfg"){
+//                put("name","ermcp")
+            }else{
+                put("name","trader")
+            }
         }
 
         MyOkHttpUtils().query(

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

@@ -10,6 +10,7 @@ import com.google.gson.annotations.SerializedName
 data class OutTradeLinkData(
     @SerializedName("buyorsell")
     val buyorsell : String? = "",//买卖方向 - 0:买 1:卖
+    var isOnClick : Int = 0,
     @SerializedName("channelbuildtype")
     val channelbuildtype : String? = "",//开平标志- 0:无 1:建仓 2:平仓
     @SerializedName("currencyname")
@@ -40,6 +41,7 @@ data class OutTradeLinkData(
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),
+        parcel.readInt(),
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
@@ -59,6 +61,7 @@ data class OutTradeLinkData(
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(buyorsell)
+        parcel.writeInt(isOnClick)
         parcel.writeString(channelbuildtype)
         parcel.writeString(currencyname)
         parcel.writeString(exexchangecode)

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

@@ -10,6 +10,7 @@ import com.google.gson.annotations.SerializedName
 data class PaTradeLinkDetailData(
     @SerializedName("accountid")
     val accountid : String? = "",//资金账号
+    var isOnClick : Int = 0,
     @SerializedName("agreeunit")
     val agreeunit : String? = "",//合约乘数
     @SerializedName("areauserid")
@@ -80,6 +81,7 @@ data class PaTradeLinkDetailData(
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),
+        parcel.readInt(),
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
@@ -119,6 +121,7 @@ data class PaTradeLinkDetailData(
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(accountid)
+        parcel.writeInt(isOnClick)
         parcel.writeString(agreeunit)
         parcel.writeString(areauserid)
         parcel.writeString(bizsubjectid)

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

@@ -13,6 +13,16 @@ data class SCMiddleGoodsData(
     val customername : String? = "",//对手手名称
     @SerializedName("customeruserid")
     val customeruserid : String? = "",//对手id
+    @SerializedName("deliverygoodscode")
+    val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
+    val deliverygoodsid : String? = "",//现货品种ID
+    @SerializedName("deliverygoodsname")
+    val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("enumdicname")
+    val enumdicname : String? = "",//现货单位名称
+    @SerializedName("relatedmiddlegoodsqty")
+    val relatedmiddlegoodsqty : String? = "",//已关联量(套保品种)(期货)
     @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保品种ID
     @SerializedName("middlegoodspricedqty3")
@@ -55,6 +65,11 @@ data class SCMiddleGoodsData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.readInt()
     ) {
     }
@@ -64,6 +79,11 @@ data class SCMiddleGoodsData(
         parcel.writeString(contracttype)
         parcel.writeString(customername)
         parcel.writeString(customeruserid)
+        parcel.writeString(deliverygoodscode)
+        parcel.writeString(deliverygoodsid)
+        parcel.writeString(deliverygoodsname)
+        parcel.writeString(enumdicname)
+        parcel.writeString(relatedmiddlegoodsqty)
         parcel.writeString(middlegoodsid)
         parcel.writeString(middlegoodspricedqty3)
         parcel.writeString(needhedgeratio)

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

@@ -35,7 +35,7 @@ data class SCMiddleGoodsReportData(
     val enddate : String? = "",//结束交易日
     @SerializedName("hedgeplanqty")
     val hedgeplanqty : String? = "",//套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
-    @SerializedName("mathname")
+    @SerializedName("matchname")
     val mathname : String? = "",//交易对手方
     @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保品种代码

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/utils/StringUtils.java

@@ -0,0 +1,13 @@
+package cn.muchinfo.rma.view.autoWidget.utils;
+
+public class StringUtils {
+    public static String deleteString0(String str, char delChar){
+        String delStr = "";
+        for (int i = 0; i < str.length(); i++) {
+            if(str.charAt(i) != delChar){
+                delStr += str.charAt(i);
+            }
+        }
+        return delStr;
+    }
+}

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

@@ -1333,9 +1333,10 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                             }
                         }.lparams(matchParent, autoSize(140))
 
-                        itemView()
+//                        itemView()
 
                         linearLayout {
+                            visibility = View.GONE
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
                                 val intent = Intent()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/adapter/ContractPositionContentAdapter.java

@@ -169,7 +169,7 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
             //持仓金额
             rightData.add(NumberUtils.roundNum(data.getCurholderamount(), 2));
             //市值
-            if (data.getTradeproperty().equals("1")) {
+            if (data.getTradeproperty().equals("2")) {
                 if (quoteDayData.getPrice() == 0.0) {
                     rightData.add("--");
                 } else {
@@ -219,7 +219,7 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
         }
         itemViewHolder.allView.setVisibility(View.GONE);
 
-        if (data.isClick() == 1) {
+        if (data.isOnClick() == 1) {
             itemViewHolder.roots_view.setBackgroundColor(context.getResources().getColor(R.color.rma_list_select_color));
             itemViewHolder.allView.setVisibility(View.VISIBLE);
         } else {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/ReportQueryViewModel.kt

@@ -324,13 +324,13 @@ class ReportQueryViewModel : BaseViewModel() {
             val newRightData = arrayListOf<String>()
             newRightData.add(it.wrstandardname + "\n" + it.middlegoodsname)//'现货品种/\n 套保品种 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.diffprice),2))//'期现价格差 '
-            newRightData.add(NumberUtils.doubleDistortion(it.diffqty))//'期现数量差 '
+            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.diffqty),2))//'期现数量差 '
             newRightData.add(
-                NumberUtils.doubleDistortion(it.todayavgprice) + "\n" + NumberUtils.doubleDistortion(
+                NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todayavgprice),2) + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(
                     it.todaypricedqty
-                )
+                ),2)
             )//'今日定价均价/\n 今日定价量'
-            newRightData.add(NumberUtils.doubleDistortion(it.todayavgprice2) + "\n" + NumberUtils.doubleDistortion(it.todayavgfutuprice))//'今日点价登记均价/\n 今日期货成交均价'
+            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todayavgprice2),2) + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todayavgfutuprice),2))//'今日点价登记均价/\n 今日期货成交均价'
             newRightData.add(
                 NumberUtils.roundNum(it.hedgeplanqty,2)  + "\n" + NumberUtils.roundNum(it.todayrelatedmiddlegoodsqty,2)
             )// '套保计划量/\n 今日期货关联成交量 '

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/rolemanagement/RoleSetViewModel.kt

@@ -67,7 +67,7 @@ class RoleSetViewModel : BaseViewModel() {
     fun resetAccMgrTaaccount(type : String,oldList : List<AccMgrTaaccountData>,data : AccMgrBizGroupSetData = AccMgrBizGroupSetData()){
         val newDataList = arrayListOf<AccMgrTaaccountSonData>()
         oldList.forEach {
-            newDataList.add(it.mainAcc ?: AccMgrTaaccountSonData())
+//            newDataList.add(it.mainAcc ?: AccMgrTaaccountSonData())
             it.subacclist?.forEach {
                 newDataList.add(it)
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/tjmd/TjmdHomeFragment.kt

@@ -286,9 +286,14 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
                                         val simpleDraweeView: SimpleDraweeView =
                                             itemView!!.findViewById(R.id.sdv_item_fresco_content)
                                         simpleDraweeView.setImageURI(
-                                            Uri.parse(
-                                                SPUtils.getInstance().getString(
-                                                    Constant.openApiUrl) + model?.imagepath?.substring(1)))
+                                            Uri.parse(if (SPUtils.getInstance().getString(Constant.uploadUrl).contains("upload")){
+                                                SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + model?.imagepath?.substring(1)
+                                            }else{
+                                                SPUtils.getInstance().getString(Constant.uploadUrl) + model?.imagepath?.substring(1)
+                                            }))
+//                                            Uri.parse(
+//                                                SPUtils.getInstance().getString(
+//                                                    Constant.uploadUrl) + model?.imagepath?.substring(1)))
                                     }
                                 })
 
@@ -307,7 +312,11 @@ class TjmdHomeFragment : BaseFragment<TjmdHomeViewModel>(){
                                 viewFlipper {
                                     noticeViewFlipper = this
                                     viewModel.noticeDataList.bindOptional(context){
-                                        initViewFlipper(it ?: arrayListOf())
+                                        if (it?.size ?: 0 > 0){
+                                            val newDataList = arrayListOf<NoticeData>()
+                                            newDataList.add(it?.get(0) ?: NoticeData())
+                                            initViewFlipper(newDataList)
+                                        }
                                     }
                                 }.lparams(matchParent, autoSize(72)){
                                     marginStart = autoSize(36)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/tjmd/TjmdHomeViewModel.kt

@@ -18,6 +18,7 @@ import cn.muchinfo.rma.view.base.app.Constant
 import cn.muchinfo.rma.view.base.home.yrdz.market.IndexData
 import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.SPUtils
+import com.blankj.utilcode.util.StringUtils
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.utils.TaskUiModel
@@ -238,7 +239,12 @@ class TjmdHomeViewModel : BaseViewModel(){
     fun getBannerUrlList(datalist : List<BannerData>){
         val bannerUrlList = arrayListOf<String>()
         datalist.forEach {
-            bannerUrlList.add(SPUtils.getInstance().getString(Constant.openApiUrl) + it.imagepath.substring(1))
+            if (SPUtils.getInstance().getString(Constant.uploadUrl).contains("upload")){
+
+                bannerUrlList.add(SPUtils.getInstance().getString(Constant.uploadUrl).replace("/upload","") + it.imagepath.substring(1))
+            }else{
+                bannerUrlList.add(SPUtils.getInstance().getString(Constant.uploadUrl) + it.imagepath.substring(1))
+            }
         }
         bannerList.postValue(datalist.remove {
             it.isshow == "0"

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/PeriodAssociatedFragment.kt

@@ -656,7 +656,7 @@ class RelationalRecordUI(
     }
 
     val root = _FrameLayout(activity).apply {
-        viewModel.queryRelationRecordTitle(tableKey = Constant.table_mobile_spotfuturerelate_order)
+        viewModel.queryRelationRecordTitle(tableKey = Constant.table_mobile_spotfuturerelate_logs)
         verticalLayout {
 
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/externalorder/OutAssociationContentAdapter.java

@@ -31,6 +31,7 @@ import cn.muchinfo.rma.global.data.ExposureReportData;
 import cn.muchinfo.rma.global.data.FinanceReportData;
 import cn.muchinfo.rma.global.data.FutureDataReportData;
 import cn.muchinfo.rma.global.data.OutTradeLinkData;
+import cn.muchinfo.rma.global.data.PaTradeLinkDetailData;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
 import cn.muchinfo.rma.view.base.app.Constant;
 import cn.muchinfo.rma.view.base.home.reportquery.reportdetail.ReportCommonDetailsActivity;
@@ -70,14 +71,24 @@ public class OutAssociationContentAdapter extends RecyclerView.Adapter<OutAssoci
         notifyDataSetChanged();
     }
 
-    private void setPosition(int position) {
-        if (this.position == position) {
-            this.position = -1;
-            notifyItemChanged(index);
-        } else {
-            this.position = position;
-            notifyItemChanged(position);
+    private void setOnItemClick(int position){
+        List<OutTradeLinkData> newDataList = new ArrayList<>();
+        for (int i = 0;i < datas.size();i++){
+            if (position == i){
+                OutTradeLinkData data1 = datas.get(i);
+                if (data1.isOnClick() == 0){
+                    data1.setOnClick(1);
+                }else {
+                    data1.setOnClick(0);
+                }
+                newDataList.add(data1);
+            }else {
+                OutTradeLinkData newData = datas.get(i);
+                newData.setOnClick(0);
+                newDataList.add(newData);
+            }
         }
+        setDatas(newDataList);
     }
 
     @NonNull
@@ -117,7 +128,7 @@ public class OutAssociationContentAdapter extends RecyclerView.Adapter<OutAssoci
         }
         itemViewHolder.allView.setVisibility(View.GONE);
 
-        if (i == this.position) {
+        if (data.isOnClick() == 1) {
             itemViewHolder.roots_view.setBackgroundColor(context.getResources().getColor(R.color.rma_list_select_color));
             itemViewHolder.allView.setVisibility(View.VISIBLE);
         } else {
@@ -127,7 +138,7 @@ public class OutAssociationContentAdapter extends RecyclerView.Adapter<OutAssoci
         itemViewHolder.all_click_View.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                setPosition(i);
+                setOnItemClick(i);
             }
         });
         if (data.getHasinnerorder().equals("0")){//无关联

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/perioddocuments/BusinessAssociationsActivity.kt

@@ -56,6 +56,13 @@ class BusinessAssociationsActivity : BaseActivity<BusinessAssociationsViewModel>
             )
         }
 
+    private fun initData(){
+        selectBusinessType.postValue(SelectData(
+            id = "4",
+            value = "套期保值"
+        ))
+    }
+
     @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,6 +70,7 @@ class BusinessAssociationsActivity : BaseActivity<BusinessAssociationsViewModel>
             viewModel.querySCMiddleGoods(data = data)
             createLoadingDialog(hintStr = "").bindTaskStatus(context, viewModel.loadingDialogStatus)
             background = resources.getDrawable(R.color.rma_hint_line_color_eee)
+            initData()
             topBar {
                 commonLeftButton()
                 commonTitle {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/perioddocuments/BusinessAssociationsViewHolder.kt

@@ -82,7 +82,7 @@ class BusinessAssociationsViewHolder(private val activity : AppCompatActivity, p
                     gravity = Gravity.BOTTOM
                     textView {
                         data.bindOptional(context){
-                            text = it?.wrstandardname
+                            text = it?.deliverygoodsname
                         }
                         textSizeAuto = 28
                         textColorInt = R.color.rma_black_33
@@ -108,7 +108,7 @@ class BusinessAssociationsViewHolder(private val activity : AppCompatActivity, p
 
                     textView {
                         data.bindOptional(context){
-                            text = NumberUtils.roundNum(it?.pricedqty,2)
+                            text = NumberUtils.roundNum(it?.relatedmiddlegoodsqty,2)
                         }
                         textSizeAuto = 34
                         textColorInt = R.color.rma_black_33
@@ -133,9 +133,13 @@ class BusinessAssociationsViewHolder(private val activity : AppCompatActivity, p
 //                            val goodsInfo = DataBase.getInstance().goodsInfoDao().getGoodsInfo(data1?.goodsid?.toInt() ?: 0)
 //                            val multiple = goodsInfo.agreeunit.times(deliveryRelationData?.mindeliveryqty?.toDouble() ?: 1.0).times(deliveryRelationData?.rratio2?.toDouble() ?: 1.0)
 //                            setChangeValue(multiple)
-                            text =  it?.middlegoodspricedqty3?.toDouble()?.minus(it.pricedqty?.toDouble() ?: 0.0).toString()
-                            spot_number.text = "现货数量" + NumberUtils.roundNum(it?.middlegoodspricedqty3?.toDouble()?.minus(it.pricedqty?.toDouble() ?: 0.0)?.toString()?.toDouble()?.times(agreeunit.toDouble()) ?: 0.0,2) + "吨"
+//                            text =  it?.middlegoodspricedqty3?.toDouble()?.minus(it.pricedqty?.toDouble() ?: 0.0).toString()
+//                            spot_number.text = "现货数量" + NumberUtils.roundNum(it?.middlegoodspricedqty3?.toDouble()?.minus(it.relatedmiddlegoodsqty?.toDouble() ?: 0.0)?.toString()?.toDouble()?.times(agreeunit.toDouble()) ?: 0.0,2) + "吨"
+                            text = "1"
+                            spot_number.text = "现货数量" + NumberUtils.roundNum("1"?.toDouble()?.times(agreeunit.toDouble()) ?: 0.0,2) + "吨"
                         }
+
+
                         setOnTextChangeListener { view, value ->
                             if (value.isNullOrEmpty().not()) {
                                 if (data.value?.isClick == 1){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/perioddocuments/FillSingleAssociationsViewHolder.kt

@@ -128,7 +128,7 @@ class FillSingleAssociationsViewHolder(private val activity : AppCompatActivity,
 //                            val goodsInfo = DataBase.getInstance().goodsInfoDao().getGoodsInfo(data1?.goodsid?.toInt() ?: 0)
 //                            val multiple = goodsInfo.agreeunit.times(deliveryRelationData?.mindeliveryqty?.toDouble() ?: 1.0).times(deliveryRelationData?.rratio2?.toDouble() ?: 1.0)
 //                            setChangeValue(multiple)
-                            text =  it?.middlegoodspricedqty3?.toLong()?.minus(it.pricedqty?.toLong() ?: 0).toString()
+                            text =  NumberUtils.roundNum(it?.middlegoodspricedqty3?.toDouble()?.minus(it.pricedqty?.toDouble() ?: 0.0).toString(),2)
                         }
                         setOnTextChangeListener { view, value ->
                             if (value.isNullOrEmpty().not()) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/spot/associated/relationalrecord/RelationalRecordContentAdapter.java

@@ -23,6 +23,7 @@ import java.util.List;
 import cn.muchinfo.rma.R;
 import cn.muchinfo.rma.global.GlobalDataCollection;
 import cn.muchinfo.rma.global.ViewEnumUtils;
+import cn.muchinfo.rma.global.data.ContractData;
 import cn.muchinfo.rma.global.data.PaTradeLinkData;
 import cn.muchinfo.rma.global.data.PaTradeLinkDetailData;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
@@ -60,14 +61,24 @@ public class RelationalRecordContentAdapter extends RecyclerView.Adapter<Relatio
         notifyDataSetChanged();
     }
 
-    private void setPosition(int position) {
-        if (this.position == position) {
-            this.position = -1;
-            notifyItemChanged(index);
-        } else {
-            this.position = position;
-            notifyItemChanged(position);
+    private void setOnItemClick(int position){
+        List<PaTradeLinkDetailData> newDataList = new ArrayList<>();
+        for (int i = 0;i < datas.size();i++){
+            if (position == i){
+                PaTradeLinkDetailData data1 = datas.get(i);
+                if (data1.isOnClick() == 0){
+                    data1.setOnClick(1);
+                }else {
+                    data1.setOnClick(0);
+                }
+                newDataList.add(data1);
+            }else {
+                PaTradeLinkDetailData newData = datas.get(i);
+                newData.setOnClick(0);
+                newDataList.add(newData);
+            }
         }
+        setDatas(newDataList);
     }
 
     @NonNull
@@ -103,7 +114,7 @@ public class RelationalRecordContentAdapter extends RecyclerView.Adapter<Relatio
         }
         itemViewHolder.allView.setVisibility(View.GONE);
 
-        if (i == this.position) {
+        if (data.isOnClick() == 1) {
             itemViewHolder.roots_view.setBackgroundColor(context.getResources().getColor(R.color.rma_list_select_color));
             itemViewHolder.allView.setVisibility(View.VISIBLE);
         } else {
@@ -113,7 +124,7 @@ public class RelationalRecordContentAdapter extends RecyclerView.Adapter<Relatio
         itemViewHolder.all_click_View.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                setPosition(i);
+                setOnItemClick(i);
             }
         });
         if (GlobalDataCollection.Companion.getInstance().getFourLevelMenu("client_spots", "client_spots_link", "client_spots_link_logs", "client_spots_link_logs_unlink")) {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessBuyHallViewHolder.kt

@@ -54,7 +54,12 @@ class SwapsBusinessBuyHallViewHolder(private val activity : AppCompatActivity, p
                     gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                     textView {
                         data.bindOptional(context){
-                            text = NumberUtils.roundNum(it?.orderprice,2)
+                            if (viewModel.quoteDayData.value?.getPrice() == 0.0){
+                                text = NumberUtils.roundNum(it?.orderprice?.toDouble()?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
+                            }else{
+                                text = NumberUtils.roundNum(viewModel.quoteDayData.value?.getPrice()?.plus(it?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
+                            }
+
                         }
                         viewModel.quoteDayData.bindOptional(context){
                             if (data.value?.goodsid.isNullOrEmpty().not()){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessHallActivity.kt

@@ -72,7 +72,7 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
 
     /** 用于订阅行情的唯一标识 */
     val thisTag by lazy {
-        "SwapsBusinessHallActivity"
+        "swapsbusinesshallactivity"
     }
 
     //买大厅
@@ -139,7 +139,7 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
         val goodsids = quoteMessageEvent.goodsid
         //如果推送的goodsid包含当前页面的goodsid，则进行页面刷新
         if (goodsids.contains(goodsId?.toInt())) {
-            LogUtils.eTag("BusinessHallActivity", "行情推送" + goodsId)
+            LogUtils.eTag("SwapsBusinessHallActivity", "行情推送" + goodsId)
             val quote =
                 GlobalDataCollection.instance?.goodsInfoAndQuotesList?.find { quoteGoodsListData.refgoodscode == it.outgoodscode }?.quoteDayData
             if (quote != null) {
@@ -176,7 +176,7 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
         super.onCreate(savedInstanceState)
         initMenuData()
         initializeData()
-
+        EventBus.getDefault().register(this)
         verticalLayout {
 
             createLoadingDialog(hintStr = "").bindTaskStatus(context, viewModel.loadingDialogStatus)
@@ -289,6 +289,7 @@ class SwapsBusinessHallActivity : BaseActivity<SwapsBusinessHallViewModel>() {
                         viewModel.quoteDayData.bindOptional(context){
                             if (it?.presettle == 0.0){
                                 text = "--"
+                                applies_text.text = "--"
                             }else{
                                 val gainsAmount = it?.getPrice()?.minus(it.presettle)
                                 text = NumberUtils.roundNum(gainsAmount.toString(),2)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/business/SwapsBusinessSellHallViewHolder.kt

@@ -58,7 +58,19 @@ class SwapsBusinessSellHallViewHolder(private val activity : AppCompatActivity,
                      gravity = Gravity.CENTER_VERTICAL or Gravity.LEFT
                      textView {
                          data.bindOptional(context){
-                             text = NumberUtils.roundNum(it?.orderprice,2)
+                             if (viewModel.quoteDayData.value?.getPrice() == 0.0){
+                                 text = NumberUtils.roundNum(it?.orderprice?.toDouble()?.plus(it.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
+                             }else{
+                                 text = NumberUtils.roundNum(viewModel.quoteDayData.value?.getPrice()?.plus(it?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
+                             }
+
+                         }
+                         viewModel.quoteDayData.bindOptional(context){
+                             if (data.value?.goodsid.isNullOrEmpty().not()){
+                                 if (data.value?.pricemode == "3"){
+                                     text = NumberUtils.roundNum(it?.getPrice()?.plus(data.value?.marketmaxsub?.toDouble() ?: 0.0) ?: 0.0,2)
+                                 }
+                             }
                          }
                          textSizeAuto = 34
                          textColorInt = R.color.rma_black_33

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/swaps/listed/SwapsListedActivity.kt

@@ -705,12 +705,19 @@ class SellListedUI(
                             }
                         }
 
+//                        var orderPrice = ""
+//                        if (priceType.value== 1){//固定价
+//                            orderPrice = onePriceInputEdittext.text.toString()
+//                        }else{//浮动价
+//                            orderPrice = viewModel.quoteDayData.value?.getPrice().toString()
+//                        }
+
                         viewModel.commit(
                             marketMaxSub = marketMaxSub,
                             pricetype = priceType.value ?: 1,
                             goodsInfo = viewModel.goodsInfo.value ?: GoodsInfo(),
                             isListed = true,
-                            orderPrice = onePriceInputEdittext.text.toString(),
+                            orderPrice =  onePriceInputEdittext.text.toString(),
                             qty = onePriceInputNumberEdittext.text.toString(),
                             type = "2",
                             accountId = selectAccountData.value?.accountid ?: 0
@@ -1240,6 +1247,12 @@ class BuyListedUI(
                             }
                         }
 
+//                        var orderPrice = ""
+//                        if (priceType.value== 1){//固定价
+//                            orderPrice = onePriceInputEdittext.text.toString()
+//                        }else{//浮动价
+//                            orderPrice = viewModel.quoteDayData.value?.getPrice().toString()
+//                        }
                         viewModel.commit(
                             marketMaxSub = marketMaxSub,
                             pricetype = priceType.value ?: 1,