风险管理8月26日提交代码-liu.bolan-云融大宗

RMA/.idea/gradle.xml

@@ -19,5 +19,6 @@
         <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
+    <option name="offlineMode" value="true" />
   </component>
 </project>

RMA/app/src/main/AndroidManifest.xml

@@ -449,6 +449,8 @@
         <activity android:name=".view.base.warehousereceipt.tradecircle.TradeCircleDelistedActivity"/>
 
         <activity android:name=".view.base.warehousereceipt.tradecircle.TradeCircleListedingActivity"/>
+
+        <activity android:name=".view.base.hnstmain.spotwarehouse.bargain.BargainActivity"/>
     </application>
 
 </manifest>

RMA/app/src/main/java/cn/muchinfo/rma/business/customer/CustomerManage.kt

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.business.customer
 
 import cn.muchinfo.rma.business.contract.adapter.ContractAdapter
 import cn.muchinfo.rma.business.customer.adapter.CustomerAdapter
+import cn.muchinfo.rma.global.data.MarketRunData
 import cn.muchinfo.rma.global.data.ParentAreaListData
 import cn.muchinfo.rma.global.data.UserInfoData
 import cn.muchinfo.rma.netManage.base.ResponseCallback
@@ -23,6 +24,32 @@ import java.lang.Exception
  */
 class CustomerManage {
 
+
+    /**
+     * 查询市场运行信息
+     * @param params Map<String, String> 请求参数
+     * @param responseBack Function3<[@kotlin.ParameterName] Boolean, [@kotlin.ParameterName] List<UserInfoData>?, [@kotlin.ParameterName] Error?, Unit>
+     */
+    fun queryMarketRun(
+        params: Map<String, String>,
+        responseBack: (isSuccess: Boolean, respData: List<MarketRunData>?, error: Error?) -> Unit
+    ) {
+        MyOkHttpUtils().query(
+            URL = SPUtils.getInstance()
+                .getString(Constant.goCommonSearchUrl) + "/Market/QueryMarketRun",
+            params = params,
+            type = "1",
+            callback = object : ResponseCallback<BaseResult<List<MarketRunData>>>() {
+                override fun onResponse(response: BaseResult<List<MarketRunData>>?, id: Int) {
+                    responseBack(true, response?.data, null)
+                }
+
+                override fun onError(call: Call?, e: Exception?, id: Int) {
+                    responseBack(false, null, Error(e?.message))
+                }
+            })
+    }
+
     /**
      * 查询所属机构列表
      * @param params Map<String, String> 请求参数

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

@@ -0,0 +1,86 @@
+package cn.muchinfo.rma.global.data
+
+import android.os.Parcel
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+
+data class MarketRunData(
+    @SerializedName("afternexttradedate")
+    val afternexttradedate : String? = "",//下下交易日
+    @SerializedName("clearquoteflag")
+    val clearquoteflag : String? = "",//行情清盘标志- 1:未发送 2:已发送 3:已回复
+    @SerializedName("lastreckondate")
+    val lastreckondate : String? = "",//最新交易日(结算成功)
+    @SerializedName("machinedate")
+    val machinedate : String? = "",//机器时间
+    @SerializedName("manualflag")
+    val manualflag : String? = "",//手动开市标志- 0:否 1:是 (市场为手动时，是否触发了手动开市标志)
+    @SerializedName("marketid")
+    val marketid : String? = "",//市场ID
+    @SerializedName("nexttradedate")
+    val nexttradedate : String? = "",//下一交易日
+    @SerializedName("pretradedate")
+    val pretradedate : String? = "",//上一交易日
+    @SerializedName("reckonflag")
+    val reckonflag : String? = "",//结算标识 - 0: 停止结算 1: 正常(管理端控制此字段，交易服务根据此字段判断是否做结算)
+    @SerializedName("runstatus")
+    val runstatus  : String? = "",//运行状态 - 0:初始化 1:待开市 2:开市 3:休市 4:手工休市 5:闭市 6:确认行权开始 7:确认行权结束 10:日终处理开始 11:日终处理成功 12:日终处理失败 13基础服务结算开始 14基础服务结算成功 23.资金结算开始 24.资金结算成功 25.资金结算失败 26.系统结算成功 27.系统结算失败 28.盘中处理开始 29.盘中处理成功 30.盘中处理失败 31.资金结算开始(内) 32.资金结算成功(内) 33.资金结算失败(内) 40.签到开始 41.签到成功 42.签到部份成功 43.签到失败 44.签退开始 45.签退成功 46.签退部份成功 47.签退失败 48.对账开始 49.对账成功 50.对账失败 51.清算开始 52.清算成功 53.清算失败 54.清算部分成功 55. 系统结算开始 62.今日免清算
+    @SerializedName("sectionid")
+    val sectionid : String? = "",//时间段号[多时段时用]
+    @SerializedName("tradedate")
+    val tradedate : String? = "",//当前交易日(服务) 资金结算完成即变更，供交易服务使用
+    @SerializedName("tradedate2")
+    val tradedate2 : String? = "",//当前交易日(行情) 在第一个市场待开市时变更为TradeDate，供行情及终端系统使用
+    @SerializedName("updatetime")
+    val updatetime : String? = ""//更新时间
+) : Parcelable{
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString()
+    ) {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(afternexttradedate)
+        parcel.writeString(clearquoteflag)
+        parcel.writeString(lastreckondate)
+        parcel.writeString(machinedate)
+        parcel.writeString(manualflag)
+        parcel.writeString(marketid)
+        parcel.writeString(nexttradedate)
+        parcel.writeString(pretradedate)
+        parcel.writeString(reckonflag)
+        parcel.writeString(runstatus)
+        parcel.writeString(sectionid)
+        parcel.writeString(tradedate)
+        parcel.writeString(tradedate2)
+        parcel.writeString(updatetime)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<MarketRunData> {
+        override fun createFromParcel(parcel: Parcel): MarketRunData {
+            return MarketRunData(parcel)
+        }
+
+        override fun newArray(size: Int): Array<MarketRunData?> {
+            return arrayOfNulls(size)
+        }
+    }
+
+}

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

@@ -64,7 +64,7 @@ data class OrderQuoteData(
     @SerializedName("warehousename")
     val warehousename : String? = "",//仓库名称
     @SerializedName("wrfactortypeid")
-    val wrfactortypeid : String? = "",//仓单要素id
+    var wrfactortypeid : String? = "",//仓单要素id
     @SerializedName("wrfactortypename")
     val wrfactortypename : String? = "",//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
     @SerializedName("wrgoodsname")
@@ -76,6 +76,10 @@ data class OrderQuoteData(
     @SerializedName("wrstandardname")
     val wrstandardname : String? = ""//商品名称
 ) : Parcelable{
+
+
+
+
     constructor(parcel: Parcel) : this(
         parcel.readString(),
         parcel.readString(),

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

@@ -20,6 +20,8 @@ data class OrderQuoteMyqData(
     val deliverymonth : String? = "",//交收月
     @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("deliverygoodsname")
+    val deliverygoodsname : String? = "",//品种名称
     @SerializedName("fixedprice")
     val fixedprice : String? = "",//买(卖)价
     @SerializedName("wrfactortypeid")
@@ -89,6 +91,7 @@ data class OrderQuoteMyqData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
         parcel.createStringArrayList()
     ) {
     }
@@ -100,6 +103,7 @@ data class OrderQuoteMyqData(
         parcel.writeString(delistminqty)
         parcel.writeString(deliverymonth)
         parcel.writeString(enumdicname)
+        parcel.writeString(deliverygoodsname)
         parcel.writeString(fixedprice)
         parcel.writeString(wrfactortypeid)
         parcel.writeString(wrstandardid)

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

@@ -32,6 +32,8 @@ data class WrDeliveryDetailData(
     val matchusername:  String? = "",//对手方名称(仓单持有人)
     @SerializedName("averageprice")
     val averageprice : String? = "",
+    @SerializedName("deliveryid")
+    val deliveryid : String?= "",//交割单号
     @SerializedName("p1goodsremainamount")
     val p1goodsremainamount : String? = "",//点价货款 ps:当PPRICEMODE=2时, 界面需显示"-"
     @SerializedName("pdeliverycloseqty")
@@ -40,6 +42,8 @@ data class WrDeliveryDetailData(
     val pdeliveryprice: String? = "",//点价价格 ps:当PPRICEMODE=2时, 界面需显示"-"
     @SerializedName("pgoodscode")
     val pgoodscode : String? = "",//商品代码
+    @SerializedName("enumdicname")
+    val enumdicname :String? = "",//
     @SerializedName("pgoodsid")
     val pgoodsid : String? = "",//p点选合约id
     @SerializedName("pgoodsname")
@@ -101,6 +105,8 @@ data class WrDeliveryDetailData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.createStringArrayList()
     ) {
     }
@@ -118,10 +124,12 @@ data class WrDeliveryDetailData(
         parcel.writeString(matchaccountid)
         parcel.writeString(matchusername)
         parcel.writeString(averageprice)
+        parcel.writeString(deliveryid)
         parcel.writeString(p1goodsremainamount)
         parcel.writeString(pdeliverycloseqty)
         parcel.writeString(pdeliveryprice)
         parcel.writeString(pgoodscode)
+        parcel.writeString(enumdicname)
         parcel.writeString(pgoodsid)
         parcel.writeString(pgoodsname)
         parcel.writeString(ppricemode)
@@ -153,4 +161,5 @@ data class WrDeliveryDetailData(
         }
     }
 
+
 }

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

@@ -40,7 +40,7 @@ class SplashActivity : AppCompatActivity() {
 
             imageView {
                 scaleType = ImageView.ScaleType.CENTER_CROP
-                if (BuildConfig.APPLICATION_ID == "cn.muchinfo.rma" || BuildConfig.APPLICATION_ID == "cn.muchinfo.tjmd"){//企业风管
+                if (BuildConfig.APPLICATION_ID == "cn.muchinfo.rma"){//企业风管
                     imageResource = R.mipmap.rma_img_start
                 }else if (BuildConfig.APPLICATION_ID == "cn.muchinfo.qhj"){//千海金
                     imageResource = R.mipmap.qhj_img_start

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

@@ -10,15 +10,13 @@ object Constant {
 //    const val baseurl = "http://103.40.249.123:28280/cfg?key=mtp_20"//云融大宗
 //    const val baseurl = "http://103.40.249.123:8280/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" // 企业风管 123123
-//    const val baseurl = "http://192.168.30.125:8080/cfg?key=test_125"//李倩千海金 18611112222
-    const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩千海金 18611112222
-//    const val baseurl = "http://192.168.31.101:8080/cfg?key=test_101"//李倩千海金 18611112222
 
-//    const val baseurl = "http://192.168.31.107:8080/cfg?key=test_107"//李倩千海金 18611112222
-//    const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐 130000000001 123456
-//    const val baseurl = "http://192.168.31.107:8080/cfg?key=test_107"// 瑶姐 千海金 13760119855
+
+
+//    const val baseurl = "http://192.168.31.93:8080/cfg?key=test_93"//李倩企业风管 18611112222
+//    const val baseurl = "http://192.168.31.182:8080/cfg?key=test_182"//李倩云融 18611112222
+//
+//    const val baseurl = "http://192.168.31.135:8080/cfg?key=test_135"// 瑶姐 云融 130000000001 123456
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"
@@ -28,8 +26,8 @@ object Constant {
 //    const val baseurl = "http://192.168.31.171:8080/cfg?key=test_171" // 邓工 签约解约环境
 //    const val baseurl = "http://192.168.21.71:8280/cfg?key=mtp_20"
 
-//    const val baseurl = "http://192.168.31.118:8080/cfg?key=test_118"//黄老板 华南顺通 调试
-//    const val baseurl = "http://192.168.31.136:8080/cfg?key=test_136"//黄老板 华南顺通
+//    const val baseurl = "http://192.168.31.181:8080/cfg?key=test_181"//黄老板 华南顺通 调试 110010000001/123123  120010000001/123123
+    const val baseurl = "http://192.168.31.136:8080/cfg?key=test_136"//黄老板 华南顺通
 
 
     /**

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

@@ -24,6 +24,8 @@ import cn.muchinfo.rma.view.base.warehousereceipt.dialog.ListedData
 import cn.muchinfo.rma.view.base.warehousereceipt.floata.FloatPriceAdapter
 import cn.muchinfo.rma.view.base.warehousereceipt.one.OnePriceAdapter
 import cn.muchinfo.rma.view.base.warehousereceipt.tradecircle.TradeCircleListedingActivity
+import cn.muchinfo.rma.view.eventbus.EventConstent
+import cn.muchinfo.rma.view.eventbus.MessageEvent
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ConvertUtils
 import com.blankj.utilcode.util.SizeUtils
@@ -34,6 +36,9 @@ import io.reactivex.Flowable
 import io.reactivex.disposables.Disposable
 import mtp.polymer.com.autowidget.dialog.createLoadingDialog
 import mtp.polymer.com.autowidget.utils.bindTaskStatus
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.UI
 import org.jetbrains.anko.support.v4.viewPager
@@ -104,6 +109,27 @@ class HnstcdysFragment : BaseFragment<HnstcdysViewModel>(){
 
     }
 
+    //通用的消息更新通知
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMessageEvent(messageEvent: MessageEvent) {
+        if (messageEvent.messageType == EventConstent.refresh_circle_list) {//接到通知更新贸易圈列表
+             viewModel.queryOrderSellQuoteMyq()
+             viewModel.queryOrderBuyQuoteMyq()
+        }
+    }
+
+
+    //注册eventbus
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        EventBus.getDefault().register(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        EventBus.getDefault().unregister(this)
+    }
+
 
     override fun onCreateView(
         inflater: LayoutInflater,

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

@@ -278,12 +278,15 @@ class BookingBargainUI(private val activity : AppCompatActivity,private val view
 
             statusLayout(contentBlock = {
                 statusLayout = this
+                setRetryAction {
+                    viewModel.querySpecifyBargainPosition()
+                }
                 swipeToLoadLayout {
                     swipeToLayout = this
                     setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
-                        viewModel.queryAreCancelWrPosition()
+                        viewModel.querySpecifyBargainPosition()
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)

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

@@ -180,6 +180,7 @@ class BookingWarehouseViewModel : BaseViewModel(){
     fun querySpecifyBargainPosition(){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("haswr","0")
         }
         MyApplication.getInstance()?.warehouseManager?.queryWrTradeBargainApply(params = params){isSuccess, respData, error ->
             if (isSuccess){

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

@@ -67,7 +67,7 @@ class DeliveryDetailsActivity : BaseActivity<ContractOrdersViewModel>(){
                     contractItem(itemTile = "点价货款",itemContent = data.p1goodsremainamount ?: "-")
                     itemView()
 
-                    contractItem(itemTile = "点选数量",itemContent = data.deliveryqty ?: "-")
+                    contractItem(itemTile = "点选数量",itemContent = data.deliveryqty + data.enumdicname)
                     itemView()
 
                     contractItem(itemTile = "升贴水",itemContent = data.deliverypricemove ?: "-")
@@ -79,7 +79,7 @@ class DeliveryDetailsActivity : BaseActivity<ContractOrdersViewModel>(){
                     contractItem(itemTile = "交收均价",itemContent = NumberUtils.roundNum(data.deliverytotalamount?.toDouble()?.div(data.deliveryqty?.toDouble() ?: 1.0) ?: 0.0,2) ?: "-")
                     itemView()
 
-                    contractItem(itemTile = "交收单号",itemContent = data.deliveryorderid?.isBlankString() ?: "-")
+                    contractItem(itemTile = "交收单号",itemContent = data.deliveryid?.isBlankString() ?: "-")
                     itemView()
 
                     contractItem(itemTile = "类型",itemContent = if (data.buyorsell == "0"){"买入"}else{"卖出"} )

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

@@ -126,7 +126,7 @@ class PerformanceInformationViewModel : BaseViewModel(){
             //仓库
             newRightData.add(it.warehousename?.isBlankString() ?: "-")
             //类型
-            newRightData.add(it.performancetype?.performancetype() ?: "-")
+            newRightData.add(if (it.haswr == "0"){"仓单预售"}else{"仓单贸易"} )
             //交收月
             newRightData.add(it.activatemonth?.isBlankString() ?: "-") // 接口缺少
             //付款方式
@@ -204,7 +204,7 @@ class PerformanceInformationViewModel : BaseViewModel(){
             //仓库
             newRightData.add(it.warehousename?.isBlankString() ?: "-")
             //类型
-            newRightData.add(it.performancetype?.performancetype() ?: "-")
+            newRightData.add(if (it.haswr == "0"){"仓单预售"}else{"仓单贸易"} )
             //交收月
             newRightData.add(it.activatemonth?.isBlankString() ?: "-") // 接口缺少
             //付款方式

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

@@ -37,6 +37,11 @@ class PerformanceTemplateActivity : BaseActivity<PerformanceTemplateViewModel>()
         }
 
 
+    override fun onResume() {
+        super.onResume()
+        viewModel.queryPermancePlanTmp()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {

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

@@ -905,12 +905,15 @@ class BargainUI(private val activity : AppCompatActivity,private val viewModel:
 
             statusLayout(contentBlock = {
                 statusLayout = this
+                setRetryAction {
+                    viewModel.querySpecifyBargainPosition()
+                }
                 swipeToLoadLayout {
                     swipeToLayout = this
                     setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
-                        viewModel.queryAreCancelWrPosition()
+                        viewModel.querySpecifyBargainPosition()
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)
@@ -935,8 +938,6 @@ class BargainUI(private val activity : AppCompatActivity,private val viewModel:
                             }
                         })
                     }
-
-
                 }
             }, emptyBlock = {
                 emptyView(hint = resources.getString(R.string.now_no_data))

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

@@ -224,6 +224,7 @@ class SpotWareHouseViewModel : BaseViewModel(){
     fun querySpecifyBargainPosition(){
         val params = mutableMapOf<String,String>().apply {
             put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("haswr","1")
         }
         MyApplication.getInstance()?.warehouseManager?.queryWrTradeBargainApply(params = params){isSuccess, respData, error ->
             if (isSuccess){

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/adapter/TradeBarginContentAdapter.java

@@ -120,12 +120,19 @@ public class TradeBarginContentAdapter extends RecyclerView.Adapter<TradeBarginC
             }
         });
 
-        itemViewHolder.invoice_register.setVisibility(View.VISIBLE);
+
+        if (data.getApplystatus().equals("1")){
+            itemViewHolder.invoice_register.setVisibility(View.VISIBLE);
+        }else {
+            itemViewHolder.invoice_register.setVisibility(View.GONE);
+        }
         itemViewHolder.bargain.setVisibility(View.VISIBLE);
 
         itemViewHolder.bargain.setOnClickListener(view -> {
             Intent intent = new Intent();
             intent.putExtra("data",data);
+            intent.putExtra("haswr","1");
+            intent.putExtra("type","1");
             intent.setClass(context, BargainActivity.class);
             ActivityUtils.startActivity(intent);
         });

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/bargain/BargainActivity.kt

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.WrOrderDetailData
+import cn.muchinfo.rma.global.data.WrTradeBargainApplyData
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.base.BaseActivity
@@ -29,9 +30,10 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
     lateinit var horScrollview: CustomHorizontalScrollView
     lateinit var recyclerView: RecyclerView
 
-
     //传入的挂单数据
-    val data by lazy { intent.getParcelableExtra<WrOrderDetailData>("data") as WrOrderDetailData }
+    val data by lazy { intent.getParcelableExtra<WrTradeBargainApplyData>("data") as WrTradeBargainApplyData }
+
+    val haswr by lazy { intent.getStringExtra("haswr") }
 
     //1是别人对我议价单  2是我对别人的议价单
     val type by lazy { intent.getStringExtra("type") }
@@ -54,6 +56,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
+            background = resources.getDrawable(R.color.white)
             createLoadingDialog(hintStr = "").bindTaskStatus(context, viewModel.loadingDialogStatus)
             viewModel.showCancelBargainDialog.bindOptional(context){
                 if (it == true){
@@ -67,7 +70,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         addAction("确定") { dialog, _ ->
                             val data1 = viewModel.selectCancelBargainData.value
                             viewModel.wrBargainBackReq(WrBargainID = data1?.wrbargainid?.toLong() ?: 0){
-                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "")
+                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
                             }
                             viewModel.showCancelBargainDialog.postValue(false)
                             dialog.dismiss()
@@ -88,7 +91,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         addAction("确定") { dialog, _ ->
                             val data1 = viewModel.selectCancelBargainData.value
                             viewModel.wrBargainNoAgreeReq(WrBargainID = data1?.wrbargainid?.toLong() ?: 0,Status = 1){
-                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "")
+                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
                             }
                             viewModel.showSureBargainDialog.postValue(false)
                             dialog.dismiss()
@@ -109,7 +112,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         addAction("确定") { dialog, _ ->
                             val data1 = viewModel.selectCancelBargainData.value
                             viewModel.wrBargainNoAgreeReq(WrBargainID = data1?.wrbargainid?.toLong() ?: 0,Status = 2){
-                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "")
+                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
                             }
                             viewModel.showRefusedBargainDialog.postValue(false)
                             dialog.dismiss()
@@ -126,15 +129,16 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
 
             verticalLayout {
                 if (type == "1"){
-                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_me,data.wrtradeorderid ?: "",type ?: "")
+                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_me,data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
                 }else{
-                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_he,data.wrtradeorderid ?: "",type ?: "")
+                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_he,data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
                 }
 
 //            viewModel.queryTitle(tableKey = Constant.table_mobile_report_expose, cycletime = tradedate.replace("-", ""),cycletype = "",userid = selectTransactionUser.value?.id ?: "",querytype = "1")
                 bargainContentAdapter.setOnContentScrollListener(this@BargainActivity)
                 linearLayout {
                     linearLayout {
+                        background = resources.getDrawable(R.color.white)
                         gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
                         textView {//待点价头部左侧数据
                             viewModel.wrTradeBargainApplyTitleList.bindOptional(context) {
@@ -187,10 +191,10 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                     statusLayout = this
                     swipeToLoadLayout {
                         swipeToLayout = this
-                        setEnableRefresh(false)
+                        setEnableRefresh(true)
                         setEnableLoadMore(true)
                         setOnRefreshListener {
-
+                            viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
                         }
                         setEnableScrollContentWhenLoaded(false)
                         setEnableLoadMoreWhenContentNotFull(false)
@@ -214,7 +218,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                                     }
                                 }
                             })
-                        }
+                        }.lparams(matchParent, matchParent)
 
 
                     }
@@ -234,7 +238,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         bargainContentAdapter.setDatas(it)
                     }
                 }
-            }
+            }.lparams(matchParent, matchParent)
 
         }
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/bargain/BargainContentAdapter.java

@@ -125,8 +125,13 @@ public class BargainContentAdapter extends RecyclerView.Adapter<BargainContentAd
         });
 
         if (type.equals("1")){//别人对我的议价单 可确认可拒绝
-            itemViewHolder.refused.setVisibility(View.VISIBLE);
-            itemViewHolder.confirm.setVisibility(View.VISIBLE);
+            if (data.getApplystatus().equals("1")){
+                itemViewHolder.refused.setVisibility(View.VISIBLE);
+                itemViewHolder.confirm.setVisibility(View.VISIBLE);
+            }else {
+                itemViewHolder.refused.setVisibility(View.GONE);
+                itemViewHolder.confirm.setVisibility(View.GONE);
+            }
         }else {//我对别人的议价单
             itemViewHolder.midpoints_registration.setVisibility(View.GONE);
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/bargain/BargainViewModel.kt

@@ -118,7 +118,7 @@ class BargainViewModel : BaseViewModel(){
     /**
      * 查询现货仓单-指定成交头部数据
      */
-    fun specifyDealTitle(tableKey: String,wrtradeorderid : String,type : String){
+    fun specifyDealTitle(tableKey: String,wrtradeorderid : String,type : String,haswr : String){
         val params = mutableMapOf<String, String>().apply {
             put("tableKey", tableKey)
             put("tableType", "3")
@@ -130,15 +130,16 @@ class BargainViewModel : BaseViewModel(){
                     t1.orderindex?.toInt()?.minus(t2.orderindex?.toInt() ?: 0) ?: 0
                 })
                 wrTradeBargainApplyTitleList.postValue(newlist)
-                queryWrTradeBargainApply(wrtradeorderid, type)
+                queryWrTradeBargainApply(wrtradeorderid, type,haswr)
             }
         }
     }
 
 
