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

RMA/app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "cn.muchinfo.rma"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 50013
-        versionName "5.0.13"
+        versionCode 50014
+        versionName "5.0.14"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //指定room.schemaLocation生成的文件路径

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

@@ -52,6 +52,10 @@ data class FutureDataReportData(
     val holdqty : String? = "",//期末持仓量
     @SerializedName("lastholdamount")
     val lastholdamount : String? = "",//当前持仓额
+    @SerializedName("openavgprice")
+    val openavgprice : String? = "",//开仓均价
+    @SerializedName("closeavgprice")
+    val closeavgprice : String? = "",//平仓均价
     @SerializedName("lastprice")
     val lastprice : String? = "",//最新价
     @SerializedName("middlegoodsqty")
@@ -138,6 +142,8 @@ data class FutureDataReportData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.createStringArrayList()
     ) {
     }
@@ -165,6 +171,8 @@ data class FutureDataReportData(
         parcel.writeString(holdamount)
         parcel.writeString(holdqty)
         parcel.writeString(lastholdamount)
+        parcel.writeString(openavgprice)
+        parcel.writeString(closeavgprice)
         parcel.writeString(lastprice)
         parcel.writeString(middlegoodsqty)
         parcel.writeString(openamount)
@@ -202,4 +210,5 @@ data class FutureDataReportData(
         }
     }
 
+
 }

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

