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

RMA/app/src/main/java/cn/muchinfo/rma/global/data/AccMgrBizGroupSetData.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
 
 /**
  * 查询业务类型分组(账户管理/账户设置)实体
@@ -12,11 +13,17 @@ import android.os.Parcelable
  * @constructor
  */
 data class AccMgrBizGroupSetData(
+    @SerializedName("bizgroupid")
     val bizgroupid : String? = "",//业务分组id
+    @SerializedName("biztype")
     val biztype : String? = "",//业务类型 1-套保 2-套利
+    @SerializedName("wrName")
     var wrName : String? = "",//合并起来的现货名称
+    @SerializedName("acclist")
     val acclist : List<Acclist>? = arrayListOf(),
+    @SerializedName("")
     val wrlist : List<Wrlist>? = arrayListOf(),
+    @SerializedName("indexSelect")
     var indexSelect : Int = 0
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -65,10 +72,15 @@ data class AccMgrBizGroupSetData(
  * @constructor
  */
 data class Acclist(
+    @SerializedName("accountid")
     val accountid : String? = "",//账号id
+    @SerializedName("accountname")
     val accountname : String? = "",//账号名称
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构id
+    @SerializedName("bizgroupid")
     val bizgroupid : String? = "",//业务分组id
+    @SerializedName("ismain")
     val ismain : String? = ""//是否主账号 1-是 0-否
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -105,12 +117,19 @@ data class Acclist(
 }
 
 data class Wrlist(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构id
+    @SerializedName("bizgroupid")
     val bizgroupid : String? = "",//分组id
+    @SerializedName("biztype")
     val biztype : String? = "",//业务类型 1-套保 2-套利
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",//现货商品代码
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货商品id
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//现货商品名称
+    @SerializedName("unitid")
     val unitid : String? = ""//现货商品单位id
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,19 +2,28 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 import mtp.polymer.com.autowidget.dialog.SelectData
 
 /**
  * 账户管理登录账号(账户管理/登录账号)
  */
 data class AccMgrLoginUserData(
+    @SerializedName("rolename")
     val rolename : String? = "",//角色名称
+    @SerializedName("userlist")
     val userlist : List<Userlist>? = arrayListOf(),//用户列表
+    @SerializedName("usertype")
     val usertype : String? = "",//用户类型 2-机构 7-企业成员(云平台)
+    @SerializedName("isSelect")
     var isSelect : Int = 1, //是否展开
+    @SerializedName("roleid")
     val roleid : String? = "",//角色id
+    @SerializedName("accountstatus")
     val accountstatus : String? = "",//账户的状态 - 1:待激活 2:待审核 3:待复审 4:正常 5:审核拒绝 6:停用(注销) 7:注销(删除)
+    @SerializedName("mobile")
     val mobile : String? = "",//手机号
+    @SerializedName("querytype")
     val querytype : String? = ""//查询类型 1-业务账户 2-交易账户 3-管理账户
 ): Parcelable{
     constructor(parcel: Parcel) : this(
@@ -58,22 +67,39 @@ data class AccMgrLoginUserData(
 }
 
 data class Userlist(
+    @SerializedName("accountname")
     val accountname: String? = "",//用户名称
+    @SerializedName("clientroleid")
     val clientroleid: String? = "",//角色id(usertype=2)
+    @SerializedName("createtime")
     val createtime: String? = "",//创建时间
+    @SerializedName("loginstatus")
     val loginstatus: String? = "",//登录账户状态 - 1:正常 2:冻结 3:无效
+    @SerializedName("memberuserid")
     val memberuserid: String? = "",//所属会员id
+    @SerializedName("modifytime")
     val modifytime: String? = "",//修改时间
+    @SerializedName("rolename")
     val rolename: String? = "",//角色名称
+    @SerializedName("rolestatus")
     val rolestatus: String? = "",//角色状态 1-启用 2-停用
+    @SerializedName("loginid")
     val loginid : String? = "",//登录id(LOGINID)
+    @SerializedName("roletype")
     val roletype: String? = "",//角色类型(逗号隔开,如22,23), 22:业务员 23:跟单员 24:交易员
+    @SerializedName("userid")
     val userid: String? = "",//用户id
+    @SerializedName("usertype")
     val usertype: String? = "",//用户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+    @SerializedName("isSelect")
     var isSelect: Int = 0,//是否点击展开
+    @SerializedName("mobile")
     val mobile : String? = "",//手机号码
+    @SerializedName("logincode")
     val logincode : String? = "",//登录代码
+    @SerializedName("acclist")
     val acclist : List<Acclist>? = arrayListOf(),
+    @SerializedName("loginname")
     val loginname : String? = ""
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,17 +1,73 @@
 package cn.muchinfo.rma.global.data
 
+import android.os.Parcel
+import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
+
 /**
  * 账户管理主账号详情(账户管理/期货主账号详情)
  */
 data class AccMgrMainAccountInfoData(
+    @SerializedName("accountid")
     val accountid : String? = "",//账号id
+    @SerializedName("appid")
     val appid : String? = "",//AppID
+    @SerializedName("authcode")
     val authcode : String? = "",//授权码
+    @SerializedName("brokerid")
     val brokerid : String? = "",//经纪商id
+    @SerializedName("fcid")
     val fcid : String? = "",//期货公司id
+    @SerializedName("fcname")
     val fcname : String? = "",//期货公司代码
+    @SerializedName("hedgeaccountcode")
     val hedgeaccountcode : String? = "",//外部账号代码
+    @SerializedName("hedgeaccountpwd")
     val hedgeaccountpwd : String? = "",//密码
+    @SerializedName("ismain")
     val ismain : String? = "",//是否主账号
+    @SerializedName("relateduserid")
     val relateduserid : String? = ""//关联用户id
-)
+) : Parcelable{
+    constructor(parcel: Parcel) : this(
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString()
+    ) {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeString(accountid)
+        parcel.writeString(appid)
+        parcel.writeString(authcode)
+        parcel.writeString(brokerid)
+        parcel.writeString(fcid)
+        parcel.writeString(fcname)
+        parcel.writeString(hedgeaccountcode)
+        parcel.writeString(hedgeaccountpwd)
+        parcel.writeString(ismain)
+        parcel.writeString(relateduserid)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<AccMgrMainAccountInfoData> {
+        override fun createFromParcel(parcel: Parcel): AccMgrMainAccountInfoData {
+            return AccMgrMainAccountInfoData(parcel)
+        }
+
+        override fun newArray(size: Int): Array<AccMgrMainAccountInfoData?> {
+            return arrayOfNulls(size)
+        }
+    }
+
+}

RMA/app/src/main/java/cn/muchinfo/rma/global/data/AccMgrRoleData.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 AccMgrRoleData(
+    @SerializedName("areauserid")
     val areauserid : String? = "",//所属机构
+    @SerializedName("autoid")
     val autoid : String? = "",//角色ID(自增ID)
+    @SerializedName("modifierid")
     val modifierid : String? = "",//修改人(创建人)
+    @SerializedName("modifiername")
     val modifiername : String? = "",//修改人名称
+    @SerializedName("modifytime")
     val modifytime : String? = "",//修改时间(创建时间)
+    @SerializedName("rolename")
     val rolename : String? = "",//角色名称
+    @SerializedName("rolestatus")
     val rolestatus : String? = "",//角色状态 - 1:启用 2：停用
+    @SerializedName("roletype")
     val roletype : String?  = "",//角色类型 - 1- 管理端 2- 交易端
+    @SerializedName("indexSelect")
     var indexSelect: Int = 0
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,12 +2,15 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 账户管理角色详情(账户管理/角色设置/角色详情
  */
 data class AccMgrRoleMenuData(
+    @SerializedName("Menu")
     var Menu : RoleSonMenuData? = RoleSonMenuData(),
+    @SerializedName("SubMenu")
     var SubMenu : List<AccMgrRoleMenuData>? = arrayListOf()
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -40,17 +43,29 @@ data class AccMgrRoleMenuData(
 
 
 data class RoleSonMenuData(
+    @SerializedName("iconame")
     val iconame : String? = "",//菜单图标
+    @SerializedName("menutype")
     val menutype : String? = "",//菜单类型 1:管理端 2:交易端 3:终端(企业云平台)
+    @SerializedName("parentcode")
     val parentcode : String? = "",//上级资源代码
+    @SerializedName("remark")
     val remark : String? = "",//菜单备注
+    @SerializedName("resourcecode")
     val resourcecode : String? = "",//菜单代码
+    @SerializedName("resourcelevel")
     val resourcelevel : String? = "",//级别
+    @SerializedName("resourcename")
     val resourcename : String? = "",//菜单名称
+    @SerializedName("roleid")
     val roleid : String? = "",//角色id
+    @SerializedName("sort")
     val sort : String? = "",//排序
+    @SerializedName("url")
     val url : String? = "",//URL
+    @SerializedName("userid")
     val userid : String? = "",//用户id
+    @SerializedName("ishadrole")
     var ishadrole : Boolean? = false//是否有权限
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,53 +2,97 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 账户管理授信(账户管理/账户设置/授信)
  */
 data class AccMgrTaAccountInfoData(
+    @SerializedName("accountid")
     val accountid : String? = "",//资金账户ID
+    @SerializedName("accountname")
     val accountname : String? = "",//账户名称
+    @SerializedName("balance")
     val balance : String? = "",//期初余额
+    @SerializedName("capitalbalance")
     val capitalbalance : String? = "",//本金余额[外部子账户实际出入金余额]
+    @SerializedName("closepl")
     val closepl : String? = "",//今日平仓盈亏
+    @SerializedName("creditdecrease")
     val creditdecrease : String? = "",//今日授信减少
+    @SerializedName("creditincrease")
     val creditincrease : String? = "",//今日授信增加
+    @SerializedName("curdebt")
     val curdebt : String? = "",//期末欠款
+    @SerializedName("currencyid")
     val currencyid : String? = "",//货币ID
+    @SerializedName("currentbalance")
     val currentbalance : String? = "",//期末余额
+    @SerializedName("freezecharge")
     val freezecharge : String? = "",//手续费冻结
+    @SerializedName("freezemargin")
     val freezemargin : String? = "",//冻结保证金
+    @SerializedName("fromaccountid")
     val fromaccountid : String? = "",//所属上级账户
+    @SerializedName("inamount")
     val inamount : String? = "",//今日入金金额(包括三方入金)
+    @SerializedName("ismain")
     val ismain : String? = "",//是否母账号 0:不是母账户 1:是母账户
+    @SerializedName("mortgagecredit")
     val mortgagecredit : String? = "",//授信金额
+    @SerializedName("oridebt")
     val oridebt : String? = "",//期初欠款
+    @SerializedName("orifreezecharge")
     val orifreezecharge : String? = "",//期初手续费冻结
+    @SerializedName("orifreezemargin")
     val orifreezemargin : String? = "",//期初冻结保证金
+    @SerializedName("orimortgagecredit")
     val orimortgagecredit : String? = "",//期初授信金额
+    @SerializedName("oriothercredit")
     val oriothercredit : String? = "",//期初其它授信金额
+    @SerializedName("oriotherfreezemargin")
     val oriotherfreezemargin : String? = "",//期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    @SerializedName("orioutamountfreeze")
     val orioutamountfreeze : String? = "",//期初出金冻结
+    @SerializedName("oriusedmargin")
     val oriusedmargin : String? = "",//期初占用保证金
+    @SerializedName("othercredit")
     val othercredit : String? = "",//其它授信金额
+    @SerializedName("othercreditdecrease")
     val othercreditdecrease : String? = "",//今日其它授信减少
+    @SerializedName("othercreditincrease")
     val othercreditincrease : String? = "",//今日其它授信增加
+    @SerializedName("otherfreezemargin")
     val otherfreezemargin : String? = "",//其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+    @SerializedName("outamount")
     val outamount : String? = "",//今日出金金额(包括三方出金)
+    @SerializedName("outamountfreeze")
     val outamountfreeze : String? = "",//出金冻结
+    @SerializedName("outthreshold")
     val outthreshold : String? = "",//出金阈值
+    @SerializedName("parentaccountid")
     val parentaccountid : String? = "",//所属根账号
+    @SerializedName("paycharge")
     val paycharge : String? = "",//今日手续费支出
+    @SerializedName("relateduserid")
     val relateduserid : String? = "",//关联用户
+    @SerializedName("signstatus")
     val signstatus : String? = "",//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+    @SerializedName("sublevelpath")
     val sublevelpath : String? = "",//账号层级路径(逗号分隔,首尾加逗号)
+    @SerializedName("taaccounttype")
     val taaccounttype : String? = "",//账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+    @SerializedName("thirdinamount")
     val thirdinamount : String? = "",//今日三方入金
+    @SerializedName("thirdoutamount")
     val thirdoutamount : String? = "",//今日三方出金
+    @SerializedName("tradestatus")
     val tradestatus : String? = "",//交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+    @SerializedName("transferamount")
     val transferamount : String? = "",//今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+    @SerializedName("usedmargin")
     val usedmargin : String? = "",//占用保证金
+    @SerializedName("userid")
     val userid : String? = ""//用户ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -2,13 +2,17 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 账户管理期货账号(账户管理/期货账号)
  */
 data class AccMgrTaaccountData(
+    @SerializedName("mainAcc")
     val mainAcc : AccMgrTaaccountSonData? = AccMgrTaaccountSonData(),
+    @SerializedName("subacclist")
     val subacclist : List<AccMgrTaaccountSonData>? = arrayListOf(),//子账户列表
+    @SerializedName("isSelect")
     var isSelect : Int = 1//是否点击展开
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -41,16 +45,27 @@ data class AccMgrTaaccountData(
 }
 
 data class AccMgrTaaccountSonData(
+    @SerializedName("accountid")
     val accountid : String? = "",//账户id
+    @SerializedName("accountname")
     val accountname : String? = "",//账户名称
+    @SerializedName("currencyid")
     val currencyid : String? = "",//币种id
+    @SerializedName("ismain")
     val ismain : String? = "",//是否主账户 0-否 1-是
+    @SerializedName("parentaccountid")
     val parentaccountid : String? = "",//父账户id
+    @SerializedName("relateduserid")
     val relateduserid : String? = "",//关联userid
+    @SerializedName("tradestatus")
     val tradestatus : String? = "",//交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+    @SerializedName("isSelect")
     var isSelect: Int = 0,//是否点击展开/是否选中
+    @SerializedName("fcid")
     val fcid :String? = "",
+    @SerializedName("fcname")
     val fcname : String? = "",
+    @SerializedName("hedgeaccountcode")
     val hedgeaccountcode :String? = ""
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -4,6 +4,7 @@ import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.database.DataBase
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.app.Constant
+import com.google.gson.annotations.SerializedName
 
 /**
  * 资金账户信息
@@ -61,56 +62,107 @@ import cn.muchinfo.rma.view.base.app.Constant
  * @constructor
  */
 open class AccountData(
+    @SerializedName("accountflag")
     val accountflag: Long = 0,//账户标识 - 0\1 (默认为0， 当上级账户与本账户的关联用户均为自己时更新为1)
+    @SerializedName("accountid")
     val accountid: Long = 0,//资金账户ID
+    @SerializedName("accountname")
     val accountname: String = "",//账户名称
+    @SerializedName("balance")
     val balance: Double = 0.0,//期初余额
+    @SerializedName("capitalbalance")
     val capitalbalance: Double = 0.0,//本金余额[外部子账户实际出入金余额]
+    @SerializedName("changeflag")
     val changeflag: Long = 0,//变动标志(当前账户资金有任何变动更新为1系统结算时更新0;供清算时使用) 0：无变动 1：有变动
+    @SerializedName("changetime")
     val changetime: String = "",//账户状态变更时间
+    @SerializedName("closepl")
     val closepl: Double = 0.0,//今日平仓盈亏
+    @SerializedName("creditdecrease")
     val creditdecrease: Double = 0.0,//今日授信减少
+    @SerializedName("creditincrease")
     val creditincrease: Double = 0.0,//今日授信增加
+    @SerializedName("currencyid")
     val currencyid: Int = 0,//货币ID
+    @SerializedName("currentbalance")
     val currentbalance: Double = 0.0,//期末余额
+    @SerializedName("freezecharge")
     val freezecharge: Double = 0.0,//手续费冻结
+    @SerializedName("freezemargin")
     val freezemargin: Double = 0.0,//冻结保证金
+    @SerializedName("fromaccountid")
     val fromaccountid: Long = 0,//所属上级账户
+    @SerializedName("inamount")
     val inamount: Double = 0.0,//今日入金金额(包括三方入金)
+    @SerializedName("ismain")
     val ismain: Int = 0,//是否母账号 0:不是母账户 1:是母账户
+    @SerializedName("ismarketaccount")
     val ismarketaccount: Long = 0,//是否机构接单账号 0:不是 1:是
+    @SerializedName("isreckonaccount")
     val isreckonaccount: Long = 0,//是否机构分润账号 0:不是 1:是
+    @SerializedName("mortgagecredit")
     val mortgagecredit: Double = 0.0,//授信金额
+    @SerializedName("orifreezecharge")
     val orifreezecharge: Double = 0.0,//期初手续费冻结
+    @SerializedName("orifreezemargin")
     val orifreezemargin: Double = 0.0,//期初冻结保证金
+    @SerializedName("orimortgagecredit")
     val orimortgagecredit: Double = 0.0,//期初授信金额
+    @SerializedName("oriothercredit")
     val oriothercredit: Double = 0.0,//期初其它授信金额
+    @SerializedName("oriotherfreezemargin")
     val oriotherfreezemargin: Double = 0.0,//期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    @SerializedName("orioutamountfreeze")
     val orioutamountfreeze: Double = 0.0,//期初出金冻结
+    @SerializedName("oriusedmargin")
     val oriusedmargin: Double = 0.0,//期初占用保证金
+    @SerializedName("othercredit")
     val othercredit: Double = 0.0,//其它授信金额
+    @SerializedName("othercreditdecrease")
     val othercreditdecrease: Double = 0.0,//今日其它授信减少
+    @SerializedName("othercreditincrease")
     val othercreditincrease: Double = 0.0,//今日其它授信增加
+    @SerializedName("otherfreezemargin")
     val otherfreezemargin: Double = 0.0,//其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+    @SerializedName("otherincome")
     val otherincome: Double = 0.0,//其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+    @SerializedName("otherpay")
     val otherpay: Double = 0.0,//其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+    @SerializedName("outamount")
     val outamount: Double = 0.0,//今日出金金额(包括三方出金)
+    @SerializedName("outamountfreeze")
     val outamountfreeze: Double = 0.0,//出金冻结
+    @SerializedName("outthreshold")
     val outthreshold: Double = 0.0,//出金阈值
+    @SerializedName("parentaccountid")
     val parentaccountid: Long = 0,//所属根账号
+    @SerializedName("paycharge")
     val paycharge: Double = 0.0,//今日手续费支出
+    @SerializedName("relatedaccountstatus")
     val relatedaccountstatus: Long = 0,//关联用户交易权限状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)
+    @SerializedName("relateduserid")
     val relateduserid: Long = 0,//关联用户
+    @SerializedName("serivcegroup")
     val serivcegroup: Long = 0,//服务分组
+    @SerializedName("signstatus")
     val signstatus: Long = 0,//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+    @SerializedName("sublevelpath")
     val sublevelpath: String = "",//账号层级路径(逗号分隔,首尾加逗号)
+    @SerializedName("taaccounttype")
     val taaccounttype: Long = 0,//账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+    @SerializedName("thirdinamount")
     val thirdinamount: Double = 0.0,//今日三方入金
+    @SerializedName("thirdoutamount")
     val thirdoutamount: Double = 0.0,//今日三方出金
+    @SerializedName("tradestatus")
     val tradestatus: Long = 0,//交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+    @SerializedName("tradestatuschangetime")
     val tradestatuschangetime: String = "",//激活时间
+    @SerializedName("transferamount")
     val transferamount: Double = 0.0,//今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+    @SerializedName("usedmargin")
     val usedmargin: Double = 0.0,//占用保证金
+    @SerializedName("userid")
     val userid: Long = 0,//用户ID
 
     var close_watch_profit_and_loss: Double = 0.0, //平仓盯市盈亏  7.5

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

@@ -1,47 +1,91 @@
 package cn.muchinfo.rma.global.data
 
+import com.google.gson.annotations.SerializedName
+
 //充值提现
 data class AccountInOutApplyData(
+    @SerializedName("accountcode")
     val accountcode : String = "",//资金账号
+    @SerializedName("accountname")
     val accountname : String = "",//用户名称(名称)
+    @SerializedName("accountpwd")
     val accountpwd : String = "",//资金密码
+    @SerializedName("accountticket")
     val accountticket : String = "",//最新账户服务流水号
+    @SerializedName("amount")
     val amount : String = "",//金额
+    @SerializedName("applyremark")
     val applyremark : String = "",//申请备注
+    @SerializedName("applystatus")
     val applystatus : String = "",//申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中 8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 10:银行入金中 11:成功 12:失败 13:银行审核中 14:账户服务入金失败； 15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 20:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22: 待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；
+    @SerializedName("auditid")
     val auditid : String = "",//审核人
+    @SerializedName("audittime")
     val audittime : String = "",//审核时间
+    @SerializedName("bank_apply_ticket")
     val bank_apply_ticket : String = "",//银行申请流水
+    @SerializedName("bankaccountname")
     val bankaccountname : String = "",//银行账户名
+    @SerializedName("bankaccountno")
     val bankaccountno : String = "",//银行卡号
+    @SerializedName("bankid")
     val bankid : String = "",//银行编号
+    @SerializedName("bankticket")
     val bankticket : String = "",//银行流水
+    @SerializedName("branchbankid")
     val branchbankid : String = "",//银行支行号
+    @SerializedName("branchbankname")
     val branchbankname : String = "",//银行支行名称
+    @SerializedName("capamountout")
     val capamountout : String = "",//出金(劣后本金) - 外部子账户
+    @SerializedName("certificatephotourl")
     val certificatephotourl : String = "",//凭证地址
+    @SerializedName("charge")
     val charge : String = "",//手续费
+    @SerializedName("checkerrorflag")
     val checkerrorflag : String = "",//对账差错标志 - 1:为单边账;其它为正常出入金
+    @SerializedName("currency")
     val currency : String = "",//币种
+    @SerializedName("cusbankid")
     val cusbankid : String = "",//托管银行编号
+    @SerializedName("exchticket")
     val exchticket : String = "",//银行服务流水号
+    @SerializedName("executetype")
     val executetype : String = "",//申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
+    @SerializedName("extendinfo")
     val extendinfo : String = "",//扩展信息
+    @SerializedName("extoperateid")
     val extoperateid : String = "",//交易服务流水号
+    @SerializedName("infamount")
     val infamount : String = "",//劣后金额(自有)
+    @SerializedName("logincode")
     val logincode : String = "",//登录账号(账号)
+    @SerializedName("netaddr")
     val netaddr : String = "",//调转网址
+    @SerializedName("priamount")
     val priamount : String = "",//优先金额(授信)
+    @SerializedName("reauditid")
     val reauditid : String = "",//复审人
+    @SerializedName("reauditremark")
     val reauditremark : String = "",//复审备注
+    @SerializedName("reaudittime")
     val reaudittime : String = "",//复审时间
+    @SerializedName("relatedorderid")
     val relatedorderid : String = "",//三方关联ID
+    @SerializedName("remark")
     val remark : String = "",//备注
+    @SerializedName("remark2")
     val remark2 : String = "",//备注(失败原因)
+    @SerializedName("soucreamount")
     val soucreamount : String = "",//原始出入金金额
+    @SerializedName("soucrecurrencyid")
     val soucrecurrencyid : String = "",//原始出入金币种
+    @SerializedName("tradedate")
     val tradedate : String = "",//交易日(yyyyMMdd)
+    @SerializedName("updatetime")
     val updatetime : String = "",//更新时间(申请时间)
+    @SerializedName("userid")
     val userid : String = "",//用户id
+    @SerializedName("userinfotype")
     val userinfotype : String = ""//账户类型 1-个人 2-企业
 )

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

@@ -2,33 +2,60 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 data class AmountLogData(
+    @SerializedName("OPERATETYPENAME")
     val OPERATETYPENAME : String? = "",//资金操作类型名称
+    @SerializedName("accountid")
     val accountid : String? = "",//资金账户ID
+    @SerializedName("agoodscode")
     val agoodscode : String? = "",//竞拍商品代码
+    @SerializedName("agoodsname")
     val agoodsname : String? = "",//竞拍商品名称
+    @SerializedName("amount")
     val amount : String? = "",//资金金额
+    @SerializedName("amountadjusttype")
     val amountadjusttype : String? = "",//资金调整类型(默认值为0) - 0：系统 1:单边账调整 2:人工调整
+    @SerializedName("autoid")
     val autoid : String? = "",//流水ID(220+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("balance")
     val balance : String? = "",//期初余额
+    @SerializedName("businesscode")
     val businesscode : String? = "",//业务编号
+    @SerializedName("createtime")
     val createtime : String? = "",//发生时间
+    @SerializedName("currencyid")
     val currencyid : String? = "",//币种ID
+    @SerializedName("currentbalance")
     val currentbalance : String? = "",//期末余额(变动后金额)
+    @SerializedName("dgoodscode")
     val dgoodscode : String? = "",//交割商品代码
+    @SerializedName("dgoodsname")
     val dgoodsname : String? = "",//交割商品名称
+    @SerializedName("goodscode")
     val goodscode : String? = "",//商品代码
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品ID
+    @SerializedName("goodsname")
     val goodsname : String? = "",//商品名称
+    @SerializedName("histradedate")
     val histradedate : String? = "",//历史交易日
+    @SerializedName("isvaliddata")
     val isvaliddata : String? = "",//是否有效 - 0:无效 1:有效
+    @SerializedName("marketid")
     val marketid : String? = "",//市场ID
+    @SerializedName("marketname")
     val marketname : String? = "",//市场名称
+    @SerializedName("moneyticket")
     val moneyticket : String? = "",//资金流水号：银行端流水号
+    @SerializedName("operatetype")
     val operatetype : String? = "",//资金操作类型 (AccountFundCmdOp)- 101:入金 102:入金手续费 103:出金 104:出金冻结 105:出金解冻 106:出金手续费 107:出金手续费冻结 108:出金手续费解冻 201:交易冻结 202:交易解冻 203:交易占用 204:交易解占用 205:交易手续费冻结 206:交易手续费解冻 207:交易手续费 208:交易货款 209:交易盈亏 301:交割冻结 302:交割解冻 303:交割手续费 304:交割手续费冻结 305:交割手续费解冻 306:交割货款 307:交割税款 401:结算盈亏 402:结算递延费 403:分润收入 404:延期分润 501:授信增加 502:授信减少 503:转积分 504:转入 505:转出 506:转出冻结 507:转出解冻 601:履约金额冻结 602:履约最大冻结 603:履约金额解冻 604:履约扣款 605:履约收款 606:履约违约手续费 607:履约违约收入 608:履约最大扣款 701:供应链金融冻结 702:供应链金融解冻 703:供应链金融最大冻结 704:供应链金融利息 705:供应链金融货款 706:供应链金融押金 707:供应链金融最大扣款 801:仓单贸易冻结 802:仓单贸易解冻 803:仓单贸易首付款 804:仓单贸易最大扣款 901:商城扣款冻结 902:商城扣款解冻 903:商城扣款 904:商城收款 1001:期权冻结 1002:期权解冻 1003:期权权力金 1004:期权手续费冻结 1005:期权手续费解冻 1006:期权手续费 1007:期权盈亏 1101:营销扣款 1102:营销收款
+    @SerializedName("relationorderid")
     val relationorderid : String? = "",//关联单号
+    @SerializedName("remark")
     val remark : String? = "",//备注
+    @SerializedName("trademode")
     val trademode : String? = ""//交易模式
 ) : Parcelable{
     constructor(parcel: Parcel) : this(

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

@@ -1,43 +1,84 @@
 package cn.muchinfo.rma.global.data
+
+import com.google.gson.annotations.SerializedName
+
 //敞口合同明细(敞口报表/现货合同明细)
 data class AreaExpourseContractDetailData(
+    @SerializedName("biztype")
     val biztype : String = "",//业务类型 1-套保 2-套利
+    @SerializedName("buyuserid")
     val buyuserid : String = "",//采购方id
+    @SerializedName("buyusername")
     val buyusername : String = "",//采购方名称
+    @SerializedName("contractno")
     val contractno : String = "",//合同编号
+    @SerializedName("contracttype")
     val contracttype : String = "",//现货合同类型 - 1:采购 -1:销售
+    @SerializedName("convertratio")
     val convertratio : String = "",//折算系数(套保品种)
+    @SerializedName("curqty")
     val curqty : String = "",//今定价量
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String = "",//现货商品id
+    @SerializedName("diffqty")
     val diffqty : String = "",//套保品种今变动量
+    @SerializedName("enumdicname")
     val enumdicname : String = "",//单位名称
+    @SerializedName("middlegoodscode")
     val middlegoodscode : String = "",//套保品种代码
+    @SerializedName("middlegoodsid")
     val middlegoodsid : String = "",//套保品种id
+    @SerializedName("middlegoodsname")
     val middlegoodsname : String = "",//套保品种名称
+    @SerializedName("needarbitrageratio")
     val needarbitrageratio : String = "",//应套利比例
+    @SerializedName("needhedgeratio")
     val needhedgeratio : String = "",//应套保比例
+    @SerializedName("pricedqty")
     val pricedqty : String = "",//已定价量
+    @SerializedName("qty")
     val qty : String = "",//合同量
+    @SerializedName("selluserid")
     val selluserid : String = "",//销售方id
+    @SerializedName("sellusername")
     val sellusername : String = "",//销售方名称
+    @SerializedName("spotcontractid")
     val spotcontractid : String = "",//合同id
+    @SerializedName("tradedate")
     val tradedate : String = "",//交易日(登记日)
+    @SerializedName("unitid")
     val unitid : String = "",//品类单位id
+    @SerializedName("userid")
     val userid : String = "",//机构id
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String = "",//品类代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String = "",//品类id
+    @SerializedName("wrstandardname")
     val wrstandardname : String = "",//品类名称
     //--------以下是套保----
+    @SerializedName("changqty")
     val changqty : String = "",//应套保总量变化量
+    @SerializedName("hedgeplanid")
     val hedgeplanid : String = "",//套保计划id
+    @SerializedName("hedgeplanno")
     val hedgeplanno : String = "",//套保计划编号
+    @SerializedName("brandname")
     val brandname : String = "",//品牌名称
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String = "",//现货商品代码
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String = "",//现货商品名称
+    @SerializedName("hedgeplanstatus")
     val hedgeplanstatus : String = "",//套保计划状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+    @SerializedName("mgunitidname")
     val mgunitidname : String = "",//单位名称(套保商品)
+    @SerializedName("convertfactor")
     val convertfactor : String = "",//标仓系数
+    @SerializedName("diffhedgeqty")
     val diffhedgeqty : String = "",//套保变动量
+    @SerializedName("diffneedhedgeqty")
     val diffneedhedgeqty : String = "",//应套保变动量
+    @SerializedName("todaypricedqty")
     val todaypricedqty : String = ""//今定价量
 )

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

@@ -2,61 +2,114 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 //新版现货报表实体
 data class AreaSpotplReportData(
-    val accountid : String? = "",//期货账户ID (作废, 默认为0)
-    val accountname : String? = "",//机构名称
-    val actualpl : String? = "",//现货损益
-    val areauserid : String? = "",//所属机构\交易用户ID
-    val biztype : String? = "",//业务类型 - 1:套保 2:套利
-    val brandname : String? = "",//品牌名称
-    val curamount : String? = "",//期末额
-    val curaverageprice : String? = "",//期末均价
-    val curbuyamount : String? = "",//期末采购总额
-    val curbuyqty : String? = "",//期末采购总量
-    val curmarketvalue : String? = "",//参考市值(期末市值)
-    val curqty : String? = "",//期末量
-    val currencyid : String? = "",//结算币种ID【原值】
-    val currencyname : String? = "",//币种名称
-    val cursellamount : String? = "",//期末销售总额
-    val cursellqty : String? = "",//期末销售总量
-    val curspotprice : String? = "",//参考市价(最新价)
-    val cycletime : String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
-    val cycletype : String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
-    val deliverygoodscode : String? = "",//现货商品代码
-    val deliverygoodsid : String? = "",//现货品种ID
-    val deliverygoodsname : String? = "",//现货商品名称
-    val enumdicname : String? = "",//现货商品单位名称
-    val floatpl : String? = "",//浮动损益
-    val goodsunitid : String? = "",//现货商品单位id
-    val oriamount : String? = "",//期初额
-    val oriaverageprice : String? = "",//期初均价
-    val oribuyamount:  String? = "",//期初采购总额
-    val oribuyqty : String? = "",//期初采购总量
-    val oriqty : String? = "",//期初量
-    val orisellamount:  String? = "",//期初销售总额
-    val orisellqty:  String? = "",//期初销售总量
-    val reckondate:  String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("accountid")
+    val accountid: String? = "",//期货账户ID (作废, 默认为0)
+    @SerializedName("accountname")
+    val accountname: String? = "",//机构名称
+    @SerializedName("actualpl")
+    val actualpl: String? = "",//现货损益
+    @SerializedName("areauserid")
+    val areauserid: String? = "",//所属机构\交易用户ID
+    @SerializedName("biztype")
+    val biztype: String? = "",//业务类型 - 1:套保 2:套利
+    @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("currencyid")
+    val currencyid: String? = "",//结算币种ID【原值】
+    @SerializedName("currencyname")
+    val currencyname: String? = "",//币种名称
+    @SerializedName("cursellamount")
+    val cursellamount: String? = "",//期末销售总额
+    @SerializedName("cursellqty")
+    val cursellqty: String? = "",//期末销售总量
+    @SerializedName("curspotprice")
+    val curspotprice: String? = "",//参考市价(最新价)
+    @SerializedName("cycletime")
+    val cycletime: String? = "",//周期时间 月(YYYYMM) 季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
+    @SerializedName("cycletype")
+    val cycletype: String? = "",//周期类型 - 1:月 2:季 3:年 4:周 5:全报表【原值】
+    @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("goodsunitid")
+    val goodsunitid: String? = "",//现货商品单位id
+    @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("reckondate")
+    val reckondate: String? = "",//日照时期(yyyyMMdd)
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid: String? = "",//现货品牌ID
-    val todaybuyamount : String? = "",//今日采购额(今采购额)
-    val todaybuyaverageprice : String? = "",//今日采购均价
+    @SerializedName("todaybuyamount")
+    val todaybuyamount: String? = "",//今日采购额(今采购额)
+    @SerializedName("todaybuyaverageprice")
+    val todaybuyaverageprice: String? = "",//今日采购均价
+    @SerializedName("todaybuyqty")
     val todaybuyqty: String? = "",//今日采购量(今采购量)
+    @SerializedName("todayinqty")
     val todayinqty: String? = "",//今日入库量(今入库量)
-    val todayoutqty : String? ="",//今日出库量(今出库量)
-    val todaysellamount :String? = "",//今日销售额(今销售额)
-    val todaysellaverageprice : String? = "",//今日销售均价
-    val todaysellqty : String? = "",//今日销售量(今销售量)
-    val unitid : String? = "",//品类单位id
-    val unitidname : String? = "",//品类单位名称
-    val updatetime : String? = "",//更新时间
-    val wrfactortypeid : String? = "",//仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
-    val wrstandardcode : String? = "",//品类代码
-    val wrstandardid : String? = "",//现货品类ID
-    val wrstandardname : String? = "",//品类名称
-    val begindate : String? = "",//开始交易日
-    val enddate : String? = "",//结束交易日
-    var rightData : List<String>? = arrayListOf()//组装的右侧数据
+    @SerializedName("todayoutqty")
+    val todayoutqty: String? = "",//今日出库量(今出库量)
+    @SerializedName("todaysellamount")
+    val todaysellamount: String? = "",//今日销售额(今销售额)
+    @SerializedName("todaysellaverageprice")
+    val todaysellaverageprice: String? = "",//今日销售均价
+    @SerializedName("todaysellqty")
+    val todaysellqty: String? = "",//今日销售量(今销售量)
+    @SerializedName("unitid")
+    val unitid: String? = "",//品类单位id
+    @SerializedName("unitidname")
+    val unitidname: String? = "",//品类单位名称
+    @SerializedName("updatetime")
+    val updatetime: String? = "",//更新时间
+    @SerializedName("wrfactortypeid")
+    val wrfactortypeid: String? = "",//仓单要素类型ID(212+Unix秒时间戳(10位)+xxxxxx)
+    @SerializedName("wrstandardcode")
+    val wrstandardcode: String? = "",//品类代码
+    @SerializedName("wrstandardid")
+    val wrstandardid: String? = "",//现货品类ID
+    @SerializedName("wrstandardname")
+    val wrstandardname: String? = "",//品类名称
+    @SerializedName("begindate")
+    val begindate: String? = "",//开始交易日
+    @SerializedName("enddate")
+    val enddate: String? = "",//结束交易日
+    @SerializedName("rightData")
+    var rightData: List<String>? = arrayListOf()//组装的右侧数据
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),

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

RMA/app/src/main/java/cn/muchinfo/rma/global/data/AreaStockApplySumData.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 AreaStockApplySumData(
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("inouttype")
     val inouttype : String? = "",//出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
+    @SerializedName("modelname")
     val modelname : String? = "",//型号名称
+    @SerializedName("spotcontractid")
     val spotcontractid : String? = "",//关联现货合同ID
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//品牌id
+    @SerializedName("spotgoodsmodelid")
     val spotgoodsmodelid : String? = "",//型号id
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//品类id
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//品类名称
+    @SerializedName("totalqty")
     val totalqty : String? = ""//总数量
 ) : Parcelable {
     constructor(parcel: Parcel) : this(

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

@@ -2,35 +2,61 @@ package cn.muchinfo.rma.global.data
 
 import android.os.Parcel
 import android.os.Parcelable
+import com.google.gson.annotations.SerializedName
 
 /**
  * 当前库存
  */
 data class AreaStockData(
+    @SerializedName("brandname")
     val brandname : String? = "",//品牌名称
+    @SerializedName("curstock")
     val curstock : String? = "",//期末库存量(今日量)
+    @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//现货品种ID\
+    @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",
+    @SerializedName("deliverygoodscode")
     val deliverygoodscode : String? = "",
+    @SerializedName("enumdicname")
     val enumdicname : String? = "",//单位名称
+    @SerializedName("modelname")
     val modelname : String? = "",//型号名称
+    @SerializedName("oristock")
     val oristock : String? = "",//期初库存量(昨日量)
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//现货品牌ID
+    @SerializedName("spotgoodsmodelid")
     val spotgoodsmodelid : String? = "",//现货型号ID
+    @SerializedName("todaybuyinqty")
     val todaybuyinqty : String? = "",//今日采购入库量
+    @SerializedName("todayproduceinqty")
     val todayproduceinqty : String? = "",//今日生产入库量
+    @SerializedName("todayproduceoutqty")
     val todayproduceoutqty : String? = "",//今日生产出库量
+    @SerializedName("todayselloutqty")
     val todayselloutqty : String? = "",//今日销售出库量
+    @SerializedName("unitid")
     val unitid : String? = "",//单位id
+    @SerializedName("updatetime")
     val updatetime : String? = "",//更新时间
+    @SerializedName("userid")
     val userid : String? = "",//机构ID
+    @SerializedName("username")
     val username : String? = "",//机构名称
+    @SerializedName("warehousecode")
     val warehousecode : String? = "",//仓库代码
+    @SerializedName("warehouseinfoid")
     val warehouseinfoid : String? = "",//仓库ID
+    @SerializedName("warehousename")
     val warehousename : String? = "",//仓库名称
+    @SerializedName("warehousetype")
     val warehousetype : String? = "",//仓库类型 - 1 厂库 2 自有库 3 合作库
+    @SerializedName("wrstandardcode")
     val wrstandardcode : String? = "",//现货商品代码
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = "",//现货商品ID
+    @SerializedName("wrstandardname")
     val wrstandardname : String? = "",//现货商品名称
     var rightData : List<String>? = arrayListOf()//组装的右侧数据
 ) : Parcelable{

RMA/app/src/main/java/cn/muchinfo/rma/global/data/GoodsExInfoData.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
 
 /**
  * 交易商品扩展表
@@ -18,15 +19,25 @@ import android.os.Parcelable
  * @constructor
  */
 data class GoodsExInfoData(
-    val canfinance : String? = "",//是否支持融资 - 0:不支持 1:支持【69:铂金宝】
-    val canregularlybuy : String? = "",//是否支持定投 - 0:不支持 1:支持【69:铂金宝】
-    val defaulttradeuserid : String? = "",//默认交易用户ID
+    @SerializedName("canfinance") val canfinance : String? = "",//是否支持融资 - 0:不支持 1:支持【69:铂金宝】
+    @SerializedName("canregularlybuy") val canregularlybuy : String? = "",//是否支持定投 - 0:不支持 1:支持【69:铂金宝】
+    @SerializedName("defaulttradeuserid") val defaulttradeuserid : String? = "",//默认交易用户ID
     val deliverygoodsid : String? = "",//现货品种ID
+    @SerializedName("goodsid")
     val goodsid : String? = "",//商品ID(自增ID SEQ_GOODS)
+    @SerializedName("minamount")
     val minamount : String? = "",//最小购买金额
+    @SerializedName("regularlybuyminamount")
     val regularlybuyminamount : String? = "",//定投最小金额
+    @SerializedName("regularlybuyminqty")
     val regularlybuyminqty : String? = "",//定投最小数量
+    @SerializedName("visibilityforenterprise")
+    val visibilityforenterprise : String? = "",//企业客户是否可见 - 0:不可见 1:可见
+    @SerializedName("visibilityforpersonal")
+    val visibilityforpersonal : String? = "",//个人客户是否可见 - 0:不可见 1:可见
+    @SerializedName("spotgoodsbrandid")
     val spotgoodsbrandid : String? = "",//现货品牌ID - 存“DGFactoryItem”表"DGFactoryItemID"
+    @SerializedName("wrstandardid")
     val wrstandardid : String? = ""//现货商品ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -39,6 +50,8 @@ data class GoodsExInfoData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.readString()
     ) {
     }
@@ -52,6 +65,8 @@ data class GoodsExInfoData(
         parcel.writeString(minamount)
         parcel.writeString(regularlybuyminamount)
         parcel.writeString(regularlybuyminqty)
+        parcel.writeString(visibilityforenterprise)
+        parcel.writeString(visibilityforpersonal)
         parcel.writeString(spotgoodsbrandid)
         parcel.writeString(wrstandardid)
     }
@@ -70,4 +85,5 @@ data class GoodsExInfoData(
         }
     }
 
+
 }

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

@@ -150,6 +150,15 @@ class MainActivity : BaseActivity<MainViewModel>() {
             newNormalIcon.add(R.mipmap.qhj_bjb_tab_normal)
             newSelectIcon.add(R.mipmap.qhj_bjb_tab_select)
         }
+
+        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_qhjsphg") == true) {
+            //前海金饰品回收
+            newFragments.add(recyclingFragment)
+            newTabText.add("饰品回收")
+            newNormalIcon.add(R.mipmap.qhj_sphg_tab_normal)
+            newSelectIcon.add(R.mipmap.qhj_sphg_tab_select)
+        }
+
         if (GlobalDataCollection.instance?.getFirstLevelMenu("client_qhjmine") == true) {
             //前海金我的页面
             newFragments.add(seaKingMainFragment)
@@ -157,13 +166,7 @@ class MainActivity : BaseActivity<MainViewModel>() {
             newNormalIcon.add(R.mipmap.qhj_main_tab_normal)
             newSelectIcon.add(R.mipmap.qhj_main_tab_select)
         }
-        if (GlobalDataCollection.instance?.getFirstLevelMenu("client_qhjsphg") == true) {
-            //前海金饰品回收
-            newFragments.add(platinumTreasureFragment)
-            newTabText.add("饰品回收")
-            newNormalIcon.add(R.mipmap.qhj_sphg_tab_normal)
-            newSelectIcon.add(R.mipmap.qhj_sphg_tab_select)
-        }
+
     }
 
     private val dialog by lazy { createLoadingDialog(hintStr = "请求中...") }

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

@@ -677,14 +677,14 @@ class NewInformationUI(private val baseFragment: Fragment, private val viewModul
  */
 fun jumpActivity(context : Context,code : String){
     val intent = Intent()
-    if (code == "client_qhjcztx"){
+    if (code == "client_qhjcztx"){//充值提现
         if (GlobalDataCollection.instance?.bankAccountSignData?.accountcode.isNullOrEmpty()){
             ToastUtils.showLong("请先添加提现账户信息")
             return
         }
         intent.putExtra("selectindex",0)
         intent.setClass(context,WithdrawalActivity::class.java)
-    }else if (code == "client_qhjzjxx"){
+    }else if (code == "client_qhjzjxx"){//千海金交易
         intent.putExtra("goodsId", "0")
         intent.putExtra("outGoodsCode", "0")
         intent.putExtra("index", 5)
@@ -692,12 +692,12 @@ fun jumpActivity(context : Context,code : String){
             context,
             PlatinumTradeActivity::class.java
         )
-    }else if (code == "client_qhjdtgl"){
+    }else if (code == "client_qhjdtgl"){//定投管理
         intent.setClass(
             context,
             MyCastSurelyActivity::class.java
         )
-    }else if (code == "client_qhjjycx"){
+    }else if (code == "client_qhjjycx"){//千海金交易
         intent.putExtra("goodsId", "0")
         intent.putExtra("outGoodsCode", "0")
         intent.putExtra("index", 4)
@@ -705,52 +705,52 @@ fun jumpActivity(context : Context,code : String){
             context,
             PlatinumTradeActivity::class.java
         )
-    }else if (code == "client_spotmarketprice"){
+    }else if (code == "client_spotmarketprice"){//现货市价
         intent.setClass(context, SpotMarketPriceActivity::class.java)
-    }else if (code == "client_stock_manage"){
+    }else if (code == "client_stock_manage"){//库存管理
         intent.setClass(context, InventoryManagerActivity::class.java)
-    }else if (code == "client_stock_aduit"){
+    }else if (code == "client_stock_aduit"){//库存审核
         intent.setClass(context, InventoryAuditActivity::class.java)
-    }else if (code == "client_warehouse"){
+    }else if (code == "client_warehouse"){//仓库信息
         intent.setClass(context, WarehouseInformationActivity::class.java)
-    }else if (code == "client_report"){
+    }else if (code == "client_report"){//报表查询
         intent.setClass(
             context,
             ReportQueryActivity::class.java
         )
-    }else if (code == "client_traderflow"){
+    }else if (code == "client_traderflow"){//交易查询页面
         intent.setClass(
             context,
             TradingQueryActivity::class.java
         )
-    }else if (code == "client_finance"){
+    }else if (code == "client_finance"){//财务管理
         intent.setClass(
             context,
             FinancialActivity::class.java
         )
-    }else if (code == "client_business"){
+    }else if (code == "client_business"){//业务管理页面
         intent.setClass(
             context,
             BusinessManagementActivity::class.java
         )
-    }else if (code == "client_hedgeplan"){
+    }else if (code == "client_hedgeplan"){//套保计划
         intent.setClass(
             context,
             HedgePlanActivity::class.java
         )
-    }else if (code == "client_spotcontract"){
+    }else if (code == "client_spotcontract"){//现货合同页面
         intent.setClass(
             context,
             ContractActivity::class.java
         )
-    }else if (code == "client_accountmanage"){
+    }else if (code == "client_accountmanage"){//账户管理页面
         intent.setClass(context, AccountManagerActivity::class.java)
-    }else if (code == "client_deliverygoods"){
+    }else if (code == "client_deliverygoods"){//现货品种
         intent.setClass(
             context,
             NewCommodityInformationActivity::class.java
         )
-    }else if (code == "client_customer"){
+    }else if (code == "client_customer"){//客户资料列表页
         intent.setClass(
             context,
             CustomerDataActivity::class.java

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/commodity/newcommodity/NewCommodityInformationActivity.kt

@@ -31,6 +31,18 @@ import mtp.polymer.com.autowidget.adapter.BaseAdapter
 import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.viewPager
 
+/**
+ * 现货品种
+ * @property segment QMUITabSegment
+ * @property selectedTabIndex Int
+ * @property viewPager ViewPager
+ * @property selectTab MutableLiveData<Int>
+ * @property newSpotVarietiesUI NewSpotVarietiesUI
+ * @property newHedgeSpeciesUI NewHedgeSpeciesUI
+ * @property newPagerAdapter PagerAdapter?
+ * @property newTabsArray ArrayList<String>
+ * @property uiList ArrayList<_FrameLayout>
+ */
 class NewCommodityInformationActivity : BaseActivity<NewCommodityInformationViewModel>() {
 
 

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

@@ -46,6 +46,18 @@ import org.jetbrains.anko.*
 import org.jetbrains.anko.support.v4.viewPager
 import java.text.SimpleDateFormat
 
+/**
+ * 交易查询页面
+ * @property segment QMUITabSegment
+ * @property selectedTabIndex Int
+ * @property viewPager ViewPager
+ * @property historyCommissionedUI HistoryCommissionedUI
+ * @property historyDealUI HistoryDealUI
+ * @property moneyFlowingUI MoneyFlowingUI
+ * @property newPagerAdapter PagerAdapter?
+ * @property newTabsArray ArrayList<String>
+ * @property uiList ArrayList<_FrameLayout>
+ */
 class TradingQueryActivity : BaseActivity<TradingQueryViewModel>() {
 
 

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

@@ -427,7 +427,7 @@ class EnterpriseRegisterActivity : BaseActivity<RegisterViewModel>() {
                         viewModel.requestEnterpriseInfo(listAgreementID = viewModel.getAgreementIds(viewModel.userNodeCfgAndStatus.value ?: arrayListOf()),username = enterprise_name.text.toString(),vcode = verification_code.text.toString(),logincode = login_code.text.toString(),loginpwd = login_password.text.toString(),mobilephone = phone_number.text.toString(),cardfrontphotourl = uploadFile){
                             createWarningDialog {
                                 setTitle("温馨提示")
-                                setMessage("注册成功，请前往登录")
+                                setMessage("恭喜您注册成功，请耐心等候审核，审核通过后我们会在第一时间通知到您")
                                 addAction("确定") { dialog, _ ->
                                     finish()
                                     dialog.dismiss()

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

@@ -1,6 +1,7 @@
 package cn.muchinfo.rma.view.base.platinumtreasure
 
 import androidx.lifecycle.MutableLiveData
+import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.ColumnsData
 import cn.muchinfo.rma.global.data.account.loginQeruy.GoodsInfo
 import cn.muchinfo.rma.global.database.DataBase
@@ -29,9 +30,24 @@ class PlatinumTreasureViewModel : BaseViewModel(){
     fun initData(tag: String,callback: (isCompleted: Boolean, err: Error?) -> Unit){
         val list = arrayListOf<GoodsInfo>()
         val allList = DataBase.getInstance().goodsInfoDao().all
-        allList.forEach {
-            if (it.trademode == 69 && it.goodsstatus == 3){
-                list.add(it)
+        val goodsExList = GlobalDataCollection.instance?.goodsExInfoDataArrayList
+        allList.forEach {data ->
+            if (data.trademode == 69 && data.goodsstatus == 3){
+                val goodsExData = goodsExList?.find { it?.goodsid == data.goodsid.toString() }
+                if (goodsExData?.goodsid.isNullOrEmpty()){
+                    list.add(data)
+                }else{
+                    if (GlobalDataCollection.instance?.loginQueryData?.userInfo?.userinfotype == 1){//个人
+                        if (goodsExData?.visibilityforpersonal == "1"){
+                            list.add(data)
+                        }
+                    }else if (GlobalDataCollection.instance?.loginQueryData?.userInfo?.userinfotype == 2) {//企业
+                        if (goodsExData?.visibilityforenterprise == "1"){
+                            list.add(data)
+                        }
+                    }
+                }
+
             }
         }
         demoList.postValue(list)

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

@@ -5,6 +5,7 @@ import android.view.Gravity
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.ContractLogData
 import cn.muchinfo.rma.global.data.QhjContractDetailsData
+import cn.muchinfo.rma.global.toPercentage
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
@@ -166,7 +167,7 @@ class FinancingDetailsActivity : BaseActivity<PlatinumTradeViewModel>(){
                 }
 
                 textView {
-                    text = data.marginratio
+                    text = data.marginratio?.toPercentage()
                     textSizeAuto = 36
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)
@@ -262,7 +263,7 @@ class FinancingDetailsActivity : BaseActivity<PlatinumTradeViewModel>(){
                 verticalLayout {
                     gravity = Gravity.RIGHT
                     textView {
-                        text = "剩余款额"
+                        text = "剩余货款"
                         textSizeAuto = 36
                         textColorInt = R.color.rma_gray_color
                     }.lparams(wrapContent, wrapContent){

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

@@ -58,7 +58,6 @@ class PlatinumTradeActivity : BaseActivity<PlatinumTradeViewModel>(){
         "platinumtradeorder"
     }
 
-
     lateinit var segment: QMUITabSegment
     var selectedTabIndex: Int = 0
     private lateinit var viewPager: ViewPager
@@ -149,6 +148,7 @@ class PlatinumTradeActivity : BaseActivity<PlatinumTradeViewModel>(){
         }
     }
 
+
     //行情推送通知
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onQuoteMessageEvent(quoteMessageEvent: QuoteMessageEvent) {
@@ -185,9 +185,21 @@ class PlatinumTradeActivity : BaseActivity<PlatinumTradeViewModel>(){
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMeesageChangeTradeId(tradeMessageEvent: TradeMessageEvent){
         if (tradeMessageEvent.buyOrSell == 0){
+            platinumBuyUI.initData(
+                goodsId = tradeMessageEvent.goodsId,
+                buyOrSell = tradeMessageEvent.buyOrSell,
+                outGoodsCode = tradeMessageEvent.outGoodsCode,
+                isShowLoading = false
+            )
             segment.setupWithViewPager(viewPager)
             segment.selectTab(0)
         }else if (tradeMessageEvent.buyOrSell == 1){
+            platinumSellUI.initData(
+                goodsId = tradeMessageEvent.goodsId,
+                buyOrSell = tradeMessageEvent.buyOrSell,
+                outGoodsCode = tradeMessageEvent.outGoodsCode,
+                isShowLoading = false
+            )
             segment.setupWithViewPager(viewPager)
             segment.selectTab(1)
         }

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

@@ -442,6 +442,10 @@ class PlatinumTradeViewModel : BaseViewModel() {
         }
         MyApplication.getInstance()?.contractGoodsManager?.queryContract(params = params){isSuccess, respData, error ->
             if (isSuccess){
+                val newList = respData?.toArrayList()
+                newList?.sortWith(Comparator { t1, t2 ->
+                    (TimeUtils.string2Millis(t2.contractconfirmtime) - TimeUtils.string2Millis(t1.contractconfirmtime)).toInt()
+                })
                 qhjContractDetailsData.postValue(respData)
             }
         }