-    fun queryWrTradeBargainApply(wrtradeorderid : String,type : String){
+    fun queryWrTradeBargainApply(wrtradeorderid : String,type : String,haswr : String){
         val params = mutableMapOf<String,String>().apply {
             put("wrtradeorderid",wrtradeorderid)
+            put("haswr",haswr)
         }
         MyApplication.getInstance()?.warehouseManager?.queryWrTradeBargainApply(params = params){isSuccess, respData, error ->
             if (isSuccess){
@@ -162,7 +163,7 @@ class BargainViewModel : BaseViewModel(){
             //时间
             newRightData.add(it.applytime?.isBlankString() ?: "-")
             //状态
-            newRightData.add(it.applytime?.bargainapplystatus() ?: "-")
+            newRightData.add(it.applystatus?.bargainapplystatus() ?: "-")
             val newData = it.copy(rightData = newRightData)
             newList.add(newData)
         }

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

@@ -119,7 +119,7 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
             }.lparams(matchParent, autoSize(507))
 
             imageView {
-                if (BuildConfig.APPLICATION_ID == "cn.muchinfo.rma" || BuildConfig.APPLICATION_ID == "cn.muchinfo.tjmd"){//企业风管
+                if (BuildConfig.APPLICATION_ID == "cn.muchinfo.rma"){//企业风管
                     imageResource = R.mipmap.rma_login_logo
                 }else if (BuildConfig.APPLICATION_ID == "cn.muchinfo.qhj"){//千海金
                     imageResource = R.mipmap.qhj_login_logo

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

@@ -287,6 +287,7 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
                     onThrottleFirstClick {
                         val intent = Intent()
                         intent.putExtra("data", orderQuoteData)
+                        intent.putExtra("isCircle","0")
                         intent.putExtra("type", type)
                         intent.putExtra("goodsId", orderQuoteData.goodsid)
                         intent.setClass(context, BusinessHallDetailsActivity::class.java)

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

@@ -18,6 +18,12 @@ class BusinessHallDetailsActivity : BaseActivity<BusinessHallViewModel>() {
 
     val data by lazy { intent.getParcelableExtra<OrderQuoteData>("data") as OrderQuoteData }
 
+    //用于贸易圈详情的履约模版id
+    val tmplateid by lazy { intent.getStringExtra("tmplateid") }
+
+    //是否是贸易圈 1 是贸易圈
+    val isCircle by lazy { intent.getStringExtra("isCircle") }
+
     //1 仓单贸易 2 仓单预售 3 合约交易
     val type by lazy { intent.getStringExtra("type") }
 
@@ -26,10 +32,14 @@ class BusinessHallDetailsActivity : BaseActivity<BusinessHallViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
-            if (type == "3"){
-                viewModel.queryWrBsGoodsInfo(goodsid = goodsId ?: "")
+            if (isCircle == "1"){
+                viewModel.queryWrGoodsInfo(data,type ?: "",tmplateid ?: "")
             }else{
-                viewModel.queryWrGoodsInfo(data,type ?: "")
+                if (type == "3"){
+                    viewModel.queryWrBsGoodsInfo(goodsid = goodsId ?: "")
+                }else{
+                    viewModel.queryWrGoodsInfo(data,type ?: "")
+                }
             }
 
             background = resources.getDrawable(R.color.white)

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

@@ -210,8 +210,9 @@ class BusinessHallViewModel : BaseViewModel(){
         }
     }
 
+
     //查询仓单买大厅数据详情
-    fun queryWrGoodsInfo(data: OrderQuoteData,type: String){
+    fun queryWrGoodsInfo(data: OrderQuoteData,type: String,tmplateid : String = ""){
         val params = mutableMapOf<String,String>().apply {
             if (type == "1"){
                 put("haswr","1")
@@ -219,6 +220,9 @@ class BusinessHallViewModel : BaseViewModel(){
                 put("haswr","0")
             }
             put("wrfactortypeid",data.wrfactortypeid ?: "")
+            if (tmplateid.isNullOrEmpty().not()){
+                put("tmplateid",tmplateid)
+            }
         }
         MyApplication.getInstance()?.warehouseManager?.queryWrGoodsInfo(params = params){isSuccess, respData, error ->
             if (isSuccess){

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

@@ -23,6 +23,8 @@ import cn.muchinfo.rma.view.base.warehousereceipt.dialog.WarehouseOneListedDialo
 import cn.muchinfo.rma.view.base.warehousereceipt.floata.FloatPriceAdapter
 import cn.muchinfo.rma.view.base.warehousereceipt.one.OnePriceAdapter
 import cn.muchinfo.rma.view.base.warehousereceipt.tradecircle.TradeCircleListedingActivity
+import cn.muchinfo.rma.view.eventbus.EventConstent
+import cn.muchinfo.rma.view.eventbus.MessageEvent
 import cn.muchinfo.rma.view.eventbus.QuoteMessageEvent
 import com.blankj.utilcode.util.ActivityUtils
 import com.blankj.utilcode.util.ConvertUtils
@@ -134,7 +136,15 @@ class WarehouseReceiptFragment : BaseFragment<WarehouseReceiptViewModel>(){
                 }
             }
         }
+    }
 
+    //通用的消息更新通知
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onMessageEvent(messageEvent: MessageEvent) {
+        if (messageEvent.messageType == EventConstent.refresh_circle_list) {//接到通知更新贸易圈列表
+            viewModel.queryOrderSellQuoteMyq()
+            viewModel.queryOrderBuyQuoteMyq()
+        }
     }
 
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/circle/TradeCircleContentAdapter.java

@@ -22,12 +22,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.muchinfo.rma.R;
+import cn.muchinfo.rma.global.data.OrderQuoteData;
 import cn.muchinfo.rma.global.data.OrderQuoteMyqData;
 import cn.muchinfo.rma.global.data.WrTradeBargainApplyData;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
 import cn.muchinfo.rma.view.base.hnstmain.spotwarehouse.SpotWareHouseViewModel;
 import cn.muchinfo.rma.view.base.hnstmain.spotwarehouse.bargain.BargainActivity;
 import cn.muchinfo.rma.view.base.procurement.RightScrollAdapter;
+import cn.muchinfo.rma.view.base.warehousereceipt.BusinessHallDetailsActivity;
 import cn.muchinfo.rma.view.base.warehousereceipt.tradecircle.TradeCircleDelistedActivity;
 
 /**
@@ -87,7 +89,7 @@ public class TradeCircleContentAdapter extends RecyclerView.Adapter<TradeCircleC
     public void onBindViewHolder(@NonNull final ItemViewHolder itemViewHolder, int i) {
         this.index = i;
         OrderQuoteMyqData data = datas.get(i);
-        itemViewHolder.tvLeftTitle.setText(data.getWrtypename());
+        itemViewHolder.tvLeftTitle.setText(data.getDeliverygoodsname());
         itemViewHolder.tv_left_bottom_title.setText(data.getWrtypename());
 //        itemViewHolder.tv_left_bottom_title.setText(datas.get(i).getMiddlegoodscode());
         //右边滑动部分
@@ -132,7 +134,15 @@ public class TradeCircleContentAdapter extends RecyclerView.Adapter<TradeCircleC
 
         //详情
         itemViewHolder.details.setOnClickListener(view -> {
-
+            OrderQuoteData data1 = new OrderQuoteData();
+            data1.setWrfactortypeid(data.getWrfactortypeid());
+            Intent intent = new Intent();
+            intent.putExtra("data",data1);
+            intent.putExtra("type","3");
+            intent.putExtra("isCircle","1");
+            intent.putExtra("goodsId","1");
+            intent.setClass(context, BusinessHallDetailsActivity.class);
+            ActivityUtils.startActivity(intent);
         });
         itemViewHolder.horItemScrollview.setEventListener(new CustomHorizontalScrollView.EventListener() {
             @Override

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/floata/FloatPriceAdapter.java

@@ -194,6 +194,7 @@ public class FloatPriceAdapter extends RecyclerView.Adapter<FloatPriceAdapter.It
                 Intent intent = new Intent();
                 intent.putExtra("data",data);
                 intent.putExtra("type",type);
+                intent.putExtra("isCircle","0");
                 intent.putExtra("pricetype","2");
                 intent.setClass(context, BusinessHallActivity.class);
                 ActivityUtils.startActivity(intent);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/one/OnePriceAdapter.java

@@ -199,6 +199,7 @@ public class OnePriceAdapter extends RecyclerView.Adapter<OnePriceAdapter.ItemVi
         itemViewHolder.platnum_buy.setOnClickListener(view -> {
             Intent intent = new Intent();
             intent.putExtra("data",data);
+            intent.putExtra("isCircle","0");
             intent.putExtra("type",type);
             intent.putExtra("pricetype","1");
             intent.setClass(context, BusinessHallActivity.class);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleDelistedActivity.kt

@@ -343,6 +343,7 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
                             numberEditText {
                                 text = "0"
                                 onePriceInputEdittext = this
+                                decimal = 2
                                 setText(data.fixedprice)
                                 setOnTextChangeListener { view, value ->
                                     if (value.isNullOrEmpty().not()) {
@@ -444,9 +445,9 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
 
                         linearLayout {
                             if (data.canpart == "1") {//允许部分摘
-                                visibility = View.VISIBLE
-                            } else {
                                 visibility = View.GONE
+                            } else {
+                                visibility = View.VISIBLE
                             }
                             gravity = Gravity.CENTER_VERTICAL
                             linearLayout {
@@ -470,9 +471,9 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
 
                         linearLayout {
                             if (data.canpart == "1") {//允许部分摘
-                                visibility = View.GONE
-                            } else {
                                 visibility = View.VISIBLE
+                            } else {
+                                visibility = View.GONE
                             }
                             verticalLayout {
                                 textView {
@@ -653,34 +654,41 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
                                         ToastUtils.showLong("请选择现货仓单明细")
                                         return@onThrottleFirstClick
                                     }
-                                } else {
-                                    visibility = View.GONE
                                 }
-                            } else {
-                                visibility = View.GONE
                             }
 
-
-
                             if (data.canbargain == "1") {//可议价
-                                viewModel.WrBargainApplyReq(
-                                    WRTradeOrderID = data.wrtradeorderid?.toLong() ?: 0,
-                                    UserID = GlobalDataCollection.instance?.loginRsp?.userID.toString(),
-                                    AccountID = GlobalDataCollection.instance?.accountId.toString(),
-                                    BuyOrSell = data.buyorsell ?: "",
-                                    ApplyQty = priceAndNumberData.value?.number?.toLong() ?: 0,
-                                    ApplyPrice = priceAndNumberData.value?.price.toString()
-                                ) {
-                                    finish()
+                                if (data.buyorsell == "0") {
+                                    viewModel.WrBargainApplyReq(
+                                        WRTradeOrderID = data.wrtradeorderid?.toLong() ?: 0,
+                                        UserID = GlobalDataCollection.instance?.loginRsp?.userID.toString(),
+                                        AccountID = GlobalDataCollection.instance?.accountId.toString(),
+                                        BuyOrSell = "1",
+                                        ApplyQty = priceAndNumberData.value?.number?.toLong() ?: 0,
+                                        ApplyPrice = priceAndNumberData.value?.price.toString()
+                                    ) {
+                                        finish()
+                                    }
+                                } else {
+                                    viewModel.WrBargainApplyReq(
+                                        WRTradeOrderID = data.wrtradeorderid?.toLong() ?: 0,
+                                        UserID = GlobalDataCollection.instance?.loginRsp?.userID.toString(),
+                                        AccountID = GlobalDataCollection.instance?.accountId.toString(),
+                                        BuyOrSell = "0",
+                                        ApplyQty = priceAndNumberData.value?.number?.toLong() ?: 0,
+                                        ApplyPrice = priceAndNumberData.value?.price.toString()
+                                    ) {
+                                        finish()
+                                    }
                                 }
                             } else {//不可议价
                                 var number: Long = 0
-                                    if (data.canpart == "1") {//是否允许部份摘牌 - 0:不允许 1:允许
-                                        number = data.orderqty?.toLong() ?: 0
-                                    } else {
-                                        number = onePriceInputNumberEdittext.text.toString()
-                                            .toLong()
-                                    }
+                                if (data.canpart == "1") {//是否允许部份摘牌 - 0:不允许 1:允许
+                                    number = data.orderqty?.toLong() ?: 0
+                                } else {
+                                    number = onePriceInputNumberEdittext.text.toString()
+                                        .toLong()
+                                }
                                 if (modelType == "1") {//贸易仓单的摘牌
 
                                     if (data.buyorsell == "0") {//买单所以是摘卖

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedBuyUI.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Build
 import android.view.Gravity
+import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.CheckBox
 import android.widget.EditText
@@ -82,19 +83,22 @@ class TradeCircleListedBuyUI(
     lateinit var listednumberEdittext: MangeNumberEditText2
 
     //挂牌最大数量
-    val maxlistedNumber : MutableLiveData<Int> = MutableLiveData()
+    val maxlistedNumber: MutableLiveData<Int> = MutableLiveData()
 
     //起摘数量输入框
     lateinit var startInputNumber: EditText
 
     //履约保证金
-    lateinit var performance_bond : EditText
+    lateinit var performance_bond: EditText
+
     //挂牌有效期
     lateinit var validity_of_listing: TextView
+
     //选择的履约模版数据
-    val selectPerformanceStepData : MutableLiveData<PermancePlanTmpData> = MutableLiveData()
+    val selectPerformanceStepData: MutableLiveData<PermancePlanTmpData> = MutableLiveData()
+
     //选择的朋友列表
-    val selectFriendList : MutableLiveData<List<WrUserFriendData>> = MutableLiveData()
+    val selectFriendList: MutableLiveData<List<WrUserFriendData>> = MutableLiveData()
 
     /**
      * 是否可议价的选择
@@ -105,6 +109,8 @@ class TradeCircleListedBuyUI(
      * 是否整单
      */
     lateinit var whole_list: CheckBox
+    val whole_list_live_data: MutableLiveData<Boolean> =
+        MutableLiveData<Boolean>().apply { value = false }
 
     /**
      * 朋友是否不限
@@ -295,7 +301,9 @@ class TradeCircleListedBuyUI(
                                 buttonDrawable = null
                                 background =
                                     resources.getDrawable(R.drawable.yrdz_check_select_backgrond)
-
+                                setOnCheckedChangeListener { compoundButton, b ->
+                                    whole_list_live_data.postValue(b)
+                                }
                             }.lparams(autoSize(41), autoSize(41)) {
                                 marginStart = autoSize(36)
                                 marginEnd = autoSize(36)
@@ -377,6 +385,13 @@ class TradeCircleListedBuyUI(
             itemView()
 
             linearLayout {
+                whole_list_live_data.bindOptional(context) {
+                    if (it == true) {
+                        visibility = View.GONE
+                    } else {
+                        visibility = View.VISIBLE
+                    }
+                }
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
                     textView {
@@ -414,7 +429,8 @@ class TradeCircleListedBuyUI(
                         if (hasType == "1") {
                             text = "最小单位" + data.minivalue + data.enumdicname
                         } else {
-                            text = "最小单位" + listedData.WrFtWrstandard?.minivalue + listedData.WrFtWrstandard?.enumdicname
+                            text =
+                                "最小单位" + listedData.WrFtWrstandard?.minivalue + listedData.WrFtWrstandard?.enumdicname
                         }
 
                         textSizeAuto = 29
@@ -507,7 +523,7 @@ class TradeCircleListedBuyUI(
                 onThrottleFirstClick {
                     val intent = Intent()
                     intent.setClass(context, SelectPerformanceTemplateActivity::class.java)
-                    activity.startActivityForResult(intent,1003)
+                    activity.startActivityForResult(intent, 1003)
                 }
 
                 textView {
@@ -545,11 +561,11 @@ class TradeCircleListedBuyUI(
                 background = resources.getDrawable(R.color.white)
                 gravity = Gravity.CENTER_VERTICAL
                 onThrottleFirstClick {
-                    if (no_friend.isChecked.not()){
+                    if (no_friend.isChecked.not()) {
                         val intent = Intent()
                         intent.setClass(context, SelectFriendActivty::class.java)
-                        activity.startActivityForResult(intent,1001)
-                    }else{
+                        activity.startActivityForResult(intent, 1001)
+                    } else {
                         ToastUtils.showLong("勾选不限后不能选择朋友")
                     }
 
@@ -590,7 +606,7 @@ class TradeCircleListedBuyUI(
                         buttonDrawable = null
                         background = resources.getDrawable(R.drawable.yrdz_check_select_backgrond)
 
-                    }.lparams(autoSize(41), autoSize(41)){
+                    }.lparams(autoSize(41), autoSize(41)) {
                         marginStart = autoSize(36)
                         marginEnd = autoSize(36)
                     }
@@ -599,7 +615,7 @@ class TradeCircleListedBuyUI(
                         text = "不限"
                         textSizeAuto = 34
                         textColorInt = R.color.rma_zhushi_text_color
-                    }.lparams(wrapContent, wrapContent){
+                    }.lparams(wrapContent, wrapContent) {
                         marginEnd = autoSize(36)
                     }
                 }.lparams(wrapContent, autoSize(132))
@@ -640,7 +656,7 @@ class TradeCircleListedBuyUI(
         }
     }
 
-    fun getSelectFriendList() : List<String>{
+    fun getSelectFriendList(): List<String> {
         val returnList = arrayListOf<String>()
         selectFriendList.value?.forEach {
             returnList.add(it.frienduserid?.toString() ?: "")
@@ -651,7 +667,7 @@ class TradeCircleListedBuyUI(
     /**
      * 提交资料前的校验
      */
-    fun check() : Boolean{
+    fun check(): Boolean {
         if (onePriceInputEdittext.text.toString().isNullOrEmpty()) {
             ToastUtils.showLong("请输入挂牌价格")
             return false
@@ -674,19 +690,23 @@ class TradeCircleListedBuyUI(
             return false
         }
 
-        if (hasType == "1"){
-            if (startInputNumber.text.toString().toLong() < data.minivalue?.toLong() ?: 0) {
-                ToastUtils.showLong("起摘数量不能小于" + data.minivalue)
-                return false
-            }
-        }else{
-            if (startInputNumber.text.toString().toLong() < listedData.WrFtWrstandard?.minivalue?.toLong() ?: 0) {
-                ToastUtils.showLong("起摘数量不能小于" + listedData.WrFtWrstandard?.minivalue)
-                return false
+        if (whole_list.isChecked.not()) {
+            if (hasType == "1") {
+                if (startInputNumber.text.toString().toLong() < data.minivalue?.toLong() ?: 0) {
+                    ToastUtils.showLong("起摘数量不能小于" + data.minivalue)
+                    return false
+                }
+            } else {
+                if (startInputNumber.text.toString()
+                        .toLong() < listedData.WrFtWrstandard?.minivalue?.toLong() ?: 0
+                ) {
+                    ToastUtils.showLong("起摘数量不能小于" + listedData.WrFtWrstandard?.minivalue)
+                    return false
+                }
             }
         }
 
-        if (performance_bond.text.toString().isNullOrEmpty()){
+        if (performance_bond.text.toString().isNullOrEmpty()) {
             ToastUtils.showLong("请输入履约保证金比例")
             return false
         }
@@ -695,13 +715,13 @@ class TradeCircleListedBuyUI(
             return false
         }
 
-        if (selectPerformanceStepData.value?.autoid.isNullOrEmpty()){
+        if (selectPerformanceStepData.value?.autoid.isNullOrEmpty()) {
             ToastUtils.showLong("请选择履约模版")
             return false
         }
 
-        if (no_friend.isChecked.not()){
-            if (selectFriendList.value.isNullOrEmpty()){
+        if (no_friend.isChecked.not()) {
+            if (selectFriendList.value.isNullOrEmpty()) {
                 ToastUtils.showLong("请选择朋友")
                 return false
             }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedSellUI.kt

@@ -108,6 +108,8 @@ class TradeCircleListedSellUI(
      */
     lateinit var whole_list: CheckBox
 
+    val whole_list_live_data : MutableLiveData<Boolean> = MutableLiveData<Boolean>().apply { value = false }
+
     /**
      * 朋友是否不限
      */
@@ -362,6 +364,10 @@ class TradeCircleListedSellUI(
                                 background =
                                     resources.getDrawable(R.drawable.yrdz_check_select_backgrond)
 
+                                setOnCheckedChangeListener { compoundButton, b ->
+                                    whole_list_live_data.postValue(b)
+                                }
+
                             }.lparams(autoSize(41), autoSize(41)) {
                                 marginStart = autoSize(36)
                                 marginEnd = autoSize(36)
@@ -449,6 +455,13 @@ class TradeCircleListedSellUI(
 
             linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
+                whole_list_live_data.bindOptional(context){
+                    if (it == true){
+                        visibility = View.GONE
+                    }else{
+                        visibility = View.VISIBLE
+                    }
+                }
                 linearLayout {
                     textView {
                         text = "起摘数量"
@@ -756,15 +769,17 @@ class TradeCircleListedSellUI(
             return false
         }
 
-        if (hasType == "1"){
-            if (startInputNumber.text.toString().toLong() < data.minivalue?.toLong() ?: 0) {
-                ToastUtils.showLong("起摘数量不能小于" + data.minivalue)
-                return false
-            }
-        }else{
-            if (startInputNumber.text.toString().toLong() < listedData.WrFtWrstandard?.minivalue?.toLong() ?: 0) {
-                ToastUtils.showLong("起摘数量不能小于" + listedData.WrFtWrstandard?.minivalue)
-                return false
+        if (whole_list.isChecked.not()){
+            if (hasType == "1"){
+                if (startInputNumber.text.toString().toLong() < data.minivalue?.toLong() ?: 0) {
+                    ToastUtils.showLong("起摘数量不能小于" + data.minivalue)
+                    return false
+                }
+            }else{
+                if (startInputNumber.text.toString().toLong() < listedData.WrFtWrstandard?.minivalue?.toLong() ?: 0) {
+                    ToastUtils.showLong("起摘数量不能小于" + listedData.WrFtWrstandard?.minivalue)
+                    return false
+                }
             }
         }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedingActivity.kt

@@ -296,8 +296,10 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                         canBargain = 0
                                     }
                                     var canPart = 1
+                                    var minStartNum : Long = 0
                                     if (sellUI.whole_list.isChecked){
                                         canPart = 0
+                                        minStartNum = sellUI.startInputNumber.text.toString().toLong()
                                     }else{
                                         canPart = 1
                                     }
@@ -346,8 +348,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             ApplyID = 0,
                                             CanPart = canPart,
                                             HasWr = 1,
-                                            DelistMinQty = sellUI.startInputNumber.text.toString()
-                                                .toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = selectDetailsData?.wrstandardid?.toInt()
                                                 ?: 0
                                         ) {
@@ -391,8 +392,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             ApplyID = 0,
                                             CanPart = canPart,
                                             HasWr = 1,
-                                            DelistMinQty = sellUI.startInputNumber.text.toString()
-                                                .toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = listedData.WrFtWrstandard?.wrstandardid?.toInt()
                                                 ?: 0
                                         ) {
@@ -408,8 +408,10 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                         canBargain = 0
                                     }
                                     var canPart = 1
+                                    var minStartNum : Long = 0
                                     if (sellUI.whole_list.isChecked){
                                         canPart = 0
+                                        minStartNum = sellUI.startInputNumber.text.toString().toLong()
                                     }else{
                                         canPart = 1
                                     }
@@ -456,8 +458,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             ApplyID = 0,
                                             CanPart = canPart,
                                             HasWr = 0,
-                                            DelistMinQty = sellUI.startInputNumber.text.toString()
-                                                .toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = selectDetailsData?.wrstandardid?.toInt()
                                                 ?: 0
                                         ) {
@@ -499,8 +500,7 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             ApplyID = 0,
                                             CanPart = canPart,
                                             HasWr = 0,
-                                            DelistMinQty = sellUI.startInputNumber.text.toString()
-                                                .toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = listedData?.WrFtWrstandard?.wrstandardid?.toInt()
                                                 ?: 0
                                         ) {
@@ -520,8 +520,10 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                     canBargain = 0
                                 }
                                 var canPart = 1
+                                var minStartNum : Long = 0
                                 if (buyUI.whole_list.isChecked) {
                                     canPart = 0
+                                    minStartNum = buyUI.startInputNumber.text.toString().toLong()
                                 } else {
                                     canPart = 1
                                 }
@@ -557,11 +559,11 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             PerformanceTemplateID = buyUI.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                             BuyOrSell = 0,
                                             PriceDisplayMode = 1,
-                                            CanBargain = 0,
+                                            CanBargain = canBargain,
                                             ApplyID = 0,
-                                            CanPart = 1,
+                                            CanPart = canPart,
                                             HasWr = 1,
-                                            DelistMinQty = buyUI.startInputNumber.text.toString().toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = data.wrstandardid?.toInt() ?: 0
                                         ) {
                                             finish()
@@ -590,11 +592,11 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             PerformanceTemplateID = buyUI.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                             BuyOrSell = 0,
                                             PriceDisplayMode = 1,
-                                            CanBargain = 0,
+                                            CanBargain = canBargain,
                                             ApplyID = 0,
-                                            CanPart = 1,
+                                            CanPart = canPart,
                                             HasWr = 1,
-                                            DelistMinQty = buyUI.startInputNumber.text.toString().toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = listedData.WrFtWrstandard?.wrstandardid?.toInt() ?: 0
                                         ) {
                                             finish()
@@ -626,11 +628,11 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             PerformanceTemplateID = buyUI.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                             BuyOrSell = 0,
                                             PriceDisplayMode = 1,
-                                            CanBargain = 0,
+                                            CanBargain = canBargain,
                                             ApplyID = 0,
-                                            CanPart = 1,
+                                            CanPart = canPart,
                                             HasWr = 0,
-                                            DelistMinQty = buyUI.startInputNumber.text.toString().toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = data.wrstandardid?.toInt() ?: 0
                                         ) {
                                             finish()
@@ -659,11 +661,11 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                             PerformanceTemplateID = buyUI.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                             BuyOrSell = 0,
                                             PriceDisplayMode = 1,
-                                            CanBargain = 0,
+                                            CanBargain = canBargain,
                                             ApplyID = 0,
-                                            CanPart = 1,
+                                            CanPart = canPart,
                                             HasWr = 0,
-                                            DelistMinQty = buyUI.startInputNumber.text.toString().toLong(),
+                                            DelistMinQty = minStartNum,
                                             WRStandardID = listedData.WrFtWrstandard?.wrstandardid?.toInt() ?: 0
                                         ) {
                                             finish()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/warehousereceipt/tradecircle/TradeCircleListedingViewModel.kt

@@ -7,9 +7,12 @@ import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.protobuf.protoclasses.WarehouseTradeMI1
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.base.BaseViewModel
+import cn.muchinfo.rma.view.eventbus.EventConstent
+import com.desfate.chart.ui.old.OTC.listener.MessageEvent
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mtp.polymer.com.autowidget.utils.TaskUiModel
+import org.greenrobot.eventbus.EventBus
 
 /**
  * 贸易圈挂牌页面viewmodel
@@ -235,6 +238,11 @@ class TradeCircleListedingViewModel : BaseViewModel(){
                 if (isCompleted) {
                     loadingDialogStatus.postValue(TaskUiModel.success(msg = "请求成功"))
                     isSuccess(true)
+                    EventBus.getDefault().post(
+                        cn.muchinfo.rma.view.eventbus.MessageEvent(
+                            EventConstent.refresh_circle_list
+                        )
+                    )
                 } else {
                     loadingDialogStatus.postValue(
                         TaskUiModel.failed(

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/adapter/TransferAdapter.java

@@ -302,6 +302,7 @@ public class TransferAdapter extends RecyclerView.Adapter<TransferAdapter.ItemVi
                 Intent intent = new Intent();
                 intent.putExtra("data", new OrderQuoteData());
                 intent.putExtra("type", "3");
+                intent.putExtra("isCircle","0");
                 intent.putExtra("goodsId", String.valueOf(data.getGoodsid()));
                 intent.setClass(context, BusinessHallDetailsActivity.class);
                 ActivityUtils.startActivity(intent);

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

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.MutableLiveData
 import androidx.viewpager.widget.PagerAdapter
@@ -53,6 +54,9 @@ class ContractBusinessHallActivity : BaseActivity<ContractBusinessHallViewModel>
 
     val goodsCode by lazy { intent.getStringExtra("goodsCode") }
 
+    //价格涨跌的上下箭头
+    lateinit var updowm_image : ImageView
+
     //顶部数据是否展开
     val priceUpDown: MutableLiveData<Boolean> = MutableLiveData<Boolean>().apply { value = false }
 
@@ -221,6 +225,7 @@ class ContractBusinessHallActivity : BaseActivity<ContractBusinessHallViewModel>
                     onThrottleFirstClick {
                         val intent = Intent()
                         intent.putExtra("data", OrderQuoteData())
+                        intent.putExtra("isCircle","0")
                         intent.putExtra("type", "3")
                         intent.putExtra("goodsId", goodsId)
                         intent.setClass(context, BusinessHallDetailsActivity::class.java)
@@ -256,6 +261,7 @@ class ContractBusinessHallActivity : BaseActivity<ContractBusinessHallViewModel>
                             }
 
                             imageView {
+                                updowm_image = this
                                 viewModel.quoteDayData.bindOptional(context) {
                                     if (it?.last == 0.0){
                                         visibility = View.GONE
@@ -286,13 +292,15 @@ class ContractBusinessHallActivity : BaseActivity<ContractBusinessHallViewModel>
                                         text = "--"
                                         textColorInt = R.color.rma_black_33
                                     }else{
-                                        val gainsamount = it?.getPrice()?.minus(it.preclose)
+                                        val gainsamount = it?.getPrice()?.minus(it.presettle)
                                         if (gainsamount ?: 0.0 > 0.0) {
+                                            updowm_image.imageResource = R.mipmap.rydz_price_up_icon
                                             text =
                                                 "+" + NumberUtils.roundNum(gainsamount?.toString(), 2)
                                         } else if (gainsamount ?: 0.0 < 0.0) {
+                                            updowm_image.imageResource = R.mipmap.yrdz_price_down
                                             text =
-                                                "-" + NumberUtils.roundNum(gainsamount?.toString(), 2)
+                                                NumberUtils.roundNum(gainsamount?.toString(), 2)
                                         } else {
                                             text = "0"
                                         }
@@ -314,11 +322,11 @@ class ContractBusinessHallActivity : BaseActivity<ContractBusinessHallViewModel>
                                         textColorInt = R.color.rma_black_33
                                     }else{
                                          val gainsamount =
-                                        it?.getPrice()?.minus(it.preclose)?.div(it.preclose)
+                                        it?.getPrice()?.minus(it.presettle)?.div(it.presettle)
                                     if (gainsamount ?: 0.0 > 0.0) {
                                         text = "+" + gainsamount?.toString()?.toPercentage()
                                     } else if (gainsamount ?: 0.0 < 0.0) {
-                                        text = "-" + gainsamount?.toString()?.toPercentage()
+                                        text = gainsamount?.toString()?.toPercentage()
                                     } else {
                                         text = "0%"
                                     }
@@ -359,7 +367,6 @@ class ContractBusinessHallActivity : BaseActivity<ContractBusinessHallViewModel>
                                     it?.getPrecloseColor()?.colorType() ?: R.color.rma_black_33
                             }
                             textSizeAuto = 29
-
                         }.lparams(wrapContent, wrapContent) {
                             marginEnd = autoSize(20)
                         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/yrdzpurchase/chart/YrdzChartActivity.kt

@@ -542,10 +542,10 @@ class DealUI(private val activity : AppCompatActivity,private val viewModel: Yrd
                 }
                 swipeToLoadLayout {
                     swipeToLayout = this
-                    setEnableRefresh(false)
+                    setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
-
+                        viewModel.queryHistoryTikDatas(goodsCode = goodsCode)
                     }
                     setEnableScrollContentWhenLoaded(false)
                     setEnableLoadMoreWhenContentNotFull(false)

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

@@ -36,4 +36,9 @@ object EventConstent {
      * 获取用户基本信息
      */
     const val get_useraccount_info = "get_useraccount_info"
+
+    /**
+     * 刷新贸易圈列表的更新
+     */
+    const val refresh_circle_list = "refresh_circle_list"
 }