@@ -2,36 +2,37 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 待付款
  */
 data class PayOrderData(
-    val buyaccountid : String? = "",//买方账号ID[报价币种]
-    val advanceratio : String? = "",//首付比率
-    val decimalplace : String? = "",//商品报价小数位
-    val buyorderid : String? = "",//买方委托单号
-    val createtime : String? = "",//创建时间
-    val goodscode : String? = "",//商品代码
-    val goodsid : String? = "",//商品ID
-    val goodsname : String? = "",//商品名称
-    val enumdicname : String? = "",//单位
-    val marketid : String? = "",//市场ID
-    val offamount : String? = "",//优惠金额
-    val operatetype : String? = "",//买委托操作类型 - 1:正常下单 16:融资买入
-    val payamount : String? = "",//支付金额=TradeAmount + TradeCharge
-    val payflag : String? = "",//付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
-    val paylimitedtime : String? = "",//支付期限
-    val paytime : String? = "",//付款时间
-    val sellaccountid : String? = "",//卖方账号ID[报价币种]
-    val sellorderid : String? = "",//卖方委托单号
-    val tradeamount : String? = "",//成交金额(优惠后金额)
-    val tradecharge : String? = "",//成交手续费(买方)
-    val tradedate : String? = "",//交易日(yyyyMMdd)
-    val tradeid : String? = "",//成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-    val tradeprice : String? = "",//成交价格
-    var isClick : Int = 0,//是否点击展开
-    val tradeqty : String? = ""//成交数量
+    @SerializedName("buyaccountid") val buyaccountid : String? = "",//买方账号ID[报价币种]
+    @SerializedName("advanceratio") val advanceratio : String? = "",//首付比率
+    @SerializedName("decimalplace") val decimalplace : String? = "",//商品报价小数位
+    @SerializedName("buyorderid") val buyorderid : String? = "",//买方委托单号
+    @SerializedName("createtime") val createtime : String? = "",//创建时间
+    @SerializedName("goodscode") val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid") val goodsid : String? = "",//商品ID
+    @SerializedName("goodsname") val goodsname : String? = "",//商品名称
+    @SerializedName("enumdicname") val enumdicname : String? = "",//单位
+    @SerializedName("marketid") val marketid : String? = "",//市场ID
+    @SerializedName("offamount") val offamount : String? = "",//优惠金额
+    @SerializedName("operatetype") val operatetype : String? = "",//买委托操作类型 - 1:正常下单 16:融资买入
+    @SerializedName("payamount") val payamount : String? = "",//支付金额=TradeAmount + TradeCharge
+    @SerializedName("payflag") val payflag : String? = "",//付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+    @SerializedName("paylimitedtime") val paylimitedtime : String? = "",//支付期限
+    @SerializedName("paytime") val paytime : String? = "",//付款时间
+    @SerializedName("sellaccountid") val sellaccountid : String? = "",//卖方账号ID[报价币种]
+    @SerializedName("sellorderid") val sellorderid : String? = "",//卖方委托单号
+    @SerializedName("tradeamount") val tradeamount : String? = "",//成交金额(优惠后金额)
+    @SerializedName("tradecharge") val tradecharge : String? = "",//成交手续费(买方)
+    @SerializedName("tradedate") val tradedate : String? = "",//交易日(yyyyMMdd)
+    @SerializedName("tradeid") val tradeid : String? = "",//成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+    @SerializedName("tradeprice") val tradeprice : String? = "",//成交价格
+    @SerializedName("isClick") var isClick : Int = 0,//是否点击展开
+    @SerializedName("tradeqty") val tradeqty : String? = ""//成交数量
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

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

@@ -1,15 +1,25 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 查询待审核数量信息(首页/菜单按钮小红点)
  */
 data class PendingAuditInfoData(
+    @SerializedName("areastockqty")
     val areastockqty : String = "0",//待审核数量: 库存申请
+    @SerializedName("businessdjqty")
     val businessdjqty : String = "0",//待审核数量: 点价
+    @SerializedName("businessfpqty")
     val businessfpqty : String = "0",//待审核数量: 发票
+    @SerializedName("businessjsqty")
     val businessjsqty : String = "0",//待审核数量: 交收
+    @SerializedName("businesskxqty")
     val businesskxqty : String = "0",//待审核数量: 款项
+    @SerializedName("hedgeplanqty")
     val hedgeplanqty : String = "0",//待审核数量: 套保计划
+    @SerializedName("spotcontractqty")
     val spotcontractqty : String = "0",//待审核数量: 现货合同
+    @SerializedName("userqty")
     val userqty : String = "0"//待审核数量: 用户
 )

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

@@ -2,22 +2,37 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //提货门店
 data class PickAreaData(
+    @SerializedName("address")
     val address : String? = "",//详细地址
+    @SerializedName("cityid")
     val cityid : String? = "",//市
+    @SerializedName("cityname")
     val cityname : String? = "",//城市名称
+    @SerializedName("countryid")
     val countryid : String? = "",//国家
+    @SerializedName("countryname")
     val countryname : String? = "",//国家名称
+    @SerializedName("districtid")
     val districtid : String? = "",//地区
+    @SerializedName("districtname")
     val districtname : String? = "",//地区名称
+    @SerializedName("provinceid")
     val provinceid : String? = "",//省
+    @SerializedName("provincename")
     val provincename : String? = "",//省名称
+    @SerializedName("fromuserid")
     val fromuserid : String? = "",//所属机构(组织机构)( OrgType = 1时为自己， = 2\3时取上级机构的所属机构)
+    @SerializedName("fromusername")
     val fromusername : String? = "",//所属机构名称
+    @SerializedName("suborgtype")
     val suborgtype : String? = "",//子机构类型(千海金) - 0:机构 1:代理 2:门店
+    @SerializedName("userid")
     val userid : String? = "0",//机构用户ID 其他做市关系，都设置为 1
+    @SerializedName("username")
     val username : String? = ""//机构用户名称(门店门称)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,22 +2,37 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //提货商品
 data class PickGoodsData(
+    @SerializedName("imageaddress")
     val imageaddress : String? = "",//图片
+    @SerializedName("modifierid")
     val modifierid : String? = "",//修改人
+    @SerializedName("modifiername")
     val modifiername : String? = "",//修改人名称
+    @SerializedName("modifysrc")
     val modifysrc : String? = "",//修改来源 - 1:管理端 2:终端
+    @SerializedName("pickupgoodsagreeunit")
     val pickupgoodsagreeunit : String? = "",//合约乘数
+    @SerializedName("pickupgoodsdesc")
     val pickupgoodsdesc : String? = "",//描述
+    @SerializedName("pickupgoodsid")
     val pickupgoodsid : String? = "",//提货商品ID
+    @SerializedName("pickupgoodsname")
     val pickupgoodsname : String? = "",//提货商品名称
+    @SerializedName("pickupgoodsstatus")
     val pickupgoodsstatus : String? = "",//状态 - 1:正常 2:停用 3:注销
+    @SerializedName("pickupgoodsunitid")
     val pickupgoodsunitid : String? = "",//单位ID
+    @SerializedName("preparedays")
     val preparedays : String? = "",//备货期(天)
+    @SerializedName("pickupratio")
     val pickupratio : String? = "",//提货系数
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("updatetime")
     val updatetime : String? = ""//更新时间
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,39 +2,40 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 千海金融资明细
  */
 data class QhjContractDetailsData(
-    val contractconfirmtime : String? = "",//合同确认时间(时间)
-    val currisklevel : String? = "",//风险级别 - 1:正常 2:追加货款 3:支付尾款
-    val reckonrecovermargin : String? = "",//结算应追缴保底金(结算时到过风险率时临时存储) - [仓单回购\仓单质押]
-    val enumdicname : String? = "",//单位名称
-    val goodscode : String? = "",//商品代码
-    val goodsid : String? = "",//商品ID [5:融资单]
-    val goodsname : String? = "",//商品名称
-    val goodunitid : String? = "",//商品单位id
-    val initmargin : String? = "",//初始保证金(首付款)
-    val lenderamount : String? = "",//贷款金额(总额|订单总额)
-    val marginratio : String? = "",//保证金比率(首付比例)
-    val payamount : String? = "",//已付(已付货款)
-    val recoveredmargin : String? = "",//已追缴保证金
-    val remainamount : String? = "",//合同剩余金额(融资额)//流水-剩余货款
-    val scfcontractid : String? = "",//SCF合同ID(310+Unix秒时间戳(10位)+xxxxxx)//流水-剩余货款
-    val scfcontracttype : String? = "",//合同类型 - 1:仓单回购 2:仓单质押 3:合作套保 4:资金贷款 5:融资单
-    val totalinterest : String? = "",//已计总利息(利息)
-    val scfcontractstatus : String? = "",//合同状态 - 1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 10:已注销 11:已关闭 99:未提交
-    val tradeprice : String? = "",//成交价格(成本价格)
-    val userid : String? = "",//用户ID
-    val username : String? = "",//用户名称
-    val wrqty : String? = "",//仓单数量(数量)
+    @SerializedName("contractconfirmtime") val contractconfirmtime : String? = "",//合同确认时间(时间)
+    @SerializedName("currisklevel") val currisklevel : String? = "",//风险级别 - 1:正常 2:追加货款 3:支付尾款
+    @SerializedName("reckonrecovermargin") val reckonrecovermargin : String? = "",//结算应追缴保底金(结算时到过风险率时临时存储) - [仓单回购\仓单质押]
+    @SerializedName("enumdicname") val enumdicname : String? = "",//单位名称
+    @SerializedName("goodscode") val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid") val goodsid : String? = "",//商品ID [5:融资单]
+    @SerializedName("goodsname") val goodsname : String? = "",//商品名称
+    @SerializedName("goodunitid") val goodunitid : String? = "",//商品单位id
+    @SerializedName("initmargin") val initmargin : String? = "",//初始保证金(首付款)
+    @SerializedName("lenderamount") val lenderamount : String? = "",//贷款金额(总额|订单总额)
+    @SerializedName("marginratio") val marginratio : String? = "",//保证金比率(首付比例)
+    @SerializedName("payamount") val payamount : String? = "",//已付(已付货款)
+    @SerializedName("recoveredmargin") val recoveredmargin : String? = "",//已追缴保证金
+    @SerializedName("remainamount") val remainamount : String? = "",//合同剩余金额(融资额)//流水-剩余货款
+    @SerializedName("scfcontractid") val scfcontractid : String? = "",//SCF合同ID(310+Unix秒时间戳(10位)+xxxxxx)//流水-剩余货款
+    @SerializedName("scfcontracttype") val scfcontracttype : String? = "",//合同类型 - 1:仓单回购 2:仓单质押 3:合作套保 4:资金贷款 5:融资单
+    @SerializedName("totalinterest") val totalinterest : String? = "",//已计总利息(利息)
+    @SerializedName("scfcontractstatus") val scfcontractstatus : String? = "",//合同状态 - 1:待确认 2:已确认 3:确认拒绝 4:已支付保证金 5:已激活 6:已违约 7:到期结束 8:延期结束 9:违约结束 10:已注销 11:已关闭 99:未提交
+    @SerializedName("tradeprice") val tradeprice : String? = "",//成交价格(成本价格)
+    @SerializedName("userid") val userid : String? = "",//用户ID
+    @SerializedName("username") val username : String? = "",//用户名称
+    @SerializedName("wrqty") val wrqty : String? = "",//仓单数量(数量)
     //-----以下用于融资明细流水
-    val amount : String? = "",
-    val amounttype : String? = "",
-    val logid : String? = "",
-    var isClick : Int = 0,//是否点击展开
-    val updatetime : String? = ""
+    @SerializedName("amount") val amount : String? = "",
+    @SerializedName("amounttype") val amounttype : String? = "",
+    @SerializedName("logid") val logid : String? = "",
+    @SerializedName("isClick") var isClick : Int = 0,//是否点击展开
+    @SerializedName("updatetime") val updatetime : String? = ""
 
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,142 +1,143 @@
 package cn.muchinfo.rma.global.data
 
 import cn.muchinfo.rma.global.data.chart.HistoryDatas
+import com.google.gson.annotations.SerializedName
 
 /**
  * 盘面信息
  */
 data class QuoteDayData(
-    var ask: Double = 0.0,//卖1
-    var ask10: Double = 0.0,//卖10
-    var ask2: Double = 0.0,//卖2
-    var ask3: Double = 0.0,//卖3
-    var ask4: Double = 0.0,//卖4
-    var ask5: Double = 0.0,//卖5
-    var ask6: Double = 0.0,//卖6
-    var ask7: Double = 0.0,//卖7
-    var ask8: Double = 0.0,//卖8
-    var ask9: Double = 0.0,//卖9
-    var askorderid: Int = 0,//卖单号1
-    var askorderid2: Int = 0,//卖单号2
-    var askorderid3: Int = 0,//卖单号3
-    var askorderid4: Int = 0,//卖单号4
-    var askorderid5: Int = 0,//卖单号5
-    var askordervolume: Int = 0,//卖单量1
-    var askordervolume10: Int = 0,//卖单量10
-    var askordervolume2: Int = 0,//卖单量2
-    var askordervolume3: Int = 0,//卖单量3
-    var askordervolume4: Int = 0,//卖单量4
-    var askordervolume5: Int = 0,//卖单量5
-    var askordervolume6: Int = 0,//卖单量6
-    var askordervolume7: Int = 0,//卖单量7
-    var askordervolume8: Int = 0,//卖单量8
-    var askordervolume9: Int = 0,//卖单量9
-    var askqueueinfo: String = "",//大利市卖港股用
-    var askvolume: Int = 0,//卖量1
-    var askvolume10: Int = 0,//卖量10
-    var askvolume2: Int = 0,//卖量2
-    var askvolume3: Int = 0,//卖量3
-    var askvolume4: Int = 0,//卖量4
-    var askvolume5: Int = 0,//卖量5
-    var askvolume6: Int = 0,//卖量6
-    var askvolume7: Int = 0,//卖量7
-    var askvolume8: Int = 0,//卖量8
-    var askvolume9: Int = 0,//卖量9
-    var averageprice: Double = 0.0,//均价
-    var bid: Double = 0.0,//买1
-    var bid10: Double = 0.0,//买10
-    var bid2: Double = 0.0,//买2
-    var bid3: Double = 0.0,//买3
-    var bid4: Double = 0.0,//买4
-    var bid5: Double = 0.0,//买5
-    var bid6: Double = 0.0,//买6
-    var bid7: Double = 0.0,//买7
-    var bid8: Double = 0.0,//买8
-    var bid9: Double = 0.0,//买9
-    var bidorderid: Int = 0,//买单号1
-    var bidorderid2: Int = 0,//买单号2
-    var bidorderid3: Int = 0,//买单号3
-    var bidorderid4: Int = 0,//买单号4
-    var bidorderid5: Int = 0,//买单号5
-    var bidordervolume: Int = 0,//买单量1
-    var bidordervolume10: Int = 0,//买单量10
-    var bidordervolume2: Int = 0,//买单量2
-    var bidordervolume3: Int = 0,//买单量3
-    var bidordervolume4: Int = 0,//买单量4
-    var bidordervolume5: Int = 0,//买单量5
-    var bidordervolume6: Int = 0,//买单量6
-    var bidordervolume7: Int = 0,//买单量7
-    var bidordervolume8: Int = 0,//买单量8
-    var bidordervolume9: Int = 0,//买单量9
-    var bidqueueinfo: String = "",//大利市买港股用
-    var bidvolume: Int = 0,//买量1
-    var bidvolume10: Int = 0,//买量10
-    var bidvolume2: Int = 0,//买量2
-    var bidvolume3: Int = 0,//买量3
-    var bidvolume4: Int = 0,//买量4
-    var bidvolume5: Int = 0,//买量5
-    var bidvolume6: Int = 0,//买量6
-    var bidvolume7: Int = 0,//买量7
-    var bidvolume8: Int = 0,//买量8
-    var bidvolume9: Int = 0,//买量9
-    var calloptionpremiums: Int = 0,//认购期权1
-    var calloptionpremiums2: Int = 0,//认购期权2
-    var calloptionpremiums3: Int = 0,//认购期权3
-    var calloptionpremiums4: Int = 0,//认购期权4
-    var calloptionpremiums5: Int = 0,//认购期权5
-    var cleartime: String = "",//清盘时间
-    public var exchangecode: Int = 0,//交易所代码
-    var exchangedate: String = "",//交易日
-    var goodscode: String = "",//商品代码
-    var grepmarketprice: Double = 0.0,//暗盘价 港股专用
-    var highest: Double = 0.0,//最高价
-    var holdincrement: Int = 0,//单笔持仓
-    var holdvolume: Int = 0,//持仓
-    var iep: Double = 0.0,//平衡价 港股专用
-    var iev: Double = 0.0,//平衡量 港股专用
-    var inventory: Int = 0,//库存
-    var iscleared: Int = 0,//是否清盘标志
-    var issettled: Int = 0,//是否结算标志
-    var last: Double = 0.0,//最新价
-    var lastlot: Int = 0,//最新成交手数
-    var lasttime: String = "",//行情时间（只有现价变化行情时间才变化）
-    var lastturnover: Double = 0.0,//最新成交金额
-    var lastvolume: Int = 0,//最新成交量
-    var limitdown: Double = 0.0,//跌停价
-    var limitup: Double = 0.0,//涨停价
-    var lowest: Double = 0.0,//最低价
-    var nontotalholdervolume: Int = 0,//非交易持仓量
-    var nontotallot: Int = 0,//非交易总手数
-    var nontotalturnover: String = "",//非交易总金额
-    var nontotalvolume: String = "",//非交易总量
-    var opened: Double = 0.0,//开盘价
-    var opentime: String = "",//开盘时间
-    var orderid: Int = 0,//序号
-    var preclose: Double = 0.0,//昨收
-    var preholdvolume: Int = 0,//昨持仓
-    var presettle: Double = 0.0,//昨结价
-    var publictradetype: String = "",//公共交易标志类型 港股专用
-    var putoptionpremiums: Int = 0,//认沽期权1
-    var putoptionpremiums2: Int = 0,//认沽期权2
-    var putoptionpremiums3: Int = 0,//认沽期权3
-    var putoptionpremiums4: Int = 0,//认沽期权4
-    var putoptionpremiums5: Int = 0,//认沽期权5
-    var settle: Double = 0.0,//结算价
-    var strikeprice: Double = 0.0,//发行价
-    var totalaskvolume: Int = 0,//内盘
-    var totalbidvolume: Int = 0,//外盘
-    var totallot: Int = 0,//总手数
-    var totalturnover: Double = 0.0,//总金额
-    var totalvolume: String = "",//总量
-    var utclasttime: String = "",//utc的行情时间
+    @SerializedName("ask") var ask: Double = 0.0,//卖1
+    @SerializedName("ask10") var ask10: Double = 0.0,//卖10
+    @SerializedName("ask2") var ask2: Double = 0.0,//卖2
+    @SerializedName("ask3") var ask3: Double = 0.0,//卖3
+    @SerializedName("ask4") var ask4: Double = 0.0,//卖4
+    @SerializedName("ask5") var ask5: Double = 0.0,//卖5
+    @SerializedName("ask6") var ask6: Double = 0.0,//卖6
+    @SerializedName("ask7") var ask7: Double = 0.0,//卖7
+    @SerializedName("ask8") var ask8: Double = 0.0,//卖8
+    @SerializedName("ask9") var ask9: Double = 0.0,//卖9
+    @SerializedName("askorderid") var askorderid: Int = 0,//卖单号1
+    @SerializedName("askorderid2") var askorderid2: Int = 0,//卖单号2
+    @SerializedName("askorderid3") var askorderid3: Int = 0,//卖单号3
+    @SerializedName("askorderid4") var askorderid4: Int = 0,//卖单号4
+    @SerializedName("askorderid5") var askorderid5: Int = 0,//卖单号5
+    @SerializedName("askordervolume") var askordervolume: Int = 0,//卖单量1
+    @SerializedName("askordervolume10") var askordervolume10: Int = 0,//卖单量10
+    @SerializedName("askordervolume2") var askordervolume2: Int = 0,//卖单量2
+    @SerializedName("askordervolume3") var askordervolume3: Int = 0,//卖单量3
+    @SerializedName("askordervolume4") var askordervolume4: Int = 0,//卖单量4
+    @SerializedName("askordervolume5") var askordervolume5: Int = 0,//卖单量5
+    @SerializedName("askordervolume6") var askordervolume6: Int = 0,//卖单量6
+    @SerializedName("askordervolume7") var askordervolume7: Int = 0,//卖单量7
+    @SerializedName("askordervolume8") var askordervolume8: Int = 0,//卖单量8
+    @SerializedName("askordervolume9") var askordervolume9: Int = 0,//卖单量9
+    @SerializedName("askqueueinfo") var askqueueinfo: String = "",//大利市卖港股用
+    @SerializedName("askvolume") var askvolume: Int = 0,//卖量1
+    @SerializedName("askvolume10") var askvolume10: Int = 0,//卖量10
+    @SerializedName("askvolume2") var askvolume2: Int = 0,//卖量2
+    @SerializedName("askvolume3") var askvolume3: Int = 0,//卖量3
+    @SerializedName("askvolume4") var askvolume4: Int = 0,//卖量4
+    @SerializedName("askvolume5") var askvolume5: Int = 0,//卖量5
+    @SerializedName("askvolume6") var askvolume6: Int = 0,//卖量6
+    @SerializedName("askvolume7") var askvolume7: Int = 0,//卖量7
+    @SerializedName("askvolume8") var askvolume8: Int = 0,//卖量8
+    @SerializedName("askvolume9") var askvolume9: Int = 0,//卖量9
+    @SerializedName("averageprice") var averageprice: Double = 0.0,//均价
+    @SerializedName("bid") var bid: Double = 0.0,//买1
+    @SerializedName("bid10") var bid10: Double = 0.0,//买10
+    @SerializedName("bid2") var bid2: Double = 0.0,//买2
+    @SerializedName("bid3") var bid3: Double = 0.0,//买3
+    @SerializedName("bid4") var bid4: Double = 0.0,//买4
+    @SerializedName("bid5") var bid5: Double = 0.0,//买5
+    @SerializedName("bid6") var bid6: Double = 0.0,//买6
+    @SerializedName("bid7") var bid7: Double = 0.0,//买7
+    @SerializedName("bid8") var bid8: Double = 0.0,//买8
+    @SerializedName("bid9") var bid9: Double = 0.0,//买9
+    @SerializedName("bidorderid") var bidorderid: Int = 0,//买单号1
+    @SerializedName("bidorderid2") var bidorderid2: Int = 0,//买单号2
+    @SerializedName("bidorderid3") var bidorderid3: Int = 0,//买单号3
+    @SerializedName("bidorderid4") var bidorderid4: Int = 0,//买单号4
+    @SerializedName("bidorderid5") var bidorderid5: Int = 0,//买单号5
+    @SerializedName("bidordervolume") var bidordervolume: Int = 0,//买单量1
+    @SerializedName("bidordervolume10") var bidordervolume10: Int = 0,//买单量10
+    @SerializedName("bidordervolume2") var bidordervolume2: Int = 0,//买单量2
+    @SerializedName("bidordervolume3") var bidordervolume3: Int = 0,//买单量3
+    @SerializedName("bidordervolume4") var bidordervolume4: Int = 0,//买单量4
+    @SerializedName("bidordervolume5") var bidordervolume5: Int = 0,//买单量5
+    @SerializedName("bidordervolume6") var bidordervolume6: Int = 0,//买单量6
+    @SerializedName("bidordervolume7") var bidordervolume7: Int = 0,//买单量7
+    @SerializedName("bidordervolume8") var bidordervolume8: Int = 0,//买单量8
+    @SerializedName("bidordervolume9") var bidordervolume9: Int = 0,//买单量9
+    @SerializedName("bidqueueinfo") var bidqueueinfo: String = "",//大利市买港股用
+    @SerializedName("bidvolume") var bidvolume: Int = 0,//买量1
+    @SerializedName("bidvolume10") var bidvolume10: Int = 0,//买量10
+    @SerializedName("bidvolume2") var bidvolume2: Int = 0,//买量2
+    @SerializedName("bidvolume3") var bidvolume3: Int = 0,//买量3
+    @SerializedName("bidvolume4") var bidvolume4: Int = 0,//买量4
+    @SerializedName("bidvolume5") var bidvolume5: Int = 0,//买量5
+    @SerializedName("bidvolume6") var bidvolume6: Int = 0,//买量6
+    @SerializedName("bidvolume7") var bidvolume7: Int = 0,//买量7
+    @SerializedName("bidvolume8") var bidvolume8: Int = 0,//买量8
+    @SerializedName("bidvolume9") var bidvolume9: Int = 0,//买量9
+    @SerializedName("calloptionpremiums") var calloptionpremiums: Int = 0,//认购期权1
+    @SerializedName("calloptionpremiums2") var calloptionpremiums2: Int = 0,//认购期权2
+    @SerializedName("calloptionpremiums3") var calloptionpremiums3: Int = 0,//认购期权3
+    @SerializedName("calloptionpremiums4") var calloptionpremiums4: Int = 0,//认购期权4
+    @SerializedName("calloptionpremiums5") var calloptionpremiums5: Int = 0,//认购期权5
+    @SerializedName("cleartime") var cleartime: String = "",//清盘时间
+    @SerializedName("exchangecode") var exchangecode: Int = 0,//交易所代码
+    @SerializedName("exchangedate") var exchangedate: String = "",//交易日
+    @SerializedName("goodscode") var goodscode: String = "",//商品代码
+    @SerializedName("grepmarketprice") var grepmarketprice: Double = 0.0,//暗盘价 港股专用
+    @SerializedName("highest") var highest: Double = 0.0,//最高价
+    @SerializedName("holdincrement") var holdincrement: Int = 0,//单笔持仓
+    @SerializedName("holdvolume") var holdvolume: Int = 0,//持仓
+    @SerializedName("iep") var iep: Double = 0.0,//平衡价 港股专用
+    @SerializedName("iev") var iev: Double = 0.0,//平衡量 港股专用
+    @SerializedName("inventory") var inventory: Int = 0,//库存
+    @SerializedName("iscleared") var iscleared: Int = 0,//是否清盘标志
+    @SerializedName("issettled") var issettled: Int = 0,//是否结算标志
+    @SerializedName("last") var last: Double = 0.0,//最新价
+    @SerializedName("lastlot") var lastlot: Int = 0,//最新成交手数
+    @SerializedName("lasttime") var lasttime: String = "",//行情时间（只有现价变化行情时间才变化）
+    @SerializedName("lastturnover") var lastturnover: Double = 0.0,//最新成交金额
+    @SerializedName("lastvolume") var lastvolume: Int = 0,//最新成交量
+    @SerializedName("limitdown") var limitdown: Double = 0.0,//跌停价
+    @SerializedName("limitup") var limitup: Double = 0.0,//涨停价
+    @SerializedName("lowest") var lowest: Double = 0.0,//最低价
+    @SerializedName("nontotalholdervolume") var nontotalholdervolume: Int = 0,//非交易持仓量
+    @SerializedName("nontotallot") var nontotallot: Int = 0,//非交易总手数
+    @SerializedName("nontotalturnover") var nontotalturnover: String = "",//非交易总金额
+    @SerializedName("nontotalvolume") var nontotalvolume: String = "",//非交易总量
+    @SerializedName("opened") var opened: Double = 0.0,//开盘价
+    @SerializedName("opentime") var opentime: String = "",//开盘时间
+    @SerializedName("orderid") var orderid: Int = 0,//序号
+    @SerializedName("preclose") var preclose: Double = 0.0,//昨收
+    @SerializedName("preholdvolume") var preholdvolume: Int = 0,//昨持仓
+    @SerializedName("presettle") var presettle: Double = 0.0,//昨结价
+    @SerializedName("publictradetype") var publictradetype: String = "",//公共交易标志类型 港股专用
+    @SerializedName("putoptionpremiums") var putoptionpremiums: Int = 0,//认沽期权1
+    @SerializedName("putoptionpremiums2") var putoptionpremiums2: Int = 0,//认沽期权2
+    @SerializedName("putoptionpremiums3") var putoptionpremiums3: Int = 0,//认沽期权3
+    @SerializedName("putoptionpremiums4") var putoptionpremiums4: Int = 0,//认沽期权4
+    @SerializedName("putoptionpremiums5") var putoptionpremiums5: Int = 0,//认沽期权5
+    @SerializedName("settle") var settle: Double = 0.0,//结算价
+    @SerializedName("strikeprice") var strikeprice: Double = 0.0,//发行价
+    @SerializedName("totalaskvolume") var totalaskvolume: Int = 0,//内盘
+    @SerializedName("totalbidvolume") var totalbidvolume: Int = 0,//外盘
+    @SerializedName("totallot") var totallot: Int = 0,//总手数
+    @SerializedName("totalturnover") var totalturnover: Double = 0.0,//总金额
+    @SerializedName("totalvolume") var totalvolume: String = "",//总量
+    @SerializedName("utclasttime") var utclasttime: String = "",//utc的行情时间
 
     // 增加字段
-    var ontheprice: Double = 0.0//上一口价
+    @SerializedName("ontheprice") var ontheprice: Double = 0.0//上一口价
 
 ) {
 
     fun getPrice() : Double{
-        var price = 0.0
+         var price = 0.0
         if (last != 0.0){
             price = last
         }else{

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

@@ -2,32 +2,57 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //定投记录(定投管理/详情/定投记录)
 data class RSTriggerLogData(
+    @SerializedName("accountid")
     val accountid : String? = "",//用户资金账户
+    @SerializedName("accountname")
     val accountname: String? = "",//账号名称(ACCOUNTID对应的名称)
+    @SerializedName("currencyid")
     val currencyid : String? = "",//币种id
+    @SerializedName("currencyname")
     val currencyname : String? = "",//币种名称
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("goodscode")
     val goodscode : String? = "",//定投商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//定投商品ID
+    @SerializedName("goodsname")
     val goodsname :String?= "",//定投商品名称
+    @SerializedName("goodunitid")
     val goodunitid : String? = "",//定投商品单位id
+    @SerializedName("logid")
     val logid : String? = "",//LogID(SEQ_QHJ_RSTRIGGERLOG)
+    @SerializedName("regularlycycle")
     val regularlycycle  :String? = "",//定投频率 - 1:每周 2:每月
+    @SerializedName("regularlycyclevalue")
     val regularlycyclevalue : String? = "",//定投频率值 - 每周几(0-6) 或 每月几号(<=28)
+    @SerializedName("regularlymode")
     val regularlymode  :String? = "",//定投方式 - 1:按数量 2:按金额
+    @SerializedName("regularlymodevalue")
     val regularlymodevalue : String? = "",//定投方式值 - 数量或金额
+    @SerializedName("regularlystrategyid")
     val regularlystrategyid : String? = "",//定投策略ID
+    @SerializedName("retcode")
     val retcode :String? = "",//错误码
+    @SerializedName("tradeid")
     val tradeid : String? = "",//成交单ID
+    @SerializedName("triggeramount")
     val triggeramount : String? = "",//触发金额
+    @SerializedName("triggerqty")
     val triggerqty : String? = "",//触发数量
+    @SerializedName("triggerstatus")
     val triggerstatus  : String? = "",//触发状态 - 1:成功 2:失败
+    @SerializedName("triggertime")
     val triggertime : String? = "",//触发时间
+    @SerializedName("triggertradedate")
     val triggertradedate : String? = "",//触发交易日
+    @SerializedName("userid")
     val userid : String? = "",//所属用户ID
+    @SerializedName("username")
     val username : String? = ""//用户名称(userid对应的名称)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,40 +2,73 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //定投设置
 data class RStrategyData(
+    @SerializedName("accountid")
     val accountid : String? = "",//用户资金账户
+    @SerializedName("accountname")
     val accountname: String? = "",//账号名称(ACCOUNTID对应的名称)
+    @SerializedName("currencyid")
     val currencyid : String? = "",//币种id
+    @SerializedName("currencyname")
     val currencyname : String? = "",//币种名称
+    @SerializedName("decimalplace")
     val decimalplace : String? = "",//商品报价小数位
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("goodscode")
     val goodscode : String? = "",//定投商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//定投商品ID
+    @SerializedName("goodsname")
     val goodsname :String?= "",//定投商品名称
+    @SerializedName("goodunitid")
     val goodunitid : String? = "",//定投商品单位id
+    @SerializedName("lasteffecttradedate")
     val lasteffecttradedate : String? = "",//最新生效交易日
+    @SerializedName("laststoptradedate")
     val laststoptradedate : String? = "",//最新暂停交易日
+    @SerializedName("lasttriggertradedate")
     val lasttriggertradedate : String? = "",//最新触发交易日
+    @SerializedName("nexttriggeramount")
     val nexttriggeramount : String? = "",//下次触发金额
+    @SerializedName("nexttriggerdate")
     val nexttriggerdate : String? = "",//下次触发日期
+    @SerializedName("nexttriggerqty")
     val nexttriggerqty : String? = "",//下次触发数量 [按小数位放大值]
+    @SerializedName("regularlycycle")
     val regularlycycle : String? = "",//定投频率 - 1:每周 2:每月
+    @SerializedName("regularlycyclevalue")
     val regularlycyclevalue : String? = "",//定投频率值 - 每周几(0-6) 或 每月几号(<=28)
+    @SerializedName("regularlymode")
     val regularlymode : String? = "",//定投方式 - 1:按数量 2:按金额
+    @SerializedName("regularlymodevalue")
     val regularlymodevalue : String? = "",//定投方式值 - 数量或金额
+    @SerializedName("regularlystrategyid")
     val regularlystrategyid : String? = "",//定投策略ID (SEQ_QHJ_REGULARLYSTRATEGY)
+    @SerializedName("regularlystrategystatus")
     val regularlystrategystatus : String? = "",//策略状态 - 1:正常 2:暂停 3:终止
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("triggersuccesstimes")
     val triggersuccesstimes : String? = "",//累计定投成功次数
+    @SerializedName("triggertotalamount")
     val triggertotalamount : String? = "",//累计定投金额(成功)
+    @SerializedName("triggertotalqty")
     val triggertotalqty :String? = "",//累计定投数量(成功) [按小数位放大值]
+    @SerializedName("triggertotaltimes")
     val triggertotaltimes : String? = "",//累计定投总次数
+    @SerializedName("updatesrc")
     val updatesrc : String? = "",//更新来源 - 1:管理端 2:终端
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
+    @SerializedName("updatorid")
     val updatorid : String? = "",//更新人
+    @SerializedName("userid")
     val userid : String? = "",//所属用户ID
+    @SerializedName("username")
     val username : String? = ""//用户名称(userid对应的名称)
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/RealExposureData.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
 
 /**
  * 实时敞口列表实体
@@ -37,52 +38,52 @@ import android.os.Parcelable
  * @constructor
  */
 data class RealExposureData(
-    val AreaUserID : String? = "",//所属机构
-    val BuyFutureQty : String? = "",//买入期货数量
-    val BuyPlanQty : String? = "",//采购计划数量
-    val BuyPricedQty : String? = "",//采购合同已定价数量
-    val DiffFutuQty : String? = "",//今日变动量(期货) = (买入 - 买入期初) - (卖出 - 卖出期初)
-    val DiffSpotQty : String? = "",//今日变动量(现货) = 现货数量 - 期初现货数量
-    val ENUMDICNAME : String? = "",//单位名称
-    val MiddleGoodsCode : String? = "",//套保品种代码
-    val MiddleGoodsHedgeRatio : String? = "",//应套保比例
-    val MiddleGoodsID : String? = "",//套保品种
-    val MiddleGoodsName : String? = "",//套保品种名称
-    val NeedHedgeExposoure : String? = "",//应套保敞口
-    val NeedHedgeRatio : String? = "",//应套保敞口比例
-    val OriBuyFutureQty : String? = "",//期初买入期货数量
-    val OriBuyPlanQty : String? = "",//期初采购计划数量
-    val OriBuyPricedQty : String? = "",//期初采购合同已定价数量
-    val OriSellFutureQty : String? = "",//期初卖出期货数量
-    val OriSellPlanQty : String? = "",//期初销售计划数量
-    val OriSellPricedQty : String? = "",//期初销售合同已定价数量
-    val OriTotalFutuQty : String? = "",//期初期货数量=期初买入期货数量-期初卖出期货数量
-    val OriTotalSpotQty : String? = "",//期初现货数量=(期初销售计划数量-期初销售合同已定价数量)-(期初采购计划数量-期初采购合同已定价数量)
-    val SellFutureQty : String? = "",//卖出期货数量
-    val SellPlanQty : String? = "",//销售计划数量
-    val SellPricedQty : String? = "",//销售合同已定价数量
-    val TotalExposure : String? = "",//总敞口
-    val TotalFutureQty : String? = "",//期货数量
-    val TotalHedgeRatio : String? = "",//敞口比例
-    val TotalNeedHedgeQty : String? = "",//期货应套保量
-    val TotalSpotQty : String? = "",//现货数量
+    @SerializedName("AreaUserID") val AreaUserID : String? = "",//所属机构
+    @SerializedName("BuyFutureQty") val BuyFutureQty : String? = "",//买入期货数量
+    @SerializedName("BuyPlanQty") val BuyPlanQty : String? = "",//采购计划数量
+    @SerializedName("BuyPricedQty") val BuyPricedQty : String? = "",//采购合同已定价数量
+    @SerializedName("DiffFutuQty") val DiffFutuQty : String? = "",//今日变动量(期货) = (买入 - 买入期初) - (卖出 - 卖出期初)
+    @SerializedName("DiffSpotQty") val DiffSpotQty : String? = "",//今日变动量(现货) = 现货数量 - 期初现货数量
+    @SerializedName("ENUMDICNAME") val ENUMDICNAME : String? = "",//单位名称
+    @SerializedName("MiddleGoodsCode") val MiddleGoodsCode : String? = "",//套保品种代码
+    @SerializedName("MiddleGoodsHedgeRatio") val MiddleGoodsHedgeRatio : String? = "",//应套保比例
+    @SerializedName("MiddleGoodsID") val MiddleGoodsID : String? = "",//套保品种
+    @SerializedName("MiddleGoodsName") val MiddleGoodsName : String? = "",//套保品种名称
+    @SerializedName("NeedHedgeExposoure") val NeedHedgeExposoure : String? = "",//应套保敞口
+    @SerializedName("NeedHedgeRatio") val NeedHedgeRatio : String? = "",//应套保敞口比例
+    @SerializedName("OriBuyFutureQty") val OriBuyFutureQty : String? = "",//期初买入期货数量
+    @SerializedName("OriBuyPlanQty") val OriBuyPlanQty : String? = "",//期初采购计划数量
+    @SerializedName("OriBuyPricedQty") val OriBuyPricedQty : String? = "",//期初采购合同已定价数量
+    @SerializedName("OriSellFutureQty") val OriSellFutureQty : String? = "",//期初卖出期货数量
+    @SerializedName("OriSellPlanQty") val OriSellPlanQty : String? = "",//期初销售计划数量
+    @SerializedName("OriSellPricedQty") val OriSellPricedQty : String? = "",//期初销售合同已定价数量
+    @SerializedName("OriTotalFutuQty") val OriTotalFutuQty : String? = "",//期初期货数量=期初买入期货数量-期初卖出期货数量
+    @SerializedName("OriTotalSpotQty") val OriTotalSpotQty : String? = "",//期初现货数量=(期初销售计划数量-期初销售合同已定价数量)-(期初采购计划数量-期初采购合同已定价数量)
+    @SerializedName("SellFutureQty") val SellFutureQty : String? = "",//卖出期货数量
+    @SerializedName("SellPlanQty") val SellPlanQty : String? = "",//销售计划数量
+    @SerializedName("SellPricedQty") val SellPricedQty : String? = "",//销售合同已定价数量
+    @SerializedName("TotalExposure") val TotalExposure : String? = "",//总敞口
+    @SerializedName("TotalFutureQty") val TotalFutureQty : String? = "",//期货数量
+    @SerializedName("TotalHedgeRatio") val TotalHedgeRatio : String? = "",//敞口比例
+    @SerializedName("TotalNeedHedgeQty") val TotalNeedHedgeQty : String? = "",//期货应套保量
+    @SerializedName("TotalSpotQty") val TotalSpotQty : String? = "",//现货数量
     var rightData : List<String>? = arrayListOf(),//组装的右侧数据
-    val arbitrageqty : String? = "",//套利量
-    val DiffArbitrageQty : String? = "",//套利变动量
-    val DiffExposoureQty : String? = "",//变动量(套保敞口)
-    val DiffHedgeQty : String? = "",//套保变动量
-    val DiffQty : String? = "",//变动量(总敞口)
-    val DiffSpotHedgeQty : String? = "",//变动量(现货应套保总量)
-    val hedgeqty : String? = "",//套保量
-    val needarbitrageqty : String? = "",//应套利量
-    val needarbitrageratio : String? = "",//套利比例
-    val needhedgeqty : String? = "",//应套保量
-    val oriarbitrageqty : String? = "",//期初套利量
-    val orihedgeqty : String? = "",//期初套保量
-    val orineedhedgeexposoure : String?  ="",//期初套保敞口
-    val oritotalexposure : String? = "",//期初总敞口
-    val oritotalfutureqty : String? = "",//期初期货总量
-    val oritotalneedhedgeqty : String? = ""//期初现货应套保量
+    @SerializedName("arbitrageqty") val arbitrageqty : String? = "",//套利量
+    @SerializedName("DiffArbitrageQty") val DiffArbitrageQty : String? = "",//套利变动量
+    @SerializedName("DiffExposoureQty") val DiffExposoureQty : String? = "",//变动量(套保敞口)
+    @SerializedName("DiffHedgeQty") val DiffHedgeQty : String? = "",//套保变动量
+    @SerializedName("DiffQty") val DiffQty : String? = "",//变动量(总敞口)
+    @SerializedName("DiffSpotHedgeQty") val DiffSpotHedgeQty : String? = "",//变动量(现货应套保总量)
+    @SerializedName("hedgeqty") val hedgeqty : String? = "",//套保量
+    @SerializedName("needarbitrageqty") val needarbitrageqty : String? = "",//应套利量
+    @SerializedName("needarbitrageratio") val needarbitrageratio : String? = "",//套利比例
+    @SerializedName("needhedgeqty") val needhedgeqty : String? = "",//应套保量
+    @SerializedName("oriarbitrageqty") val oriarbitrageqty : String? = "",//期初套利量
+    @SerializedName("orihedgeqty") val orihedgeqty : String? = "",//期初套保量
+    @SerializedName("orineedhedgeexposoure") val orineedhedgeexposoure : String?  ="",//期初套保敞口
+    @SerializedName("oritotalexposure") val oritotalexposure : String? = "",//期初总敞口
+    @SerializedName("oritotalfutureqty") val oritotalfutureqty : String? = "",//期初期货总量
+    @SerializedName("oritotalneedhedgeqty") val oritotalneedhedgeqty : String? = ""//期初现货应套保量
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

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

@@ -2,25 +2,41 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 定投价（结算价）
  */
 data class ReckonPriceLogData(
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品ID
+    @SerializedName("lastreckonprice")
     val lastreckonprice : String? = "",//上日结算价
+    @SerializedName("nextdnlimitprice")
     val nextdnlimitprice : String? = "",//下个交易日跌停价
+    @SerializedName("nexttrade")
     val nexttrade : String? = "",//下个交易日
+    @SerializedName("nextuplimitprice")
     val nextuplimitprice : String? = "",//下个交易日涨停价
+    @SerializedName("reckonprice")
     val reckonprice : String? = "",//今日结算价(定投价)
+    @SerializedName("reckontime")
     val reckontime : String? = "",//结算时间
+    @SerializedName("totalholderqty")
     val totalholderqty : String? = "",//总持仓数
+    @SerializedName("totalstock")
     val totalstock : String? = "",//总库存
+    @SerializedName("tradedate")
     val tradedate : String? = "",//交易日
+    @SerializedName("updowncount")
     val updowncount : String? = "",//连续涨(跌)停天数 (涨跌停标志变为0时值归0，变成涨停或是跌停时值为1，连续涨停天数+1，连续跌停天数+1)
+    @SerializedName("updownflag")
     val updownflag : String? = "",//连续涨跌停标志 - 0:无涨跌停 -1:跌停 1:涨停
+    @SerializedName("updownrate")
     val updownrate : String? = "",//今日涨跌幅
+    @SerializedName("updownrate_2d")
     val updownrate_2d : String? = "",//连续两日涨跌幅
+    @SerializedName("updownrate_3d")
     val updownrate_3d : String? = ""//连续三日涨跌幅
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,47 +1,89 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 查询现货损益报表(现货损益报表) Ermcp3
  */
 data class ReportAreaSpotPLData(
+    @SerializedName("actualpl")
     val actualpl : String? = "",//实际损益
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("curamount")
     val curamount : String? = "",//期末额
+    @SerializedName("curaverageprice")
     val curaverageprice : String? = "",//期末均价
+    @SerializedName("curbuyamount")
     val curbuyamount : String? = "",//期末采购总额(采购额)
+    @SerializedName("curbuyqty")
     val curbuyqty : String? = "",//期末采购总量
+    @SerializedName("curmarketvalue")
     val curmarketvalue : String? = "",//参考市值
+    @SerializedName("curqty")
     val curqty : String? = "",//期末量
+    @SerializedName("cursellamount")
     val cursellamount : String? = "",//期末销售总额(销售额)
+    @SerializedName("cursellqty")
     val cursellqty : String? = "",//期末销售总量
+    @SerializedName("curspotprice")
     val curspotprice : String? = "",//参考市价
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种id
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//现货商品单位名称
+    @SerializedName("floatpl")
     val floatpl : String? = "",//浮动损益
+    @SerializedName("gbenumdicname")
     val gbenumdicname : String? = "",//品类单位名称
+    @SerializedName("gbunitid")
     val gbunitid : String? = "",//现货单位id
+    @SerializedName("modelname")
     val modelname : String? = "",//品类名称
+    @SerializedName("oriamount")
     val oriamount : String? = "",//期初额
+    @SerializedName("oriaverageprice")
     val oriaverageprice : String? = "",//期初均价
+    @SerializedName("oribuyamount")
     val oribuyamount : String? = "",//期初采购总额
+    @SerializedName("oribuyqty")
     val oribuyqty : String? = "",//期初采购总量
+    @SerializedName("oriqty")
     val oriqty : String?  ="",//期初量
+    @SerializedName("orisellamount")
     val orisellamount : String? = "",//期初销售总额
+    @SerializedName("orisellqty")
     val orisellqty : String? = "",//期初销售总量
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//现货品牌ID
+    @SerializedName("todaybuyamount")
     val todaybuyamount : String? = "",//今日采购额
+    @SerializedName("todaybuyaverageprice")
     val todaybuyaverageprice : String?  ="",//今日采购均价(采购均价)
+    @SerializedName("todaybuyqty")
     val todaybuyqty : String? = "",//今日采购量(采购增量)
+    @SerializedName("todaysellamount")
     val todaysellamount : String? = "",//今日销售额
+    @SerializedName("todaysellaverageprice")
     val todaysellaverageprice : String? = "",//今日销售均价(销售均价)
+    @SerializedName("todaysellqty")
     val todaysellqty : String? = "",//今日销售量(销售增量)
+    @SerializedName("unitid")
     val unitid : String? = "",//品类单位id
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//品类代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//品类ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//品类名称
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf()//组装的右侧数据
 )

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

@@ -1,6 +1,10 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 data class ReportCommonDetailData(
+    @SerializedName("leftContent")
     var leftContent : String = "",
+    @SerializedName("rightData")
     var rightData : List<String>? = arrayListOf()//组装的右侧数据
 )

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

@@ -2,29 +2,30 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 千海金咨询
  */
 data class SiteColumnDetailData(
-    val author : String? = "",//作者
-    val brief : String? = "",//简介
-    val columnid : String? = "",//所属栏目
-    val context : String? = "",//内容
-    val coverimage : String? = "",//封面图片
-    val creaedate : String? = "",//创建时间
-    val creatorid : String? = "",//创建人
-    val hits : String? = "",//点击数
-    val id : String? = "",//ID(SEQ_SITE_COLUMNDETAIL)
-    val isshow : String? = "",//是否展示 - 0:不展示 1:展示
-    val istop : String? = "",//是否置顶 - 0:不置 1:置顶
-    val modifierid : String? = "",//操作人
-    val publishdate : String? = "",//发布日期
-    val status : String? = "",//状态 - 1:暂存 10:待审核 20:审核通过 30:审核拒绝
-    val title : String? = "",//标题
-    val updatedate : String? = "",//修改时间
-    val userid : String? = "",//用户ID(默认为0， 核心为为机构用户ID)
-    val username : String? = ""//用户名称
+    @SerializedName("author") val author : String? = "",//作者
+    @SerializedName("brief") val brief : String? = "",//简介
+    @SerializedName("columnid") val columnid : String? = "",//所属栏目
+    @SerializedName("context") val context : String? = "",//内容
+    @SerializedName("coverimage") val coverimage : String? = "",//封面图片
+    @SerializedName("creaedate") val creaedate : String? = "",//创建时间
+    @SerializedName("creatorid") val creatorid : String? = "",//创建人
+    @SerializedName("hits") val hits : String? = "",//点击数
+    @SerializedName("id") val id : String? = "",//ID(SEQ_SITE_COLUMNDETAIL)
+    @SerializedName("isshow") val isshow : String? = "",//是否展示 - 0:不展示 1:展示
+    @SerializedName("istop") val istop : String? = "",//是否置顶 - 0:不置 1:置顶
+    @SerializedName("modifierid") val modifierid : String? = "",//操作人
+    @SerializedName("publishdate") val publishdate : String? = "",//发布日期
+    @SerializedName("status") val status : String? = "",//状态 - 1:暂存 10:待审核 20:审核通过 30:审核拒绝
+    @SerializedName("title") val title : String? = "",//标题
+    @SerializedName("updatedate") val updatedate : String? = "",//修改时间
+    @SerializedName("userid") val userid : String? = "",//用户ID(默认为0， 核心为为机构用户ID)
+    @SerializedName("username") val username : String? = ""//用户名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

RMA/app/src/main/java/cn/muchinfo/rma/global/data/SpotContractData.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
 
 /**
  * 查询客户资料
@@ -37,35 +38,35 @@ import android.os.Parcelable
  * @constructor
  */
 data class SpotContractData(
-    val amount : String?,
-    val buyuserid : String?,
-    val buyusername : String?,
-    val contracctstatus : String?,
-    val contractno : String?,
-    val contracttype : String?,
-    val convertfactor : String?,
-    val deliveryenddate : String?,
-    val deliverygoodscode : String?,
-    val deliverygoodsid : String?,
-    val deliverygoodsname : String?,
-    val deliverystartdate : String?,
-    val enddate : String?,
-    val enumdicname : String?,
-    val goodscode : String?,
-    val goodsid : String?,
-    val margin : String?,
-    val price : String?,
-    val pricemove : String?,
-    val pricetype : String?,
-    val producttype : String?,
-    val qty : String?,
-    val remark : String?,
-    val selluserid : String?,
-    val sellusername : String?,
-    val spotcontractid : String?,
-    val spotgoodsdesc : String?,
-    val startdate : String?,
-    val userid : String?
+    @SerializedName("amount") val amount : String?,
+    @SerializedName("buyuserid") val buyuserid : String?,
+    @SerializedName("buyusername") val buyusername : String?,
+    @SerializedName("contracctstatus") val contracctstatus : String?,
+    @SerializedName("contractno") val contractno : String?,
+    @SerializedName("contracttype") val contracttype : String?,
+    @SerializedName("convertfactor") val convertfactor : 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("margin") val margin : String?,
+    @SerializedName("price") val price : String?,
+    @SerializedName("pricemove") val pricemove : String?,
+    @SerializedName("pricetype") val pricetype : String?,
+    @SerializedName("producttype") val producttype : String?,
+    @SerializedName("qty") val qty : String?,
+    @SerializedName("remark") val remark : String?,
+    @SerializedName("selluserid") val selluserid : String?,
+    @SerializedName("sellusername") val sellusername : String?,
+    @SerializedName("spotcontractid") val spotcontractid : String?,
+    @SerializedName("spotgoodsdesc") val spotgoodsdesc : String?,
+    @SerializedName("startdate") val startdate : String?,
+    @SerializedName("userid") val userid : String?
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

RMA/app/src/main/java/cn/muchinfo/rma/global/data/SpotGoodsPriceData.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
 
 /**
  * 查询现货市价(现货市价)
@@ -28,29 +29,53 @@ import android.os.Parcelable
  * @constructor
  */
 data class SpotGoodsPriceData(
-    val areauserid : String? = "",//所属机构id
-    val brandname : String? = "",//品牌名称
-    val currencyid : String? = "",//报价货币ID
-    val deliverygoodscode : String?  ="",//现货商品代码
-    val deliverygoodsid : String? = "",//现货商品id
-    val deliverygoodsname : String? = "",//现货商品名称
-    val enumdicname : String? = "",//现货商品单位名称
-    val gbenumdicname : String? = "",//品类单位名称
-    val gmunitid : String?  ="",//品类单位id
-    val isvalid : String? = "",//是否有效 - 0:无效 1:有效
-    val operateid : String?  ="",//最后操作人
-    val operatesrc : String? = "",//最后操作来源 - 1:管理端 2:终端
-    val operatetime : String?  ="",//最后操作时间
-    val operatorname : String?  ="",//操作人名称
-    val spotgoodsbrandid : String?  ="",//现货品牌ID(通用则为0, 不为0则须先有品类ID)
-    val spotgoodsprice : String? = "",//现货价格
-    val tradedate : String? = "",//交易日(yyyyMMdd)
-    val unitid : String? = "",//现货商品单位id
-    val wrstandardcode : String? = "",//品类代码
-    val wrstandardid : String? = "",//现货品类ID(通用则为0)
-    val wrstandardname : String? = "", //品类名称
-    val logid : String? = "",//logid
-    var isClick : Int = 0,//是否点击展开
+    @SerializedName("areauserid")
+    val areauserid: String? = "",//所属机构id
+    @SerializedName("brandname")
+    val brandname: String? = "",//品牌名称
+    @SerializedName("currencyid")
+    val currencyid: String? = "",//报价货币ID
+    @SerializedName("deliverygoodscode")
+    val deliverygoodscode: String? = "",//现货商品代码
+    @SerializedName("deliverygoodsid")
+    val deliverygoodsid: String? = "",//现货商品id
+    @SerializedName("deliverygoodsname")
+    val deliverygoodsname: String? = "",//现货商品名称
+    @SerializedName("enumdicname")
+    val enumdicname: String? = "",//现货商品单位名称
+    @SerializedName("gbenumdicname")
+    val gbenumdicname: String? = "",//品类单位名称
+    @SerializedName("gmunitid")
+    val gmunitid: String? = "",//品类单位id
+    @SerializedName("isvalid")
+    val isvalid: String? = "",//是否有效 - 0:无效 1:有效
+    @SerializedName("operateid")
+    val operateid: String? = "",//最后操作人
+    @SerializedName("operatesrc")
+    val operatesrc: String? = "",//最后操作来源 - 1:管理端 2:终端
+    @SerializedName("operatetime")
+    val operatetime: String? = "",//最后操作时间
+    @SerializedName("operatorname")
+    val operatorname: String? = "",//操作人名称
+    @SerializedName("spotgoodsbrandid")
+    val spotgoodsbrandid: String? = "",//现货品牌ID(通用则为0, 不为0则须先有品类ID)
+    @SerializedName("spotgoodsprice")
+    val spotgoodsprice: String? = "",//现货价格
+    @SerializedName("tradedate")
+    val tradedate: String? = "",//交易日(yyyyMMdd)
+    @SerializedName("unitid")
+    val unitid: String? = "",//现货商品单位id
+    @SerializedName("wrstandardcode")
+    val wrstandardcode: String? = "",//品类代码
+    @SerializedName("wrstandardid")
+    val wrstandardid: String? = "",//现货品类ID(通用则为0)
+    @SerializedName("wrstandardname")
+    val wrstandardname: String? = "", //品类名称
+    @SerializedName("logid")
+    val logid: String? = "",//logid
+    @SerializedName("isClick")
+    var isClick: Int = 0,//是否点击展开
+    @SerializedName("currencyname")
     val currencyname: String? = ""//结算币种名称
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,5 +1,7 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 现货报表-日报表/月报表实体
  * @property areauserid String?
@@ -17,38 +19,71 @@ package cn.muchinfo.rma.global.data
  * @constructor
  */
 data class SpotReportData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构T
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//现货商品单位名称
+    @SerializedName("reckondate")
     val reckondate : String? = "",//日照时期(yyyyMMdd)  日报表
+    @SerializedName("buyinqty")
     val buyinqty : String? = "",//采购入库量
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货品种代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种id
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货品种名称
+    @SerializedName("selloutqty")
     val selloutqty : String? = "",//销售出库量
+    @SerializedName("todaybuyreckonqty")
     val todaybuyreckonqty : String? = "",//采购确定量
+    @SerializedName("todaysellreckonqty")
     val todaysellreckonqty : String? = "",//销售确定量
+    @SerializedName("totalbuypricedqty")
     val totalbuypricedqty : String? = "",//采购定价量 = 期末 - 期初
+    @SerializedName("totalsellpricedqty")
     val totalsellpricedqty : String? = "",//销售定价量 = 期末 - 期初
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货商品代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货商品名称
+    @SerializedName("cycletime")
     val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】月报表
+    @SerializedName("cycletype")
     val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】 月报表
     //日月报表详情
+    @SerializedName("applyid")
     val applyid : String? = "",//操作人
+    @SerializedName("applyname")
     val applyname : String? = "",//操作人名称
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("biztype")
     val biztype : String? = "",//业务类型 - 1:套保计划 2:现货合同
+    @SerializedName("contracttype")
     val contracttype : String? = "",//现货合同类型 - 1:采购 -1:销售
+    @SerializedName("logdatetime")
     val logdatetime : String? = "",//流水日期(时间)
+    @SerializedName("logid")
     val logid : String? = "",//流水ID(604+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("logtypename")
     val logtypename : String? = "",//合同类型(名称)
+    @SerializedName("logvalue")
     val logvalue : String? = "",//数值
+    @SerializedName("operatelogtype")
     val operatelogtype : String? = "",//操作流水类型 -
+    @SerializedName("optypename")
     val optypename : String? = "",//流水类型名称
+    @SerializedName("relatedid")
     val relatedid : String? = "",//现货合同ID\套保计划
+    @SerializedName("relatedno")
     val relatedno : String? = "",//合同编号
+    @SerializedName("tradedate")
     val tradedate : String? = "",//交易日(yyyyMMdd)
+    @SerializedName("userid")
     val userid : String? = "",//机构ID
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0
 )

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

@@ -2,19 +2,29 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 交易模板配置
  */
 data class TradeConfigTMPData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构
+    @SerializedName("basiccurrencyid")
     val basiccurrencyid : String? = "",//基本币种ID[汇率] - 目标币种
+    @SerializedName("mainaccountid")
     val mainaccountid : String? = "",//主账户ID
+    @SerializedName("modifierid")
     val modifierid : String? = "",//主账户ID
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("tradeconfigtmpid")
     val tradeconfigtmpid : String? = "",//交易配置模板ID(SEQ_TRADECONFIGTMP)
+    @SerializedName("tradeconfigtmpname")
     val tradeconfigtmpname : String? = "",//交易配置模板名称
+    @SerializedName("tradeconfigtmptype")
     val tradeconfigtmptype : String? = "",//交易配置模板类型 - 1:保证金 2:手续费 3:汇率
+    @SerializedName("updatetime")
     val updatetime : String? = ""//更新时间
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,34 +1,36 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 /**
  * 用户账号信息
  */
 data class UserAccountData(
-    val accountname : String = "",//账户名称(机构名称)
-    val accountstatus : Int = 0,//账户状态 - 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:注销
-    val auditremark : String = "",//审核备注
-    val audittime : String = "",//审核时间
-    val audituserid : Long = 0,//审核人
-    val broker : Int = 0,//所属经纪人ID
-    val canceltime : String = "",//销户时间
-    val canceluserid : Int = 0,//销户人
-    val createtime : String = "",//创建时间
-    val creatorid : Long = 0,//创建人
-    val hasauth : Int = 0,//是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
-    val isanonymous : Int = 0,//是否匿名下单 - 0:否 1:是
-    val maxinvestornum : Int = 0,//最大用户数(经纪会员下投资者个数)
-    val canrecommend : String = "",//是否可推荐 - 0:不可 1;可
-    val memberuserid : Long = 0,//所属会员ID
-    val modifierid : Long = 0,//修改人
-    val modifyremark : String = "",//变更备注
-    val modifystatus : Int = 0,//变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)
-    val modifytime : String = "",//修改时间
-    val parentuserid : Long = 0,//所属机构ID
-    val reckonaccountid : Int = 0,//默认结算资金账号ID(机构分润使用) 作废
-    val refercount : Int = 0,//推荐总人数
-    val refereeuserid : Long = 0,//推荐人ID
-    val refernum : String = "",//推荐码
-    val subarealevelpath : String = "",//子机构层级路径(逗号分隔,首尾加逗号)
-    val userid : Long = 0,//用户ID
-    val usertype : Int = 0//1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+    @SerializedName("accountname") val accountname : String = "",//账户名称(机构名称)
+    @SerializedName("accountstatus") val accountstatus : Int = 0,//账户状态 - 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:注销
+    @SerializedName("auditremark") val auditremark : String = "",//审核备注
+    @SerializedName("audittime") val audittime : String = "",//审核时间
+    @SerializedName("audituserid") val audituserid : Long = 0,//审核人
+    @SerializedName("broker") val broker : Int = 0,//所属经纪人ID
+    @SerializedName("canceltime") val canceltime : String = "",//销户时间
+    @SerializedName("canceluserid") val canceluserid : Int = 0,//销户人
+    @SerializedName("createtime") val createtime : String = "",//创建时间
+    @SerializedName("creatorid") val creatorid : Long = 0,//创建人
+    @SerializedName("hasauth") val hasauth : Int = 0,//是否已实名认证 - 0:未认证 1:已认证 2:已提交(待审核) 3:已拒绝
+    @SerializedName("isanonymous") val isanonymous : Int = 0,//是否匿名下单 - 0:否 1:是
+    @SerializedName("maxinvestornum") val maxinvestornum : Int = 0,//最大用户数(经纪会员下投资者个数)
+    @SerializedName("canrecommend") val canrecommend : String = "",//是否可推荐 - 0:不可 1;可
+    @SerializedName("memberuserid") val memberuserid : Long = 0,//所属会员ID
+    @SerializedName("modifierid") val modifierid : Long = 0,//修改人
+    @SerializedName("modifyremark") val modifyremark : String = "",//变更备注
+    @SerializedName("modifystatus") val modifystatus : Int = 0,//变更状态 1 未变更 2 变更中 3 变更待审核 4 变更待复核(投资者)
+    @SerializedName("modifytime") val modifytime : String = "",//修改时间
+    @SerializedName("parentuserid") val parentuserid : Long = 0,//所属机构ID
+    @SerializedName("reckonaccountid") val reckonaccountid : Int = 0,//默认结算资金账号ID(机构分润使用) 作废
+    @SerializedName("refercount") val refercount : Int = 0,//推荐总人数
+    @SerializedName("refereeuserid") val refereeuserid : Long = 0,//推荐人ID
+    @SerializedName("refernum") val refernum : String = "",//推荐码
+    @SerializedName("subarealevelpath") val subarealevelpath : String = "",//子机构层级路径(逗号分隔,首尾加逗号)
+    @SerializedName("userid") val userid : Long = 0,//用户ID
+    @SerializedName("usertype") val usertype : Int = 0//1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
 )// usertype == 6 && canrecommend == 0

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

@@ -2,16 +2,25 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //提现账户设置
 data class UserCollectConfigData(
+    @SerializedName("accountstatus")
     val accountstatus : String? = "",//账户状态 - 1:正常 2:停用 3:注销
+    @SerializedName("collectaccountname")
     val collectaccountname : String? = "",//收款人账户名称
+    @SerializedName("collectaccountno")
     val collectaccountno : String? = "",//收款人账户
+    @SerializedName("collectbankname")
     val collectbankname : String? = "",//收款人开户行
+    @SerializedName("collectbranchbankname")
     val collectbranchbankname : String? = "",//收款人开户支行
+    @SerializedName("collectconfigid")
     val collectconfigid : String? = "",//收款账户配置ID(SEQ_USERCOLLECTCONFIG)
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("userid")
     val userid : String? = ""//收款人用户ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/UserInfoData.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
 
 /**
  * 客户资料
@@ -27,34 +28,63 @@ import android.os.Parcelable
  * @constructor
  */
 data class UserInfoData(
+    @SerializedName("address")
     val address: String? = "",
+    @SerializedName("attachment1")
     val attachment1: String? = "",
+    @SerializedName("cardfrontphotourl")
     val cardfrontphotourl: String? = "",
+    @SerializedName("cardnum")
     val cardnum: String? = "",
+    @SerializedName("cardtype")
     val cardtype: Int? = 0,
+    @SerializedName("cardtypename")
     val cardtypename: String? = "",
+    @SerializedName("cityid")
     val cityid: Int? = 0,
+    @SerializedName("countryid")
     val countryid: Int? = 0,
+    @SerializedName("customername")
     val customername: String? = "",
+    @SerializedName("memberuserid")
     val memberuserid: Int? = 0,
+    @SerializedName("mobile")
     val mobile: String? = "",
+    @SerializedName("provinceid")
     val provinceid: Int? = 0,
+    @SerializedName("remark")
     val remark: String? = "",
+    @SerializedName("status")
     val status: Int? = 0,
+    @SerializedName("statusdesc")
     val statusdesc: String? = "",
+    @SerializedName("telphone")
     val telphone: String? = "",
+    @SerializedName("userid")
     val userid: Long? = 0,
+    @SerializedName("userinfotype")
     val userinfotype: Int? = 0,
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0,
+    @SerializedName("districtid")
     val districtid : Int = 0,
+    @SerializedName("audittime")
     val audittime : String? = "",//审核时间
+    @SerializedName("createtime")
     val createtime : String? = "",//创建时间
+    @SerializedName("modifytime")
     val modifytime : String? = "",//修改时间
+    @SerializedName("cardbackphotourl")
     val cardbackphotourl : String? = "",//证件反面图片地址
+    @SerializedName("contactname")
     val contactname : String? = "",//联系人
+    @SerializedName("email")
     val email : String? = "",//邮件
+    @SerializedName("legalpersonname")
     val legalpersonname : String? = "",//法人姓名(企业)
+    @SerializedName("nickname")
     val nickname : String? = "",//昵称
+    @SerializedName("taxpayernum")
     val taxpayernum : String? = ""//纳税人识别号
 ) : Parcelable {
     constructor(parcel: Parcel) : this(

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

@@ -2,26 +2,45 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //收货地址信息
 data class UserReceiveInfoData(
+    @SerializedName("address")
     val address: String? = "",//提货人详细地址
+    @SerializedName("autoid")
     val autoid: String? = "",//AutoID
+    @SerializedName("cardnum")
     val cardnum: String? = "",//证件号码(加密存储)
+    @SerializedName("cardtypeid")
     val cardtypeid: String? = "",//证件类型
+    @SerializedName("cityid")
     val cityid: String? = "",//市
+    @SerializedName("cityname")
     val cityname: String? = "",//城市名称
+    @SerializedName("countryid")
     val countryid: String? = "",//国家
+    @SerializedName("countryname")
     val countryname: String? = "",//国家名称
+    @SerializedName("districtid")
     val districtid: String? = "",//地区
+    @SerializedName("districtname")
     val districtname: String? = "",//地区名称
+    @SerializedName("hasencrypt")
     val hasencrypt: String? = "",//数据是否已加密 - 0:未加密 1:已加密
+    @SerializedName("isdefault")
     val isdefault: String? = "",//是否默认地址 - 0:否 1:是
+    @SerializedName("phonenum")
     val phonenum: String? = "",//提货人联系方式(加密存储)
+    @SerializedName("provinceid")
     val provinceid: String? = "",//省
+    @SerializedName("provincename")
     val provincename: String? = "",//省名称
+    @SerializedName("receivername")
     val receivername: String? = "",//提货人姓名
+    @SerializedName("takeremark")
     val takeremark: String? = "",//提货备注
+    @SerializedName("userid")
     val userid: String? = ""//用户ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,8 +1,14 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 data class VerificationCodeData(
+    @SerializedName("success")
     val success : Boolean = false,
+    @SerializedName("isSuccess")
     val isSuccess : Boolean = false,
+    @SerializedName("msg")
     val msg : String = "",
+    @SerializedName("message")
     val message : String = ""
 )

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

@@ -2,28 +2,47 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 仓库信息
  */
 data class WarehouseInfoData(
+    @SerializedName("address")
     val address : String? = "",//详细地址
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构
+    @SerializedName("autoid")
     val autoid : String? = "",//自增ID(仓库ID)
+    @SerializedName("cityid")
     val cityid : String? = "",//市
+    @SerializedName("contactname")
     val contactname : String? = "",//联系人
+    @SerializedName("contactnum")
     val contactnum : String? = "",//联系电话
+    @SerializedName("countryid")
     val countryid : String? = "",//国家
+    @SerializedName("createtime")
     val createtime : String? = "",//创建时间
+    @SerializedName("districtid")
     val districtid : String? = "",//区
+    @SerializedName("hasvideo")
     val hasvideo : String? = "",//是否有视频 - 0:无 1:有
+    @SerializedName("provinceid")
     val provinceid : String? = "",//省
+    @SerializedName("remark")
     val remark : String? = "",//审核备注
+    @SerializedName("videourl")
     val videourl : String? = "",//视频地址
+    @SerializedName("warehousecode")
     val warehousecode : String? = "",//仓库代码
+    @SerializedName("warehousename")
     val warehousename : String? = "",//仓库名称
+    @SerializedName("warehousestatus")
     val warehousestatus : String? = "",//仓库状态 - 1:正常 2:注销 3:待审核 4:审核拒绝
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0,
+    @SerializedName("warehousetype")
     val warehousetype : String? = ""//仓库类型 - 1 厂库 2 自有库 3 合作库
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

RMA/app/src/main/java/cn/muchinfo/rma/global/data/WrStandardData.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
 
 /**
  * 现货商品
@@ -21,22 +22,39 @@ import android.os.Parcelable
  * @constructor
  */
 data class WrStandardData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",
+    @SerializedName("createtime")
     val createtime : String? = "",
+    @SerializedName("creatorid")
     val creatorid : String? = "",
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",
+    @SerializedName("minivalue")
     val minivalue : String? = "",
+    @SerializedName("minivaluedp")
     val minivaluedp : String? = "",
+    @SerializedName("realminivalue")
     val realminivalue : String? = "",
+    @SerializedName("realminivaluedp")
     val realminivaluedp : String? = "",
+    @SerializedName("unitid")
     val unitid : String? = "",
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",
+    @SerializedName("isvalid")
     val isvalid : String? = "",//是否有效 0-无效(停用) 1-有效(正常)
+    @SerializedName("remark")
     val remark : String? = "",
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0,
+    @SerializedName("updatetime")
     val updatetime : String? = ""//更新时间
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,5 +1,6 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
 
 
 /**
@@ -11,17 +12,25 @@ package cn.muchinfo.rma.global.data
  * @constructor
  */
 data class WrStandardDetail(
+    @SerializedName("wrd")
     val wrd : WrStandardData = WrStandardData(),
+    @SerializedName("gtList")
     val gtList : List<gtListData> = arrayListOf(),
+    @SerializedName("gbList")
     val gbList : List<gbListData> = arrayListOf(),
+    @SerializedName("wrsList")
     val wrsList : List<wrsListData> = arrayListOf(),
+    @SerializedName("goodsList")
     val goodsList : List<goodsListData> = arrayListOf()
 )
 
 
 data class goodsListData(
+    @SerializedName("goodscode")
     val goodscode : String = "",
+    @SerializedName("goodsid")
     val goodsid : String = "",
+    @SerializedName("goodsname")
     val goodsname : String = ""
 )
 
@@ -34,8 +43,11 @@ data class goodsListData(
  * @constructor
  */
 data class gtListData(
+    @SerializedName("modelid")
     val modelid : String = "",
+    @SerializedName("modelname")
     val modelname : String = "",
+    @SerializedName("updatetime")
     val updatetime : String = ""
 )
 
@@ -47,8 +59,11 @@ data class gtListData(
  * @constructor
  */
 data class gbListData(
+    @SerializedName("brandid")
     val brandid : String = "",
+    @SerializedName("brandname")
     val brandname : String = "",
+    @SerializedName("isvalid")
     val isvalid : String = ""
 )
 
@@ -64,11 +79,18 @@ data class gbListData(
  * @constructor
  */
 data class wrsListData(
+    @SerializedName("wrstandardid")
     val wrstandardid : String = "",
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String = "",
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String = "",
+    @SerializedName("convertratio")
     val convertratio : String = "",
+    @SerializedName("modifytime")
     val modifytime : String = "",
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String = "",
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String = ""
 )

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/tool/DesTools.java

@@ -130,12 +130,12 @@ public class DesTools {
     public static String myServiceAddPass(String content) throws Exception {
         String password = encode(DesTools.getKey(),content);  //des加密
 //       String base64 = Base64.encodeToString(password.getBytes(), Base64.DEFAULT);
-        return password;
-//        return password
-//                .replace("+","*")
-//                .replace("///","-")
-//                .replace("=",".")
-//                .replace("\n","");
+//        return password;
+        return password
+                .replace("+","*")
+                .replace("///","-")
+                .replace("=",".")
+                .replace("\n","");
     }
 
     public static String encode(String content) throws Exception {

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

@@ -11,9 +11,11 @@ object Constant {
 //    const val baseurl = "http://192.168.30.125:8080/cfg?key=test_125"
 //    const val baseurl = "http://192.168.31.114:8080/cfg?key=test_114" // shenzhen01  123123
 //        const val baseurl = "http://192.168.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.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.107:8080/cfg?key=test_107"// 瑶姐 千海金 13760119855
+
 //    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"
 //    const val baseurl = "http://192.168.31.174:8080/cfg?key=test_174"// 邓工

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

@@ -97,7 +97,7 @@ class ExposurePositionDetailsViewholder(
                         if (type == "1"){
                             text = it?.qty + it?.enumdicname
                         }else{
-                            text = if (it?.buyorsell == "0"){""} else{"-"} + it?.tradeqty
+                            text = it?.tradeqty
                         }
                     }
                     textColorInt = R.color.rma_black_33

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

@@ -254,10 +254,14 @@ class NewHomeFragment : BaseFragment<HomeViewModel>() {
                         }
                         textView {
                             viewModel.rootUserAccountData.bindOptional(context) {
-                                if (it?.accountname.isNullOrEmpty()){
+                                if (it == null){
                                     text = "--"
                                 }else{
-                                    text = it?.accountname?.isBlankString()
+                                    if (it.accountname.isNullOrEmpty()){
+                                        text = "--"
+                                    }else{
+                                        text = it.accountname.isBlankString()
+                                    }
                                 }
                             }
                             text = "--"
@@ -271,6 +275,7 @@ class NewHomeFragment : BaseFragment<HomeViewModel>() {
                             viewModel.loginQueryData.bindOptional(context) {
                                 text = it?.loginAccount?.accountname
                             }
+                            text = "--"
                             textColorStr = "#AED6F0"
                             textSizeAuto = 29
                         }.lparams(wrapContent, wrapContent) {

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

@@ -92,6 +92,9 @@ class BusinessManagementViewModel : BaseViewModel() {
                 respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
                     (TimeUtils.string2Millis(t2.applytime) - TimeUtils.string2Millis(t1.applytime)).toInt()
                 })
+                respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t1.applystatus) - TimeUtils.string2Millis(t2.applystatus)).toInt()
+                })
                 somePriceList.postValue(respData)
             }
         }
@@ -111,6 +114,9 @@ class BusinessManagementViewModel : BaseViewModel() {
                 respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
                     (TimeUtils.string2Millis(t2.applytime) - TimeUtils.string2Millis(t1.applytime)).toInt()
                 })
+                respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t1.applystatus) - TimeUtils.string2Millis(t2.applystatus)).toInt()
+                })
                 settlementList.postValue(respData)
             }
         }

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

@@ -230,6 +230,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
             createLoadingDialog(hintStr = "").bindTaskStatus(context, viewModel.loadingDialogStatus)
             background = resources.getDrawable(R.color.segtabment_bg_color)
             viewModel.queryUserInfo()
+            viewModel.queryRootUserAccount()
             viewModel.queryDeliveryGoods()//进入页面查询现货品种
             viewModel.queryAccMgrLoginUser()//查询登录账号
 //            viewModel.queryAccMgrTaaccount()//查询期货账户
@@ -445,17 +446,21 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 // FIXME 后期查询用户资料后需要填写用户名
                                 contractType.bindOptional(context) {
                                     text = if (it?.id == "1") {
-                                        GlobalDataCollection.instance?.userAccountData?.accountname
+                                        viewModel.rootUserAccountData.value?.accountname
                                     } else {
                                         "请选择客户"
                                     }
                                 }
+                                viewModel.rootUserAccountData.bindOptional(context){
+                                    if (contractType.value?.id == "1"){
+                                        text = it?.accountname
+                                    }
+                                }
 
                                 selectCustomer.bindOptional(context) {
                                     if (contractType.value?.id == "-1") {
                                         text = it?.value
                                     }
-
                                 }
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_black_33
@@ -521,7 +526,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 // FIXME 后期查询用户资料后需要填写用户名
                                 contractType.bindOptional(context) {
                                     text = if (it?.id == "-1") {
-                                        GlobalDataCollection.instance?.userAccountData?.accountname
+                                        viewModel.rootUserAccountData.value?.accountname
                                     } else {
                                         if (operationtype == "2"){
                                             data.sellusername
@@ -531,6 +536,11 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
 
                                     }
                                 }
+                                viewModel.rootUserAccountData.bindOptional(context){
+                                    if (contractType.value?.id == "-1"){
+                                        text = it?.accountname
+                                    }
+                                }
                                 selectCustomer.bindOptional(context) {
                                     if (contractType.value?.id == "1") {
                                         text = it?.value

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

@@ -92,6 +92,26 @@ class ContractViewModel : BaseViewModel() {
      * 交易账号列表
      */
     val tradingAccountManagerList: MutableLiveData<List<AccMgrLoginUserData>> = MutableLiveData()
+    /**
+     * 顶级用户信息
+     */
+    val rootUserAccountData : MutableLiveData<RootUserAccountData> = MutableLiveData()
+
+    /**
+     * 查询顶级用户信息
+     */
+    fun queryRootUserAccount(){
+        val params = mutableMapOf<String,String>().apply {
+            put("userid",GlobalDataCollection.instance?.loginRsp?.userID.toString())
+        }
+        MyApplication.getInstance()?.accountManager?.queryRootUserAccount(params = params){isSuccess, respData, error ->
+            if (isSuccess){
+                if (respData?.size ?: 0 > 0){
+                    rootUserAccountData.postValue(respData?.get(0))
+                }
+            }
+        }
+    }
 
     /**
      * 查询账户管理登录账号(账户管理/交易账号)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/financial/FinancialViewModel.kt

@@ -5,7 +5,9 @@ import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.FinancialManageData
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
+import cn.muchinfo.rma.view.autoWidget.toArrayList
 import cn.muchinfo.rma.view.base.BaseViewModel
+import com.blankj.utilcode.util.TimeUtils
 import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.utils.TaskUiModel
 
@@ -75,6 +77,9 @@ class FinancialViewModel : BaseViewModel(){
 
         MyApplication.getInstance()?.financialManager?.queryBusinessKx(params = params){isSuccess, respData, error ->
             if (isSuccess){
+                respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t1.applystatus) - TimeUtils.string2Millis(t2.applystatus)).toInt()
+                })
                 paymentList.postValue(respData)
             }
         }
@@ -90,6 +95,9 @@ class FinancialViewModel : BaseViewModel(){
 
         MyApplication.getInstance()?.financialManager?.queryBusinessFp(params = params){isSuccess, respData, error ->
             if (isSuccess){
+                respData?.toArrayList()?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t1.applystatus) - TimeUtils.string2Millis(t2.applystatus)).toInt()
+                })
                 invoiceList.postValue(respData)
             }
         }

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

@@ -886,6 +886,7 @@ class ExposureReportUI(
                 textView {
                     backgroundResource = R.drawable.rma_time_click_bg
                     onThrottleFirstClick {
+
                         activity.creatBottomSheetDialog("请选择指定交易用户", viewModel.getCanSelectTradingAccount()) {
                             viewModel.exposureSelectTransactionUser.postValue(this)
                         }

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

@@ -595,19 +595,22 @@ class ReportQueryViewModel : BaseViewModel(){
     fun getCanSelectTradingAccount() : List<SelectData>{
         val selectDataList = arrayListOf<SelectData>()
         val userId = GlobalDataCollection.instance?.loginRsp?.userID.toString()
-        tradingAccountManagerList.value?.forEach {
-            if (userId != it.roleid){
-                if (selectDataList.contains(SelectData(id = userId,value = GlobalDataCollection.instance?.userAccountData?.accountname ?: "")).not()){
-                    selectDataList.add(SelectData(id = userId,value = GlobalDataCollection.instance?.userAccountData?.accountname ?: ""))
+        if (GlobalDataCollection.instance?.loginQueryData?.areaRoles?.get(0)?.roletype == "24"){
+            selectDataList.add(SelectData(id = userId,value = GlobalDataCollection.instance?.userAccountData?.accountname ?: ""))
+        }else{
+            tradingAccountManagerList.value?.forEach {
+                if (userId != it.roleid){
+                    if (selectDataList.contains(SelectData(id = userId,value = GlobalDataCollection.instance?.userAccountData?.accountname ?: "")).not()){
+                        selectDataList.add(SelectData(id = userId,value = GlobalDataCollection.instance?.userAccountData?.accountname ?: ""))
+                    }
                 }
-
             }
-        }
-        tradingAccountManagerList.value?.forEach {
-            if (userId == it.roleid){
-                selectDataList.add(SelectData(id = it.roleid ?: "",value = it.rolename ?: ""))
-            }else {
-                selectDataList.add(SelectData(id = it.roleid ?: "",value = it.rolename ?: ""))
+            tradingAccountManagerList.value?.forEach {
+                if (userId == it.roleid){
+                    selectDataList.add(SelectData(id = it.roleid ?: "",value = it.rolename ?: ""))
+                }else {
+                    selectDataList.add(SelectData(id = it.roleid ?: "",value = it.rolename ?: ""))
+                }
             }
         }
 
@@ -751,7 +754,7 @@ class ReportQueryViewModel : BaseViewModel(){
             // '采购均价/\n 销售均价 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todaybuyaverageprice),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todaysellaverageprice),2) )
             // '现货损益/\n 浮动损益 '
-            newRightData.add(it.actualpl + "\n" + it.floatpl)
+            newRightData.add((NumberUtils.roundNum(NumberUtils.doubleDistortion(it.actualpl),2)) + "\n" + (NumberUtils.roundNum(NumberUtils.doubleDistortion(it.floatpl),2)))
             // '最新价/\n 期末市值 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.curspotprice),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.curmarketvalue),2) )
             val newData = it.copy(rightData = newRightData)
@@ -769,10 +772,10 @@ class ReportQueryViewModel : BaseViewModel(){
             val newRightData = arrayListOf<String>()
             //'现货损益/\n 现货浮动损益 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.spotactualpl),2) + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.spotfloatpl),2))
-            //'期货损益/\n 期货浮动损益 '
-            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.futureactualpl),2) + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.futurefloatpl),2))
-            //'实际损益/\n 汇总损益 '
-            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.sumactualpl),2) + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.sumpl),2))
+            //'期货损益/\n 实际损益 '
+            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.futureactualpl),2) + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.sumactualpl),2))
+            // 汇总损益 '
+            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.sumpl),2))
             val newData = it.copy(rightData = newRightData)
             newList.add(newData)
         }
@@ -798,8 +801,8 @@ class ReportQueryViewModel : BaseViewModel(){
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.oriholdamount),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.holdamount),2) )
             //''今开仓额/\n 今平仓额 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todayopenamount),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todaycloseamount),2) )
-            //'开仓均价/\n 平仓均价 ' TODO 缺少'开仓均价/\n 平仓均价 '
-            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todayopenamount),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todaycloseamount),2) )
+            //'开仓均价/\n 平仓均价 '
+            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.openavgprice),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.closeavgprice),2) )
             //'结算价/\n 结算持仓额 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.reckonprice),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.reckonholdamount),2) )
             //'平仓损益/\n 结算损益 '
@@ -807,7 +810,7 @@ class ReportQueryViewModel : BaseViewModel(){
             //'手续费/\n 交易品种期末量 '
             newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.charge),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.goodsgroupspotqty),2) + it.enumdicname )
             //'套保品种/\n 套保品种变动量 ' TODO 缺少套保品种
-            newRightData.add(NumberUtils.roundNum(NumberUtils.doubleDistortion(it.charge),2)  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todaymiddlegoodsqty),2) + it.enumdicname )
+            newRightData.add("--"  + "\n" + NumberUtils.roundNum(NumberUtils.doubleDistortion(it.todaymiddlegoodsqty),2) + it.enumdicname )
             val newData = it.copy(rightData = newRightData)
             newList.add(newData)
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/adapter/FutureReportContentAdapter.java

@@ -127,7 +127,7 @@ public class FutureReportContentAdapter extends RecyclerView.Adapter<FutureRepor
             itemViewHolder.tvLeftTitle.setText(datas.get(i).getCurrencyid());
         }
 
-//        itemViewHolder.tv_left_bottom_title.setText(datas.get(i).getMiddlegoodscode());
+        itemViewHolder.tv_left_bottom_title.setText(datas.get(i).getGoodsgroupname());
         //右边滑动部分
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
@@ -156,7 +156,7 @@ public class FutureReportContentAdapter extends RecyclerView.Adapter<FutureRepor
             }
         });
         if (type.equals("6")){
-            if (GlobalDataCollection.Companion.getInstance().getThreeLevelMenu("client_report","client_report_finance","client_report_futures_account")){//账户明细
+            if (GlobalDataCollection.Companion.getInstance().getThreeLevelMenu("client_report","client_report_futures","client_report_futures_account")){//账户明细
                 itemViewHolder.future_details.setVisibility(View.VISIBLE);
             }else {
                 itemViewHolder.future_details.setVisibility(View.GONE);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reportquery/adapter/SummaryReportContentAdapter.java

@@ -166,7 +166,7 @@ public class SummaryReportContentAdapter extends RecyclerView.Adapter<SummaryRep
         //财务明细
         itemViewHolder.summary_details.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("title","现货报表明细");
+            intent.putExtra("title","损益明细");
             intent.putExtra("time",this.time);
             intent.putExtra("transaction",this.transaction);
             if (data.getCycletype().equals("0")){

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

@@ -675,8 +675,8 @@ class ReportCommonDetailsViewModel : BaseViewModel(){
             data.leftContent = it.reckondate ?: ""//日期
             newRightData.add(it.currencyname  + "\n" + it.middlegoodsname)//'结算币种/\n 套保品种 '
             newRightData.add(NumberUtils.roundNum(it.spotactualpl,2) + "\n" + NumberUtils.roundNum(it.spotfloatpl,2))//'现货损益/\n 现货浮动损益 '
-            newRightData.add(NumberUtils.roundNum(it.futureactualpl,2) + "\n" + NumberUtils.roundNum(it.futurefloatpl,2))//'期货损益/\n 期货浮动损益 '
-            newRightData.add(NumberUtils.roundNum(it.sumactualpl,2) + "\n" + NumberUtils.roundNum(it.sumpl,2))//'实际损益/\n 汇总损益 '
+            newRightData.add(NumberUtils.roundNum(it.futureactualpl,2) + "\n" + NumberUtils.roundNum(it.sumactualpl,2))//'期货损益/\n 实际损益 '
+            newRightData.add(NumberUtils.roundNum(it.sumpl,2))//'实际损益/\n 汇总损益 '
             data.rightData = newRightData
             newList.add(data)
         }
@@ -692,8 +692,8 @@ class ReportCommonDetailsViewModel : BaseViewModel(){
             val newRightData = arrayListOf<String>()
             data.leftContent = it.currencyname  + "\n" + it.middlegoodsname//'结算币种/\n 套保品种 '
             newRightData.add(NumberUtils.roundNum(it.spotactualpl,2) + "\n" + NumberUtils.roundNum(it.spotfloatpl,2))//'现货损益/\n 现货浮动损益 '
-            newRightData.add(NumberUtils.roundNum(it.futureactualpl,2) + "\n" + NumberUtils.roundNum(it.futurefloatpl,2))//'期货损益/\n 期货浮动损益 '
-            newRightData.add(NumberUtils.roundNum(it.sumactualpl,2) + "\n" + NumberUtils.roundNum(it.sumpl,2))//'实际损益/\n 汇总损益 '
+            newRightData.add(NumberUtils.roundNum(it.futureactualpl,2) + "\n" + NumberUtils.roundNum(it.sumactualpl,2))//'期货损益/\n 实际损益 '
+            newRightData.add(NumberUtils.roundNum(it.sumpl,2))//'实际损益/\n 汇总损益 '
             data.rightData = newRightData
             newList.add(data)
         }
@@ -860,7 +860,7 @@ class ReportCommonDetailsViewModel : BaseViewModel(){
         dataList.forEach {
             val data = ReportCommonDetailData()
             val newRightData = arrayListOf<String>()
-            data.leftContent = if (it.contracttype == "1"){ "采购" }else{ "销售" } + "\n" + ViewEnumUtils.getNewHedgeplanstatus(it.hedgeplanstatus)//'计划类型/\n 计划状态 '
+            data.leftContent = if (it.contracttype == "1"){ "采购" }else{ "销售" } + "\n" + it.hedgeplanno//'计划类型/\n 计划名称 '
             newRightData.add(it.deliverygoodsname + "\n" + it.middlegoodsname)//'现货品种/\n 套保品种 '
             newRightData.add(it.wrstandardname + "\n" + NumberUtils.roundNum(it.qty,2) + it.enumdicname)//'现货品类/\n 计划量 '
             newRightData.add(NumberUtils.roundNum(it.diffqty,2) + it.enumdicname + "\n" + NumberUtils.roundNum(it.changqty,2) + it.enumdicname)//'套保品种今变动量/\n 应套保总量变动量 '

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

@@ -242,12 +242,19 @@ class WithdrawalViewModel : BaseViewModel(){
 
     val payInfoRequest : MutableLiveData<String> = MutableLiveData()
     fun getPayInfo(marketId: String = "", orderNo: String = "", orderDate: String = "", totalAmount: String, msgType: String,payType : String) {//从后台获取支付信息
+
         var url = ""
+
         if (SPUtils.getInstance().getString(Constant.otherPayUrl).endsWith("/")){
             url = SPUtils.getInstance().getString(Constant.otherPayUrl) + "pay"
         }else{
             url = SPUtils.getInstance().getString(Constant.otherPayUrl) + "/pay"
         }
+
+        if (url.startsWith("http").not()){
+            return
+        }
+
         loadingDialogStatus.postValue(TaskUiModel.inFlight())
         val json = com.alibaba.fastjson.JSONObject()
         json["accountName"] = GlobalDataCollection.instance?.accountData?.accountid

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

@@ -340,8 +340,8 @@ class ContractDetailsUI(
                     content = data.qty ?: "" + data.enumdicname ?: ""
                 ),
                 ContractDetailsData(title = "保证金", content = data.margin ?: ""),
-                ContractDetailsData(title = "业务员",content = data.saleuserlogincode?.isBlankString() ?: ""),
-                ContractDetailsData(title = "跟单员",content = data.meruserlogincode?.isBlankString() ?: ""),
+                ContractDetailsData(title = "业务员",content = data.saleusername?.isBlankString() ?: ""),
+                ContractDetailsData(title = "跟单员",content = data.merusername?.isBlankString() ?: ""),
                 ContractDetailsData(title = "交易用户",content = data.tradeusername?.isBlankString() ?: ""),
                 ContractDetailsData(title = "备注",content = data.remark?.isBlankString() ?: ""),
                 ContractDetailsData(title = "",content =  ""),

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

@@ -199,14 +199,14 @@ class ProcurementViewModel : BaseViewModel() {
         val newList = arrayListOf<ContractData>()
         respData.forEach {
             val newRightData = arrayListOf<String>()
-            newRightData.add(it.deliverygoodsname + "\n" + it.wrstandardname)
-            newRightData.add(it.goodsname?.isBlankString() + "\n" + it.pricemove)
-            newRightData.add(it.pricedqty + it.enumdicname + "\n" + it.unsureqty+ it.enumdicname)
-            newRightData.add(it.payamount + "\n" + it.unpayamount)
-            newRightData.add(it.invoiceamount + "\n" + it.daikaiamount)
-            newRightData.add(getTimeString(it))
-            newRightData.add(it.convertfactor ?: "--")
-            newRightData.add(it.qty + "\n" + it.unpricedqty)
+            newRightData.add(it.deliverygoodsname + "\n" + it.wrstandardname)//'现货品种/\n商品 '
+            newRightData.add(it.goodsname?.isBlankString() + "\n" + it.pricemove)//'点价合约/\n升贴水 '
+            newRightData.add(it.pricedqty + it.enumdicname + "\n" + it.unsureqty+ it.enumdicname)//已定价量/\n未交收量 '
+            newRightData.add(it.payamount + "\n" + it.unpayamount)//'已付款额/\n应付款额 '
+            newRightData.add(it.invoiceamount + "\n" + it.daikaiamount)//'已收票额/\n应收票额 '
+            newRightData.add(getTimeString(it))//'点价期/\n交收期 '
+            newRightData.add(it.convertfactor ?: "--")//'标仓系数'
+            newRightData.add(it.qty + "\n" + it.unpricedqty)//'合同量/\n未定价量 '
             val newData = it.copy(rightData = newRightData)
             newList.add(newData)
         }