风险管理7月5日提交代码-liu.bolan-千海金

RMA/app/src/main/AndroidManifest.xml

@@ -351,6 +351,8 @@
 
         <activity android:name=".view.base.AgreementActivity"/>
 
+        <activity android:name=".view.base.platinumtreasure.trade.NoPayDetailsActivity"/>
+
     </application>
 
 </manifest>

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

@@ -146,6 +146,8 @@ class AccountManager {
         // 记录相关登录信息
         GlobalDataCollection.instance?.loginRsp = loginRsp
 
+        SPUtils.getInstance().put(Constant.token,loginRsp.token)
+
         // 成功后通知网络开始发送心跳
         tradeSocketManager.startBeatTime()
 

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

@@ -2,46 +2,81 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 库存报表实体
  */
 data class AreaStockReportData(
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("curstock")
     val curstock : String? = "",//期末库存量
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种ID
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("goodsunitid")
     val goodsunitid : String? = "",//现货单位id
+    @SerializedName("modelname")
     val modelname : String? = "",//型号名称
+    @SerializedName("oristock")
     val oristock : String? = "",//期初库存量
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//现货品牌ID
+    @SerializedName("spotgoodsmodelid")
     val spotgoodsmodelid : String? = "",//现货型号ID
+    @SerializedName("todaybuyinqty")
     val todaybuyinqty : String? = "",//今日采购入库量
+    @SerializedName("todayproduceinqty")
     val todayproduceinqty : String? = "",//今内部入库量
+    @SerializedName("todayproduceoutqty")
     val todayproduceoutqty : String? = "",//今内部出库量
+    @SerializedName("todayselloutqty")
     val todayselloutqty : String? = "",//今日销售出库量
+    @SerializedName("unitid")
     val unitid : String? = "",//单位id
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
+    @SerializedName("userid")
     val userid : String? = "",//机构ID
+    @SerializedName("username")
     val username : String? = "",//机构名称
+    @SerializedName("warehousecode")
     val warehousecode : String? = "",//仓库代码
+    @SerializedName("warehouseinfoid")
     val warehouseinfoid : String? = "",//仓库ID
+    @SerializedName("warehousename")
     val warehousename : String? = "",//仓库名称
+    @SerializedName("warehousetype")
     val warehousetype : String? = "",//仓库类型 - 1 厂库 2 自有库 3 合作库
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货商品代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货商品名称
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf(),//组装的右侧数据
+    @SerializedName("cycletime")
     val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
     val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @SerializedName("diffqty")
     val diffqty : String? = "",//库存变化量 = 期末 - 期初
+    @SerializedName("reckondate")
     val reckondate : String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("unbuyinqty")
     val unbuyinqty : String? = "",//采购未入库量(数据库未找到相关字段?)
+    @SerializedName("begindate")
     val begindate : String? = "",//开始交易日
+    @SerializedName("enddate")
     val enddate : String? = "",//结束交易日
-
+    @SerializedName("unselloutqty")
     val unselloutqty : String? = ""//销售未出库量(数据库未找到相关字段?)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,50 +2,91 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 库存报表明细实体
  */
 data class AreaStockReportDetailData(
+    @SerializedName("applyid")
     val applyid : String? = "",//申请人
+    @SerializedName("applyname")
     val applyname : String? = "",//申请人名称
+    @SerializedName("applyremark")
     val applyremark : String? = "",//申请备注
+    @SerializedName("applysrc")
     val applysrc : String? = "",//申请来源 - 1:管理端 2:终端
+    @SerializedName("applystatus")
     val applystatus : String? = "",////申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+    @SerializedName("applytime")
     val applytime : String? = "",//申请时间
+    @SerializedName("auditid")
     val auditid : String? = "",//审核人
+    @SerializedName("auditname")
     val auditname : String? = "",//审核人名称
+    @SerializedName("auditremark")
     val auditremark : String? = "",//审核备注
+    @SerializedName("auditsrc")
     val auditsrc : String? = "",//审核来源 - 1:管理端 2:终端
+    @SerializedName("audittime")
     val audittime : String? = "",//审核时间
+    @SerializedName("audittradedate")
     val audittradedate : String? = "",//审核交易日(yyyyMMdd)
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("buyuserid")
     val buyuserid : String? = "",//采购方userid
+    @SerializedName("buyusername")
     val buyusername : String? = "",//采购方名称
+    @SerializedName("contractno")
     val contractno : String? = "",//合同编号
+    @SerializedName("contractqty")
     val contractqty : String? = "",//合同量
+    @SerializedName("contracttype")
     val contracttype : String? = "",//现货合同类型 - 1:采购 -1:销售
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种ID
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//现货商品单位名称
+    @SerializedName("inoutapplyid")
     val inoutapplyid : String? = "",//申请ID(607+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("inouttype")
     val inouttype : String? = "",//出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
+    @SerializedName("modelname")
     val modelname : String? = "",//型号名称
+    @SerializedName("pricetype")
     val pricetype : String? = "",//定价类型 - 1:一口价 2:点价 3:暂定价
+    @SerializedName("qty")
     val qty : String? = "",//数量
+    @SerializedName("selluserid")
     val selluserid : String? = "",//销售方userid
+    @SerializedName("sellusername")
     val sellusername : String? = "",//销售方名称
+    @SerializedName("spotcontractid")
     val spotcontractid : String? = "",//关联现货合同ID
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//现货品牌ID
+    @SerializedName("spotgoodsmodelid")
     val spotgoodsmodelid : String? = "",//现货型号ID
+    @SerializedName("unitid")
     val unitid : String? = "",//单位id
+    @SerializedName("userid")
     val userid : String? = "",//机构ID
+    @SerializedName("warehousecode")
     val warehousecode : String? = "",//仓库代码
+    @SerializedName("warehouseinfoid")
     val warehouseinfoid : String? = "",//现货仓库ID
+    @SerializedName("warehousename")
     val warehousename : String? = "",//仓库名称
+    @SerializedName("warehousetype")
     val warehousetype : String? = "",//仓库类型 - 1 厂库 2 自有库 3 合作库
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货商品代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货商品名称
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf()//组装的右侧数据
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,27 +2,47 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //查询汇总损益表
 data class AreaSumPLData(
+    @SerializedName("areauserid")
     val areauserid :String? = "",//所属机构\交易用户ID
+    @SerializedName("currencyid")
     val currencyid :String? = "",//结算币种ID
+    @SerializedName("currencyname")
     val currencyname : String? = "",//币种名称
+    @SerializedName("cycletime")
     val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
     val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @SerializedName("futureactualpl")
     val futureactualpl : String? = "",//期货损益
+    @SerializedName("futurefloatpl")
     val futurefloatpl : String? = "",//期货浮动损益
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String? = "",//套保品种ID(SEQ_ERMS_MIDDLEGOODS)
+    @SerializedName("reckondate")
     val reckondate : String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("spotactualpl")
     val spotactualpl : String? = "",//现货损益
+    @SerializedName("spotfloatpl")
     val spotfloatpl : String? = "",//现货浮动损益
+    @SerializedName("sumactualpl")
     val sumactualpl : String? = "",//实际损益 = (ActualPL + FutureActualPL)
+    @SerializedName("sumpl")
     val sumpl : String? = "",//汇总损益
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
+    @SerializedName("begindate")
     val begindate : String? = "",//开始交易日
+    @SerializedName("enddate")
     val enddate : String? = "",//结束交易日
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String? = "",//套保品种代码
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String? = "",//套保品种名称
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf()//组装的右侧数据
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -3,6 +3,8 @@ package cn.muchinfo.rma.global.data;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * 这个类是用于行情报价牌  已经拍品数据
  */
@@ -55,60 +57,111 @@ public class AuctionOrderData implements Parcelable {
      * sellerfreezemargin : null
      * sellerfreezecharge : null
      */
-
+    @SerializedName("goodsid")
     private String goodsid;   //拍品ID
+    @SerializedName("goodscode")
     private String goodscode; //拍品代码
+    @SerializedName("goodsname")
     private String goodsname;
+    @SerializedName("applyid")
     private String applyid;  //申请ID
+    @SerializedName("wruserid")
     private String wruserid; //申请人用户ID
+    @SerializedName("wraccountid")
     private String wraccountid; //资金账号
+    @SerializedName("marketid")
     private String marketid;
+    @SerializedName("buyorsell")
     private String buyorsell;
+    @SerializedName("wrfactortypeid")
     private String wrfactortypeid;  //仓单要素类型ID
+    @SerializedName("deliverygoodsid")
     private String deliverygoodsid; //交割商品ID
+    @SerializedName("brandid")
     private String brandid; //品牌ID
+    @SerializedName("qualityid")
     private String qualityid; //品质ID
+    @SerializedName("specid")
     private String specid; //规格ID
+    @SerializedName("warehouseid")
     private String warehouseid; //仓库ID
+    @SerializedName("deliverymonthid")
     private String deliverymonthid; //月份ID
+    @SerializedName("applyqty")
     private String applyqty;  //申请数量
+    @SerializedName("acutionstatus")
     private String acutionstatus;   // 竞拍状态 1：竞拍中 2：未开始 3：竞拍结束（成交） 4：竞拍结束（流拍） 5：竞拍结束（未履约） 6：履约完成 7：已注销
+    @SerializedName("startprice")
     private String startprice;
+    @SerializedName("floorprice")
     private String floorprice;  //底价
+    @SerializedName("starttradedate")
     private String starttradedate; //起拍交易日
+    @SerializedName("starttime")
     private String starttime;
+    @SerializedName("endtime")
     private String endtime;
+    @SerializedName("auctiondesc")
     private String auctiondesc;  //拍品描述
+    @SerializedName("margin")
     private String margin;   //买方保证金设置值
+    @SerializedName("cutinterval")
     private String cutinterval; //延时周期-【降价式】
+    @SerializedName("pricestep")
     private String pricestep; //价格幅度【降价式，竞价式】
+    @SerializedName("tradeprice")
     private String tradeprice;  //成交价
+    @SerializedName("tradeqty")
     private String tradeqty;  //成交数量
+    @SerializedName("quotenum")
     private String quotenum;  //出价次数
+    @SerializedName("decimalplace")
     private String decimalplace;  //报价小数位
+    @SerializedName("feealgorithm")
     private String feealgorithm;  //买方手续费收取方式 1：比率 2：固定
+    @SerializedName("exchagechargevalue")
     private String exchagechargevalue; //买方手续费设置值
+    @SerializedName("feealgorithm2")
     private String feealgorithm2; //卖方手续费收取方式 1：比率 2：固定
+    @SerializedName("exchagechargevalue2")
     private String exchagechargevalue2; //卖方手续费设置值
+    @SerializedName("feealgorithm3")
     private String feealgorithm3;  //流拍手续费收取方式 1：比率 2：固定
+    @SerializedName("exchagechargevalue3")
     private String exchagechargevalue3; //流拍卖方手续费设置值
+    @SerializedName("failcharge")
     private String failcharge;  //流拍手续费
+    @SerializedName("unit")
     private String unit;  //单位
+    @SerializedName("goodspicurl")
     private String goodspicurl;   //商品介绍图片
+    @SerializedName("buymarginalgorithm")
     private String buymarginalgorithm;  //买方保证金方式 1:比率  2：固定
+    @SerializedName("sellmarginalgorithm")
     private String sellmarginalgorithm; //卖方保证金方式 1：比率 2：固定
+    @SerializedName("sellmarginvalue")
     private String sellmarginvalue;  //卖方保证金设置
+    @SerializedName("performancemode")
     private String performancemode;  //履约方式  1：立即执行 2：履约模板执行
+    @SerializedName("performancetemplateid")
     private String performancetemplateid; //履约计划模板ID
+    @SerializedName("sellerfreezemargin")
     private String sellerfreezemargin;  //卖方冻结保证金
+    @SerializedName("sellerfreezecharge")
     private String sellerfreezecharge; //卖方冻结手续费
+    @SerializedName("templatename")
     private String templatename;  //履约计划模板名称
+    @SerializedName("paymenttypel")
     private String paymenttypel;  //支付方式
+    @SerializedName("takemode")
     private String takemode;   //提货方式
+    @SerializedName("trademode")
     private String trademode;  //交易模式
-
+    @SerializedName("curprice")
     private String curprice;   //当前价
+    @SerializedName("histradedate")
     private String histradedate;  //历史交易日
+    @SerializedName("pricemode")
     private String pricemode;
 
 

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

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 
 /**
  * 查询可配置期货品种(菜单:商品信息/现货商品/新增现货商品/新增套保品种)
@@ -11,12 +13,20 @@ package cn.muchinfo.rma.global.data
  * @constructor
  */
 data class AvaildGoodsGroupData(
+    @SerializedName("goodsgroupid")
     val goodsgroupid : String? = "",
+    @SerializedName("goodsgroupname")
     val goodsgroupname : String? = "",
+    @SerializedName("goodunitid")
     val goodunitid : String? = "",
+    @SerializedName("goodunitname")
     val goodunitname : String? = "",
+    @SerializedName("outergroupcode")
     val outergroupcode : String? = "",
+    @SerializedName("srcgoodsgroupid")
     val srcgoodsgroupid : String? = "",//源期货品种ID
+    @SerializedName("dstgoodsgroupid")
     val dstgoodsgroupid : String? = "",//目标期货品种ID
+    @SerializedName("convertratio")
     val convertratio : String? = ""//折算系数
 )

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

@@ -2,43 +2,77 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 签约银行信息(提现账户管理)
  */
 data class BankAccountSignData(
+    @SerializedName("accountcode")
     val accountcode : String? = "",//资金账号
+    @SerializedName("accountname")
     val accountname : String? = "",//资金账号对应的账号名(UserName)
+    @SerializedName("accountname2")
     val accountname2 : String? = "",// 资金账号对应的账号名(UserName) - 密文
+    @SerializedName("accounttype")
     val accounttype : String? = "",//账户类型(UserType)
+    @SerializedName("applicationtime")
     val applicationtime : String? = "",//最后一次更新的时间
+    @SerializedName("applyexchticket")
     val applyexchticket : String? = "",//申请流水
+    @SerializedName("auditid")
     val auditid : String? = "",//审核人
+    @SerializedName("audittime")
     val audittime : String? = "",//审核时间
+    @SerializedName("bankaccountname")
     val bankaccountname : String? = "",//签约银行卡账号名
+    @SerializedName("bankaccountname2")
     val bankaccountname2 : String? = "",//签约银行卡账号名 - 密文
+    @SerializedName("bankaccountno2")
     val bankaccountno2 : String? = "",//银行卡号 - 密文
+    @SerializedName("bankaccountno")
     val bankaccountno : String? = "",//银行卡号
+    @SerializedName("bankaccounttype")
     val bankaccounttype : String? = "",//银行账户类型 - 1-对私; 2-对公
+    @SerializedName("bankcardtype")
     val bankcardtype : String? = "",//银行卡类型
+    @SerializedName("bankchildaccount")
     val bankchildaccount : String? = "",//银行子账号（签约成功后，很多银行会返回对应的这个虚拟账号）
+    @SerializedName("bankcity")
     val bankcity : String? = "",//开户行城市
+    @SerializedName("bankid")
     val bankid : String? = "",//签约银行ID
+    @SerializedName("bankname")
     val bankname : String? = "",//签约银行名称
+    @SerializedName("bankprovince")
     val bankprovince : String? = "",//开户行省份
+    @SerializedName("branchbankid")
     val branchbankid : String? = "",//签约银行支行号
+    @SerializedName("branchbankname")
     val branchbankname : String? = "",//签约银行支行名称
+    @SerializedName("cardno")
     val cardno : String? = "",//证件号码
+    @SerializedName("cardtype")
     val cardtype : String? = "",//证件类型
+    @SerializedName("currency")
     val currency : String? = "",//币种
+    @SerializedName("cusbankid")
     val cusbankid : String? = "",//托管银行编号
+    @SerializedName("direct")
     val direct : String? = "",//方向(可以判断那方先发起的签约)
+    @SerializedName("exchticket")
     val exchticket : String? = "",//最后一次签约成功的流水号
+    @SerializedName("extendinfo")
     val extendinfo : String? = "",//扩展信息(JSON字符串)
+    @SerializedName("mobilephone")
     val mobilephone : String? ="",//手机号
+    @SerializedName("netaddr")
     val netaddr : String? = "",//调转网址
+    @SerializedName("relateduserid")
     val relateduserid : String? = "",//关联使用者userid
+    @SerializedName("signstatus")
     val signstatus : String? = "",//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中 10:审核拒绝 11:换签待审核
+    @SerializedName("updatetime")
     val updatetime : String? = ""//更新时间(签解约更新时间)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,16 +2,22 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 import java.io.Serializable
 
 /**
  * 开户行实体
  */
 data class BankInfoData(
+    @SerializedName("bankid")
     val bankid : String? = "",//银行ID
+    @SerializedName("bankname")
     val bankname : String? = "",//银行名称
+    @SerializedName("clearbankno")
     val clearbankno : String? = "",//清算系统银行编号
+    @SerializedName("orderindex")
     val orderindex : String? = "",//排序顺序
+    @SerializedName("status")
     val status : String? = ""//状态 - 0:正常 1:注销
 ) : Parcelable , Serializable{
     constructor(parcel: Parcel) : this(

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

@@ -1,19 +1,36 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 data class BannerData(
+    @SerializedName("areauserid")
     val areauserid : String = "",//所属机构ID
+    @SerializedName("configid")
     val configid : String = "",//配置ID(SEQ_SZDZ2_IMAGECONFIG)
+    @SerializedName("createdate")
     val createdate : String = "",//创建时间
+    @SerializedName("creatorid")
     val creatorid : String = "",//创建人
+    @SerializedName("imagepath")
     val imagepath : String = "",//图片
+    @SerializedName("imagetype")
     val imagetype : String = "",//类型 - 1:首页轮播(移动) 2:我的(移动)
+    @SerializedName("isshow")
     val isshow : String = "",//是否展示 - 0:不展示 1:展示
+    @SerializedName("marketid")
     val marketid : String = "",//市场ID
+    @SerializedName("modifierid")
     val modifierid : String = "",//操作人
+    @SerializedName("sort")
     val sort : String = "",//排序
+    @SerializedName("title")
     val title : String = "",//标题
+    @SerializedName("trademode")
     val trademode : String = "",//交易模式
+    @SerializedName("updatedate")
     val updatedate : String? = "",//修改时间
+    @SerializedName("url")
     val url : String = "",//链接(地址或商品ID)
+    @SerializedName("urltype")
     val urltype : String = ""//链接类型 - 1:直接地址 2:商品ID
 )

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

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 查询业务管理(交收)(对应菜单:业务管理/交收) + 点价
@@ -34,40 +35,75 @@ import android.os.Parcelable
  * @constructor
  */
 data class BusinessData(
+    @SerializedName("addmargin")
     val addmargin: String? = "",
+    @SerializedName("applyid")
     val applyid: String? = "",
+    @SerializedName("applyname")
     val applyname: String? ="",
+    @SerializedName("applystatus")
     val applystatus: String? = "",
+    @SerializedName("applytime")
     val applytime: String? = "",
+    @SerializedName("auditname")
     val auditname: String? = "",
+    @SerializedName("audittime")
     val audittime: String? = "",
+    @SerializedName("buyusername")
     val buyusername: String? = "",
+    @SerializedName("contractno")
     val contractno: String? = "",
+    @SerializedName("contractstatus")
     val contractstatus: String? = "",
+    @SerializedName("contracttype")
     val contracttype: String? = "",
+    @SerializedName("decmargin")
     val decmargin: String? = "",
+    @SerializedName("enumdicname")
     val enumdicname: String? = "",
+    @SerializedName("goodscode")
     val goodscode: String? = "",
+    @SerializedName("goodsname")
     val goodsname: String? = "",
+    @SerializedName("operateapplyid")
     val operateapplyid: String? = "",
+    @SerializedName("operateapplytype")
     val operateapplytype: String? = "",
+    @SerializedName("pricemove")
     val pricemove: String? = "",
+    @SerializedName("pricetype")
     val pricetype: String? = "",
+    @SerializedName("reckonadjustamount")
     val reckonadjustamount: String? = "",
+    @SerializedName("reckonosamount")
     val reckonosamount: String? = "",
+    @SerializedName("reckonotheramount")
     val reckonotheramount: String? = "",
+    @SerializedName("reckonrealqty")
     val reckonrealqty: String? = "",
+    @SerializedName("relatedid")
     val relatedid: String? = "",
+    @SerializedName("sellusername")
     val sellusername: String? = "",
+    @SerializedName("userid")
     val userid: String? = "",
+    @SerializedName("amount")
     val amount :String? = "",//点价金额=(点价价格+升贴水)*点价数量
+    @SerializedName("pricedPrice")
     val pricedPrice : String? = "",//点价价格(非必填)
+    @SerializedName("pricedQty")
     val pricedQty : String? = "",//点价数量(非必填)
+    @SerializedName("indexSelect")
     var indexSelect : Int = 0,
+    @SerializedName("reckontype")
     val reckontype : String? = "",//结算类型
+    @SerializedName("reckonvalue")
     val reckonvalue : String? = "",//值
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货品种
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货品种代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = ""//现货品种ID
 
 ) : Parcelable{

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

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  *
@@ -19,16 +20,27 @@ import android.os.Parcelable
  * @constructor
  */
 data class ChangeLogData(
+    @SerializedName("aftervalue")
     val aftervalue : String?,
+    @SerializedName("applyid")
     val applyid : String?,
+    @SerializedName("applyname")
     val applyname : String?,
+    @SerializedName("beforevalue")
     val beforevalue : String?,
+    @SerializedName("biztype")
     val biztype : String?,
+    @SerializedName("contracttype")
     val contracttype : String?,
+    @SerializedName("logvalue")
     val logvalue : String?,
+    @SerializedName("operatelogtype")
     val operatelogtype : String?,
+    @SerializedName("operatelogtypedesc")
     val operatelogtypedesc : String?,
+    @SerializedName("relatedid")
     val relatedid : String?,
+    @SerializedName("updatetime")
     val updatetime : String?
 ) : Parcelable{
 

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

@@ -1,28 +1,50 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 data class CommonTableData(
+    @SerializedName("tablekey")
     val tablekey: String? = "",
+    @SerializedName("tabletype")
     val tabletype: String? = "",
+    @SerializedName("tablename")
     val tablename: String? = "",
+    @SerializedName("tabelmenu")
     val tabelmenu: String? = "",
+    @SerializedName("remark")
     val remark: String? = "",
+    @SerializedName("columns")
     val columns: List<ColumnsData> = arrayListOf()
 )
 
 
 data class ColumnsData(
+    @SerializedName("autoid")
     val autoid: String? = "",
+    @SerializedName("tablekey")
     val tablekey: String? = "",
+    @SerializedName("columnfield")
     val columnfield: String? = "",
+    @SerializedName("columntitle")
     val columntitle: String? = "",
+    @SerializedName("columnwidth")
     val columnwidth: String? = "",
+    @SerializedName("orderindex")
     val orderindex: String? = "",
+    @SerializedName("isshow")
     val isshow: String? = "",
+    @SerializedName("aligntype")
     val aligntype: String? = "",
+    @SerializedName("formattertype")
     val formattertype: String? = "",
+    @SerializedName("formatterstring")
     val formatterstring: String? = "",
+    @SerializedName("remark")
     val remark: String? = "",
+    @SerializedName("needsummary")
     val needsummary: String? = "",
+    @SerializedName("summarytype")
     val summarytype: String? = "",
+    @SerializedName("groupname")
     val groupname: String? = ""
 )

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

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  *
@@ -50,82 +51,158 @@ import android.os.Parcelable
  * @constructor
  */
 data class ContractData(
+    @SerializedName("accountid")
     val accountid: String? = "",
+    @SerializedName("accountname")
     val accountname: String? = "",
+    @SerializedName("contracctstatus")
     val contracctstatus: String? = "",
+    @SerializedName("contractno")
     val contractno: String? = "",
+    @SerializedName("contracttype")
     val contracttype: String? = "",
+    @SerializedName("convertfactor")
     val convertfactor: String? = "",
+    @SerializedName("daikaiamount")
     val daikaiamount: String?  = "",
+    @SerializedName("deliveryenddate")
     val deliveryenddate: String? = "",
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode: String? = "",
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid: String? = "",
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname: String? = "",
+    @SerializedName("deliverystartdate")
     val deliverystartdate: String? = "",
+    @SerializedName("enddate")
     val enddate: String? = "",
+    @SerializedName("enumdicname")
     val enumdicname: String? = "",
+    @SerializedName("goodscode")
     val goodscode: String? = "",
+    @SerializedName("goodsid")
     val goodsid: String? = "",
+    @SerializedName("invoiceamount")
     val invoiceamount: String? = "",
+    @SerializedName("loanamount")
     val loanamount: String? = "",
+    @SerializedName("margin")
     val margin: String? = "",
+    @SerializedName("payamount")
     val payamount: String? = "",
+    @SerializedName("price")
     val price: String? = "",
+    @SerializedName("pricedamount")
     val pricedamount: String? = "",
+    @SerializedName("pricedavg")
     val pricedavg: String? = "",
+    @SerializedName("pricedqty")
     val pricedqty: String? = "",
+    @SerializedName("pricemove")
     val pricemove: String? = "",
+    @SerializedName("pricetype")
     val pricetype: String? = "",
+    @SerializedName("producttype")
     val producttype: String? = "",
+    @SerializedName("qty")
     val qty: String? = "",
+    @SerializedName("reckonadjustamount")
     val reckonadjustamount: String? = "",
+    @SerializedName("reckonedamount")
     val reckonedamount: String? = "",
+    @SerializedName("reckonotheramount")
     val reckonotheramount: String? = "",
+    @SerializedName("reckonrealqty")
     val reckonrealqty: String? = "",
+    @SerializedName("remark")
     val remark: String? = "",
+    @SerializedName("spotcontractid")
     val spotcontractid:String? = "",
+    @SerializedName("spotgoodsdesc")
     val spotgoodsdesc: String? = "",
+    @SerializedName("startdate")
     val startdate: String? = "",
+    @SerializedName("totalamount")
     val totalamount: String? = "",
+    @SerializedName("unpayamount")
     val unpayamount: String? = "",
+    @SerializedName("unpricedqty")
     val unpricedqty: String? = "",
+    @SerializedName("unsureqty")
     val unsureqty: String? = "",
+    @SerializedName("userid")
     val userid: String? = "",
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0,
+    @SerializedName("buyuserid")
     val buyuserid: String? = "",
+    @SerializedName("buyusername")
     val buyusername: String? = "",
+    @SerializedName("selluserid")
     val selluserid: String? = "",
+    @SerializedName("sellusername")
     val sellusername: String? = "",
+    @SerializedName("contractmargin")
     val contractmargin: String? = "",
+    @SerializedName("audittime")
     val audittime : String? = "",//审核时间
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf(),
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("modelname")
     val modelname : String? = "",//型号名称
+    @SerializedName("goodsname")
     val goodsname : String? = "",
+    @SerializedName("amount")
     val amount : String? = "",//金额
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//品类代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//品类ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//品类名称
+    @SerializedName("createtime")
     val createtime : String? = "",//创建时间
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
     //---------------三期------------
+    @SerializedName("biztype")
     val biztype : String? = "",//业务类型 1-套保 2-套利
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//现货品牌ID(DGFactoryItem表的ID)
+    @SerializedName("saleuserid")
     val saleuserid :String? = "",//业务员id
+    @SerializedName("sellnickname")
     val sellnickname : String? = "",//采购方昵称
+    @SerializedName("saleuserlogincode")
     val saleuserlogincode : String? = "",//业务员登录代码
+    @SerializedName("meruserid")
     val meruserid : String? = "",//跟单员id
+    @SerializedName("meruserlogincode")
     val meruserlogincode: String? = "",//跟单员登录代码
+    @SerializedName("buynickname")
     val buynickname : String? = "",//销售方昵称
+    @SerializedName("auditremark")
     val auditremark : String? = "",//审核意见
+    @SerializedName("tradeuserid")
     val tradeuserid : String? = "",//交易员id
+    @SerializedName("tradeuserlogincode")
     val tradeuserlogincode : String? = "",//交易员登录代码
+    @SerializedName("unitid")
     val unitid : String? = "",//单位id(取品类上的单位id)
+    @SerializedName("preinvoiceamount")
     val preinvoiceamount : String? = "",//预收(开)票额
+    @SerializedName("prepayamount")
     val prepayamount : String? = "",//预收付额
+    @SerializedName("attachment")
     val attachment : String? = "",//附件
+    @SerializedName("currencyid")
     val currencyid : String? = "",//币种id
+    @SerializedName("currencyname")
     val currencyname : String? = "",//币种名称
+    @SerializedName("tradeusername")
     val tradeusername : String? = ""//交易员名称
 ) : Parcelable {
     constructor(parcel: Parcel) : this(

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

@@ -8,6 +8,8 @@ import android.os.Parcelable
  */
 data class PayOrderData(
     val buyaccountid : String? = "",//买方账号ID[报价币种]
+    val advanceratio : String? = "",//首付比率
+    val decimalplace : String? = "",//商品报价小数位
     val buyorderid : String? = "",//买方委托单号
     val createtime : String? = "",//创建时间
     val goodscode : String? = "",//商品代码
@@ -53,6 +55,8 @@ data class PayOrderData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.readInt(),
         parcel.readString()
     ) {
@@ -60,6 +64,8 @@ data class PayOrderData(
 
     override fun writeToParcel(parcel: Parcel, flags: Int) {
         parcel.writeString(buyaccountid)
+        parcel.writeString(advanceratio)
+        parcel.writeString(decimalplace)
         parcel.writeString(buyorderid)
         parcel.writeString(createtime)
         parcel.writeString(goodscode)

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

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.global.data.chart
 
 import cn.muchinfo.rma.global.toShowTime
 import cn.muchinfo.rma.global.toShowTime2
+import cn.muchinfo.rma.view.autoWidget.toArrayList
 import kotlinx.coroutines.selects.select
 import java.text.SimpleDateFormat
 import java.util.*
@@ -33,13 +34,15 @@ data class ChartTSData(
      * 获取用于分时图的时间列表
      */
     fun getTimeChartPriceTime() : List<String> {
-        return if(historyDatas != null && historyDatas.isNotEmpty()){
+        val returnTime = if(historyDatas != null && historyDatas.isNotEmpty()){
             historyDatas.map {
                 it.ts?.toShowTime2() ?: ""
             }
         }else{
-            arrayListOf();
-        }
+            arrayListOf()
+        }.toArrayList()
+        returnTime.add(endTime?.toShowTime2() ?: "")
+        return returnTime
     }
 
     fun String.toShowTime2(format : String = "yyyy-MM-dd HH:mm:ss") : String{

RMA/app/src/main/java/cn/muchinfo/rma/netManage/utils/MyOkHttpUtils.kt

@@ -2,7 +2,9 @@ package cn.muchinfo.rma.netManage.utils
 
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.netManage.base.ResponseCallback
+import cn.muchinfo.rma.view.base.app.Constant
 import com.blankj.utilcode.util.LogUtils
+import com.blankj.utilcode.util.SPUtils
 import com.zhy.http.okhttp.OkHttpUtils
 import com.zhy.http.okhttp.callback.StringCallback
 
@@ -82,7 +84,7 @@ class MyOkHttpUtils {
         OkHttpUtils.get()
             .url(URL)
             .params(params)
-            .addHeader("Authorization", GlobalDataCollection.instance?.loginRsp?.token)
+            .addHeader("Authorization", SPUtils.getInstance().getString(Constant.token))
             .build()
             .execute(callback)
     }
@@ -119,7 +121,7 @@ class MyOkHttpUtils {
         OkHttpUtils.post()
             .url(URL)
             .params(params)
-            .addHeader("Authorization", GlobalDataCollection.instance?.loginRsp?.token)
+            .addHeader("Authorization", SPUtils.getInstance().getString(Constant.token))
             .build()
             .execute(callback)
     }
@@ -148,7 +150,7 @@ class MyOkHttpUtils {
             .url(URL)
             .content(json.toString())
             .mediaType(MediaType.parse("application/json; charset=utf-8"))
-            .addHeader("Authorization", GlobalDataCollection.instance?.loginRsp?.token)
+            .addHeader("Authorization", SPUtils.getInstance().getString(Constant.token))
             .build()
             .execute(callback)
     }

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

@@ -12,6 +12,7 @@ object Constant {
 //    const val baseurl = "http://192.168.31.114:8080/cfg?key=test_114" // shenzhen01  123123
 //    const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
 //        const val baseurl = "http://192.168.30.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.30.211:8080/cfg?key=test_211"// 瑶姐
 //          const val baseurl = "http://192.168.31.107:8080/cfg?key=test_107"// 瑶姐 千海金 13760119855
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
@@ -46,6 +47,11 @@ object Constant {
     const val oem = "oem"//app版本名称
 
     /**
+     * 用于sp存储token
+     */
+    const val token = "token"
+
+    /**
      * 行情
      */
     const val quoteHost = "quoteHost"

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

@@ -84,7 +84,12 @@ class ChartActivity : BaseActivity<ChartViewModel>() , View.OnClickListener{
         viewModel.quoteDayData.observe(this, Observer {
             findViewById<TextView>(R.id.business_value_value).text = NumberUtils.turnoverShort(it?.totalvolume.toString())//成交量
             findViewById<TextView>(R.id.holder_amount_value).text = NumberUtils.turnoverShort(it?.holdvolume.toString())//持仓量
-            findViewById<TextView>(R.id.daily_settlement_value).text = NumberUtils.doubleDistortion(it?.presettle.toString())//昨结价
+            if (it?.presettle == 0.0){
+                findViewById<TextView>(R.id.daily_settlement_value).text = "--"
+            }else{
+                findViewById<TextView>(R.id.daily_settlement_value).text = NumberUtils.doubleDistortion(it?.presettle.toString())//昨结价
+            }
+
             findViewById<TextView>(R.id.daily_close_value).text = NumberUtils.doubleDistortion(it?.preclose.toString()) //昨收
             findViewById<TextView>(R.id.sell_price_value).text = NumberUtils.doubleDistortion(it?.ask.toString())//卖价
             findViewById<TextView>(R.id.buy_price_present).text = NumberUtils.doubleDistortion(it?.bid.toString())//买价
@@ -126,13 +131,13 @@ class ChartActivity : BaseActivity<ChartViewModel>() , View.OnClickListener{
                 findViewById<TextView>(R.id.now_price_value)?.textColor = this.getColor(R.color.rma_green_color)
                 findViewById<TextView>(R.id.now_price_title)?.textColor = this.getColor(R.color.rma_green_color)
             }
-            findViewById<TextView>(R.id.up_down_value).text = NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.getPrice()?.minus(it.preclose).toString()),2)//涨额
-            findViewById<TextView>(R.id.up_down_present).text = it?.getPrice()?.minus(it.preclose)?.div(it.getPrice())//涨幅
+            findViewById<TextView>(R.id.up_down_value).text = NumberUtils.roundNum(NumberUtils.doubleDistortion(it?.getPrice()?.minus(it.presettle).toString()),2)//涨额
+            findViewById<TextView>(R.id.up_down_present).text = it?.getPrice()?.minus(it.presettle)?.div(it.getPrice())//涨幅
                 .toString().toPercentage()
-            if (it?.getPrice()?.minus(it.preclose) ?: 0.0 > 0){
+            if (it?.getPrice()?.minus(it.presettle) ?: 0.0 > 0){
                 findViewById<TextView>(R.id.up_down_value)?.textColor = this.getColor(R.color.rma_red_color)
                 findViewById<TextView>(R.id.up_down_present)?.textColor = this.getColor(R.color.rma_red_color)
-            }else if (it?.getPrice()?.minus(it.preclose) ?: 0.0 < 0){
+            }else if (it?.getPrice()?.minus(it.presettle) ?: 0.0 < 0){
                 findViewById<TextView>(R.id.up_down_value)?.textColor = this.getColor(R.color.rma_green_color)
                 findViewById<TextView>(R.id.up_down_present)?.textColor = this.getColor(R.color.rma_green_color)
             }

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

@@ -368,6 +368,7 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
                 }
 
                 viewModel.userNodeCfgAndStatus.bindOptional(context){
+
                     it?.forEach {data ->
                         textView {
                             onThrottleFirstClick {
@@ -385,7 +386,7 @@ class LoginActivity : BaseActivity<LoginViewModel>(), UserPopupWindow.OnClearAcc
                     }
                 }
 
-            }.lparams(matchParent, autoSize(100))
+            }.lparams(matchParent, wrapContent)
 
             emptyView()
 

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

@@ -166,7 +166,7 @@ class PayActivity : BaseActivity<PayViewModel>() {
                                             "yyyy-MM-dd HH:mm:ss"
                                         )
                                     )
-                                    start(paylimitedtime - nowTime)
+                                    start( paylimitedtime - nowTime)
                                 } else {
                                     if (viewModel.lookingforInfo.value?.paylimitedtime?.isNotEmpty() == true) {
                                         val paylimitedtime = com.blankj.utilcode.util.TimeUtils.date2Millis(
@@ -185,7 +185,6 @@ class PayActivity : BaseActivity<PayViewModel>() {
                                     }
                                 }
                             }
-
                         }
                     }.lparams(wrapContent, wrapContent) {
                         marginEnd = autoSize(36)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/platinumtreasure/adapter/PlatnumTreasureAdapter.java

@@ -283,7 +283,7 @@ public class PlatnumTreasureAdapter extends RecyclerView.Adapter<PlatnumTreasure
         itemViewHolder.platnum_chart.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                GoodsInfo goodsInfo = DataBase.Companion.getInstance().goodsInfoDao().getGoodsInfo(data.getGoodsid());
+                GoodsInfo goodsInfo = DataBase.Companion.getInstance().goodsInfoDao().getGoodsInfo(data.getRelatedgoodsid());
                 Intent intent = new Intent();
                 intent.putExtra("outGoodsCode", goodsInfo.getOutgoodscode());
                 intent.putExtra("goodsCode", goodsInfo.getGoodscode());

RMA/app/src/main/java/cn/muchinfo/rma/view/base/platinumtreasure/trade/NoPayDetailsActivity.kt

@@ -1,10 +1,320 @@
 package cn.muchinfo.rma.view.base.platinumtreasure.trade
 
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import cn.iwgang.countdownview.CountdownView
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.data.ContractTradeDetailData
+import cn.muchinfo.rma.global.data.PayOrderData
+import cn.muchinfo.rma.global.payflag
+import cn.muchinfo.rma.global.toPercentage
+import cn.muchinfo.rma.global.utils.TimeUtils
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.view.autoWidget.*
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseActivity
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.main.PayViewModel
+import org.jetbrains.anko.*
 
 /**
  * 待付款单据详情
  */
-class NoPayDetailsActivity : BaseActivity<PlatinumTradeViewModel>(){
+class NoPayDetailsActivity : BaseActivity<PayViewModel>(){
+
+    val data by lazy { intent.getParcelableExtra<PayOrderData>("data") as PayOrderData }
+
+    lateinit var remaining_time : _LinearLayout
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        verticalLayout {
+            topBar {
+                // 返回
+                commonLeftButton()
+                commonTitle {
+                    text = "待付详情"
+                }
+            }
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "商品名称"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = data.goodsname
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "交易类型"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    if (data.operatetype == "1"){
+                        text = "买入"
+                    }else if (data.operatetype == "16"){
+                        text = "融资买入"
+                    }
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "成交数量"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = data.tradeqty + data.enumdicname
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "成交价格"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = NumberUtils.roundNum(data.tradeprice,2)
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "成交金额"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = NumberUtils.roundNum(data.tradeamount,2)
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "手续费"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = NumberUtils.roundNum(data.tradecharge,2)
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "订单总额"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = NumberUtils.roundNum(data.payamount,2)
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                if (data.operatetype == "16"){
+                    visibility = View.VISIBLE
+                }else{
+                    visibility = View.GONE
+                }
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "首付比例"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = data.advanceratio?.toPercentage()
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "待付金额"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = NumberUtils.roundNum(data.payamount,2)
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_red_color
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "交易时间"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = data.createtime
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "订单状态"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    text = data.payflag?.payflag()
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_black_33
+                }.lparams(wrapContent, wrapContent)
+
+            }.lparams(matchParent, autoSize(75))
+
+            itemView()
+
+            linearLayout {
+                remaining_time = this
+                gravity = Gravity.CENTER_VERTICAL
+                textView {
+                    gravity = Gravity.LEFT
+                    text = "剩余付款时长"
+                    textSizeAuto = 36
+                    textColorInt = R.color.rma_gray_color
+                }.lparams(autoSize(220), wrapContent){
+                    marginStart = autoSize(36)
+                }
+
+                inflateLayout<CountdownView>(R.layout.view_countdowntime) {
+                    viewModel.systemTime.bindOptional(context) {
+                        val paylimitedtime = com.blankj.utilcode.util.TimeUtils.date2Millis(
+                            TimeUtils.stringToDate(
+                                data.paylimitedtime,
+                                "yyyy-MM-dd HH:mm:ss"
+                            )
+                        )
+                        val nowTime = com.blankj.utilcode.util.TimeUtils.date2Millis(
+                            TimeUtils.stringToDate(
+                                it,
+                                "yyyy-MM-dd HH:mm:ss"
+                            )
+                        )
+                        if (paylimitedtime.minus(nowTime) < 0){
+                            remaining_time.visibility = View.GONE
+                        }
+                        start( paylimitedtime - nowTime)
+                    }
+                }.lparams(wrapContent, wrapContent) {
+                    marginEnd = autoSize(36)
+                    topMargin = autoSize(10)
+                }
+
+            }.lparams(matchParent, autoSize(75))
+        }
+    }
 
 }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/platinumtreasure/trade/PlatinumBuyOrSellUI.kt

@@ -742,31 +742,32 @@ class PlatinumBuyOrSellUI(
                         } else if (type == "3") {
                             viewModel.isReadSellAgreement.postValue(viewModel.isReadSellAgreement.value?.not())
                         }
+//                        dialog.dismiss()
                     }
 
                     imageView {
+                        imageResource = R.mipmap.qhj_trade_normal
                         viewModel.isReadBuyAgreement.bindOptional(context) {
                             imageResource = if (it == true) {
-                                R.mipmap.ic_check_select
+                                R.mipmap.qhj_trade_select
                             } else {
-                                R.mipmap.ic_check_normal
+                                R.mipmap.qhj_trade_normal
                             }
                         }
                         viewModel.isReadFinancingBuyAgreement.bindOptional(context) {
                             imageResource = if (it == true) {
-                                R.mipmap.ic_check_select
+                                R.mipmap.qhj_trade_select
                             } else {
-                                R.mipmap.ic_check_normal
+                                R.mipmap.qhj_trade_normal
                             }
                         }
                         viewModel.isReadSellAgreement.bindOptional(context) {
                             imageResource = if (it == true) {
-                                R.mipmap.ic_check_select
+                                R.mipmap.qhj_trade_select
                             } else {
-                                R.mipmap.ic_check_normal
+                                R.mipmap.qhj_trade_normal
                             }
                         }
-                        imageResource = R.mipmap.ic_check_normal
                     }.lparams(autoSize(35), autoSize(35))
 
                     textView {
@@ -989,7 +990,7 @@ class PlatinumBuyOrSellUI(
                                 }
                             }
                             if (type == "1") {//买
-                                if (viewModel.isReadBuyAgreement.value != true){
+                                if (viewModel.isReadBuyAgreement.value == true){
                                     viewModel.QHJCustomerSignStatusOperateReq(
                                         nodetype = 3,
                                         goodsid = goodsInfo.goodsid.toLong(),
@@ -999,7 +1000,7 @@ class PlatinumBuyOrSellUI(
                                     )
                                 }
                             } else if (type == "3") {//融资买
-                                if (viewModel.isReadFinancingBuyAgreement.value != true){
+                                if (viewModel.isReadFinancingBuyAgreement.value == true){
                                     viewModel.QHJCustomerSignStatusOperateReq(
                                         nodetype = 4,
                                         goodsid = goodsInfo.goodsid.toLong(),
@@ -1010,7 +1011,7 @@ class PlatinumBuyOrSellUI(
                                     )
                                 }
                             } else if (type == "2") {//卖
-                                if (viewModel.isReadSellAgreement.value != true){
+                                if (viewModel.isReadSellAgreement.value == true){
                                     viewModel.QHJCustomerSignStatusOperateReq(
                                         nodetype = 6,
                                         goodsid = goodsInfo.goodsid.toLong(),

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

@@ -55,6 +55,7 @@
             <!-- goods tag -->
             <TextView
                 android:id="@+id/tag_type_tv"
+                android:visibility="gone"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/goods_name_tv"