风险管理5月24日提交代码-liu.bolan——部分千海金代码

RMA/app/src/main/java/cn/muchinfo/rma/business/commodity/adapter/CommodityAdapter.kt

@@ -38,10 +38,11 @@ object CommodityAdapter {
         wrsconvertdetails: List<ManageServiceMI2.WRSConvertDetailEx> = arrayListOf()
     ): Packet50 {
         val builder = ManageServiceMI2.DeliveryGoodsApplyReq.newBuilder()
-        if (type == 1){
-            builder.deliverygoodscode = deliverygoodscode
-            builder.deliverygoodsname = deliverygoodsname
-        }
+//        if (type == 1){//这行代码真的是日了狗，proto上写的修改不传的，结果后面竟然需要传。。。。。。。。。。。。
+
+//        }
+        builder.deliverygoodscode = deliverygoodscode
+        builder.deliverygoodsname = deliverygoodsname
         if (wrstandardid != 0L){
             builder.deliverygoodsid = wrstandardid
         }

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

@@ -15,6 +15,7 @@ import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.exposure.ExposureFragment
 import cn.muchinfo.rma.view.base.future.FutureFragment
 import cn.muchinfo.rma.view.base.home.HomeFragment
+import cn.muchinfo.rma.view.base.main.SeaKingMainFragment
 import cn.muchinfo.rma.view.base.procurement.ProcurementFragment
 import cn.muchinfo.rma.view.base.sale.SaleFragment
 import cn.muchinfo.rma.view.eventbus.EventConstent
@@ -59,6 +60,10 @@ class MainActivity : BaseActivity<MainViewModel>() {
         ExposureFragment()
     }
 
+    val seaKingMainFragment by lazy {
+        SeaKingMainFragment()
+    }
+
     /** 状态控制页 **/
     private lateinit var statusLayout: StatusLayout
 
@@ -141,6 +146,22 @@ class MainActivity : BaseActivity<MainViewModel>() {
             newSelectIcon.add(R.mipmap.rma_select_main_tab_5)
         }
 
+        //前海金我的页面
+        newFragments.add(seaKingMainFragment)
+        newTabText.add("我的")
+        newNormalIcon.add(R.mipmap.qhj_main_tab_normal)
+        newSelectIcon.add(R.mipmap.qhj_main_tab_select)
+
+        //前海金铂金宝
+//        newTabText.add("铂金宝")
+//        newNormalIcon.add(R.mipmap.qhj_bjb_tab_normal)
+//        newSelectIcon.add(R.mipmap.qhj_bjb_tab_select)
+
+        //前海金饰品回购
+//        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/accountmanager/AccountManagerActivity.kt

@@ -393,7 +393,7 @@ class TradingAccountManager(
 //                bindTaskStatus(viewModule.status)
                 swipeToLoadLayout {
                     swipeToLayout = this
-                    setEnableRefresh(false)
+                    setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
                         viewModel.queryTradingAccMgrLoginUser()
@@ -695,7 +695,7 @@ class FuturesAccountManager(
 //                bindTaskStatus(viewModule.status)
                 swipeToLoadLayout {
                     swipeToLayout = this
-                    setEnableRefresh(false)
+                    setEnableRefresh(true)
                     setEnableLoadMore(false)
                     setOnRefreshListener {
                         viewModel.queryAccMgrTaaccount()

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/accountmanager/accountviewholder/AccountManagerViewHolder.kt

@@ -89,6 +89,7 @@ class AccountManagerViewHolder(
                             intent.putExtra("type","1")
                             intent.putExtra("data",data.value)
                             intent.putExtra("data1",Userlist())
+                            intent.putExtra("salesOrTraders",data.value?.roleid)
                             intent.putExtra("seletType", viewModel.getPassRoleList() as Serializable)
                             intent.setClass(context,AddLoginRoleActivity::class.java)
                             ActivityUtils.startActivity(intent)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/accountmanager/futureaccount/AddFutureSonAccountActivity.kt

@@ -54,7 +54,7 @@ class AddFutureSonAccountActivity : BaseActivity<FutureAccountViewModel>() {
      */
     fun init() {
         viewModel.queryTradeConfigTMP()
-        viewModel.queryTradingAccMgrLoginUser()
+        viewModel.queryTradingAccMgrLoginUser(type = type ?: "",relateduserid = data.relateduserid ?: "")
     }
 
     val dialog by lazy { createLoadingDialog(hintStr = "请求中...") }
@@ -138,7 +138,7 @@ class AddFutureSonAccountActivity : BaseActivity<FutureAccountViewModel>() {
                     textSizeAuto = 31
                     textColorStr = "#333333"
                 }.lparams(matchParent, autoSize(132)) {
-                    marginStart = autoSize(80)
+                    marginStart = autoSize(120)
                 }
             }.lparams(matchParent, autoSize(132))
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/accountmanager/futureaccount/FutureAccountViewModel.kt

@@ -207,7 +207,7 @@ class FutureAccountViewModel : BaseViewModel(){
     /**
      * 查询账户管理登录账号(账户管理/交易账号)
      */
-    fun queryTradingAccMgrLoginUser(){
+    fun queryTradingAccMgrLoginUser(type : String = "",relateduserid: String = ""){
         val params = mutableMapOf<String, String>().apply {
             put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
             put("querytype", "2")
@@ -215,6 +215,22 @@ class FutureAccountViewModel : BaseViewModel(){
         MyApplication.getInstance()?.accountManager?.queryAccMgrLoginUser(params = params){isSuccess, respData, error ->
             if (isSuccess){
                 tradingAccountManagerList.postValue(respData)
+                if (type == "2" || type == "3"){
+                    resetFutureSonTradingInfo(respData ?: arrayListOf(),relateduserid)
+                }
+            }
+        }
+    }
+
+    /**
+     * 期货子账户看详情和修改的交易用户信息回填
+     * @param dataList List<AccMgrLoginUserData>
+     * @param relateduserid String
+     */
+    fun resetFutureSonTradingInfo(dataList : List<AccMgrLoginUserData>,relateduserid: String){
+        dataList.forEach {
+            if (it.roleid == relateduserid){
+                selectTradingAccountData.postValue(SelectData(id = it.roleid,value = it.rolename ?: ""))
             }
         }
     }

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

@@ -23,7 +23,7 @@ import org.jetbrains.anko.*
 import org.json.JSONObject
 
 /**
- *  管理 - 结算审核页面
+ *  管理 - 交收审核页面
  */
 class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
 
@@ -57,9 +57,9 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
                 commonLeftButton()
                 commonTitle {
                     text = if (type == "1"){
-                        "结算审核"
+                        "交收审核"
                     }else{
-                        "结算详情"
+                        "交收详情"
                     }
                 }
             }
@@ -209,7 +209,7 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
                                     gravity = Gravity.CENTER_VERTICAL
                                     linearLayout {
                                         textView {
-                                            text = "结算量"
+                                            text = "交收量"
                                             textColorInt = R.color.p_normal_summary_txt_color
                                             textSizeAuto = 29
                                         }.lparams(wrapContent, wrapContent) {

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

@@ -590,9 +590,9 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
         viewModel.spotModelcacheList.value?.forEach {
             val spotGoodsData = ManageServiceMI2.GLDWRStandardEx.newBuilder()
             spotGoodsData.wrstandardname = it.value
-            if (isAdd) {
-//                spotGoodsData.wrstandardid = it
-            } else {
+            if (it.middleGoodsId.isNullOrEmpty()){
+                spotGoodsData.wrstandardid = 0//修改时才加
+            }else{
                 spotGoodsData.wrstandardid = it.middleGoodsId.toLong()//修改时才加
             }
             spotGoodsData.unitid = it.enumdicnameid.toLong()
@@ -612,9 +612,13 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
         viewModel.brandModelcacheList.value?.forEach {
             val spotGoodsData = ManageServiceMI2.GLDDGFactoryItemEx.newBuilder()
             spotGoodsData.dgfactoryitemvalue = it.value
-            if (isAdd.not()) {
+            if (it.middleGoodsId.isNullOrEmpty()){
+                spotGoodsData.dgfactoryitemid = 0
+            }else{
                 spotGoodsData.dgfactoryitemid = it.middleGoodsId.toLong()
             }
+            if (isAdd.not()) {
+            }
             LogUtils.eTag("asdhahsdkjahdjka", spotGoodsData.dgfactoryitemid)
             brandgoodsmodels.add(spotGoodsData.build())
         }
@@ -643,11 +647,14 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
      */
     private fun checkUpdate(): Boolean {
 
-        if (spot_variety_name_edittext.text.toString().isNullOrEmpty()) {
-            ToastUtils.showLong("请输入商品名称")
-            return false
+        if (type == "1"){
+            if (spot_variety_name_edittext.text.toString().isNullOrEmpty()) {
+                ToastUtils.showLong("请输入商品名称")
+                return false
+            }
         }
 
+
         if (selectUnitType.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择单位")
             return false
@@ -655,7 +662,7 @@ class AddSpotGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
 
         viewModel.spotModelcacheList.value?.forEach {
             if (it.value.isNullOrEmpty()) {
-                ToastUtils.showLong("请输入型号")
+                ToastUtils.showLong("请输入完整品类信息")
                 return false
             }
         }

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

@@ -662,7 +662,7 @@ class CommodityInformationViewModel : BaseViewModel() {
                     id = respData.mgList.indexOf(it).plus(1).toString(),
                     value = it.convertratio ?: "",
                     enumdicnameid = it.mg?.goodsunitid ?: "",
-                    middleGoodsId = it.mg?.middlegoodsid ?: "",
+                    middleGoodsId = it.mg?.goodsgroupid ?: "",
                     middleGoodsName = it.mg?.middlegoodsname ?: "",
                     enumdicname = it.mg?.enumdicname ?: ""
                 )

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

@@ -198,8 +198,8 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                 )
             )
             viewModel.queryWrStandardDetail(data.wrstandardid ?: "")
-
-            selectWrStandModel.postValue(SelectData(id = data.wrstandardid.toString(),value = data.wrstandardname.toString()))
+            viewModel.queryDeliveryGoodsDetail(data.deliverygoodsid ?: "")
+            selectWrStandModel.postValue(SelectData(id = data.wrstandardid.toString(),value = data.wrstandardname.toString(),convertfactor = data.convertfactor.toString()))
             selectWrStandBrand.postValue(SelectData(id = "",value = data.brandname.toString()))
             selelctCurreryId.postValue(SelectData(id = data.currencyid.toString(),value = data.currencyname.toString()))
             if (data.startdate.isNullOrEmpty().not()){

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

@@ -166,6 +166,7 @@ class ContractViewModel : BaseViewModel() {
     fun queryAccMgrLoginUser(){
         val params = mutableMapOf<String, String>().apply {
             put("userid", GlobalDataCollection.instance?.loginRsp?.userID.toString())
+            put("querytype","1")
         }
         MyApplication.getInstance()?.accountManager?.queryAccMgrLoginUser(params = params){isSuccess, respData, error ->
             if (isSuccess){
@@ -181,9 +182,11 @@ class ContractViewModel : BaseViewModel() {
     fun getSelectSalesmanData() : List<SelectData>{
         val newSelectData = arrayListOf<SelectData>()
         accountManagerList.value?.forEach {
-            it.userlist?.forEach {
-                if (it.roletype == "22"){
-                    newSelectData.add(SelectData(id = it.userid ?: "",value = it.accountname ?: ""))
+            if (it.roleid == "22"){
+                it.userlist?.forEach {
+                    if (it.roletype?.contains("22") == true){
+                        newSelectData.add(SelectData(id = it.userid ?: "",value = it.accountname ?: ""))
+                    }
                 }
             }
         }
@@ -197,9 +200,11 @@ class ContractViewModel : BaseViewModel() {
     fun getSelectMerchandiserData() : List<SelectData>{
         val newSelectData = arrayListOf<SelectData>()
         accountManagerList.value?.forEach {
-            it.userlist?.forEach {
-                if (it.roletype == "23"){
-                    newSelectData.add(SelectData(id = it.userid ?: "",value = it.accountname ?: ""))
+            if (it.roleid == "23"){
+                it.userlist?.forEach {
+                    if (it.roletype?.contains("23") == true){
+                        newSelectData.add(SelectData(id = it.userid ?: "",value = it.accountname ?: ""))
+                    }
                 }
             }
         }
@@ -524,7 +529,7 @@ class ContractViewModel : BaseViewModel() {
     fun getSelectCurreryIdData() : List<SelectData>{
         val selectDataList = arrayListOf<SelectData>()
         GlobalDataCollection.instance?.getEnumList(enumCode = "paycurrency")?.forEach {
-            selectDataList.add(SelectData(id = it.enumdicid.toString(),value = it.enumdicname))
+            selectDataList.add(SelectData(id = it.enumitemname.toString(),value = it.enumdicname))
         }
         return selectDataList
     }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventoryaudit/InventoryAuditActivity.kt

@@ -92,9 +92,7 @@ class InventoryAuditActivity : BaseActivity<InventoryAuditViewModel>(){
                 commonTitle {
                     text = "库存审核"
                 }
-                commonMenuButton(R.mipmap.add_new) {
 
-                }
             }
 
             tabSegment {

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventorymanager/AddInventoryActivity.kt

@@ -40,11 +40,7 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
     /** 选择的现货商品类型 */
     private val selectWrStandardData: MutableLiveData<SelectData> = MutableLiveData()
 
-    /** 选择的型号类型/品类 **/
-    private val selectWrStandModel: MutableLiveData<SelectData> = MutableLiveData()
 
-    /** 选择的品牌 ***/
-    private val selectWrStandBrand: MutableLiveData<SelectData> = MutableLiveData()
 
     /** 选择的仓库 **/
     private val selectWareHouse: MutableLiveData<SelectData> = MutableLiveData()
@@ -70,8 +66,8 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                 gravity = Gravity.CENTER_VERTICAL
                 onThrottleFirstClick {
                     val selectDataList = arrayListOf(
-                        SelectData(id = "3", value = "生产入库"),
-                        SelectData(id = "4", value = "生产出库")
+                        SelectData(id = "7", value = "生产入库"),
+                        SelectData(id = "8", value = "生产出库")
                     )
 
                     creatBottomSheetDialog("请选择入库类型", selectDataList) {
@@ -181,7 +177,7 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                                 ?: DeliveryGoodsDetailData()
                         )
                     ) {
-                        selectWrStandModel.postValue(this)
+                        viewModel.selectWrStandModel.postValue(this)
                     }
                 }
                 textView {
@@ -201,7 +197,7 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                 }
 
                 textView {
-                    selectWrStandModel.bindOptional(context) {
+                    viewModel.selectWrStandModel.bindOptional(context) {
                         text = it?.value
                         textColorInt = R.color.rma_black_33
                     }
@@ -234,7 +230,7 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                                 ?: DeliveryGoodsDetailData()
                         )
                     ) {
-                        selectWrStandBrand.postValue(this)
+                        viewModel.selectWrStandBrand.postValue(this)
                     }
                 }
                 textView {
@@ -254,7 +250,7 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                 }
 
                 textView {
-                    selectWrStandBrand.bindOptional(context) {
+                    viewModel.selectWrStandBrand.bindOptional(context) {
                         text = it?.value
                         textColorInt = R.color.rma_black_33
                     }
@@ -389,7 +385,7 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                 emptyView()
 
                 textView {
-                    selectWrStandModel.bindOptional(context){
+                    viewModel.selectWrStandModel.bindOptional(context){
                         text = it?.enumdicname
                     }
                     textSizeAuto = 31
@@ -428,9 +424,9 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
                      */
                     viewModel.areaInOutStockApply(
                         InOutType = inventoryTypeSelect.value?.id?.toInt() ?: 0,
-                        WRStandardID = selectWrStandModel.value?.id?.toLong() ?: 0,
+                        WRStandardID = viewModel.selectWrStandModel.value?.id?.toLong() ?: 0,
 //                        SpotGoodsModelID = selectWrStandModel.value?.id?.toLong() ?: 0,
-                        SpotGoodsBrandID = selectWrStandBrand.value?.id?.toLong() ?: 0,
+                        SpotGoodsBrandID = viewModel.selectWrStandBrand.value?.id?.toLong() ?: 0,
                         DeliveryGoodsID = selectWrStandardData.value?.id?.toLong()
                             ?: 0,
                         WarehouseInfo = selectWareHouse.value?.id?.toLong() ?: 0,
@@ -476,12 +472,12 @@ class AddInventoryActivity : BaseActivity<InventoryManagerViewModel>() {
             return false
         }
 
-        if (selectWrStandModel.value?.id.isNullOrEmpty()) {
+        if (viewModel.selectWrStandModel.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择现货品种品类")
             return false
         }
 
-        if (selectWrStandBrand.value?.id.isNullOrEmpty()) {
+        if (viewModel.selectWrStandBrand.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择现货品种型号")
             return false
         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/inventory/inventorymanager/InventoryManagerViewModel.kt

@@ -70,6 +70,13 @@ class InventoryManagerViewModel : BaseViewModel() {
      */
     val normalWarehouseInfo: MutableLiveData<List<WarehouseInfoData>> = MutableLiveData()
 
+    //-----------------新增出入库登记时的----------
+    /** 选择的型号类型/品类 **/
+    val selectWrStandModel: MutableLiveData<SelectData> = MutableLiveData()
+
+    /** 选择的品牌 ***/
+    val selectWrStandBrand: MutableLiveData<SelectData> = MutableLiveData()
+
     /**
      * 查询列表头部数据 type 1 当前库存 2 申请记录
      * @param tableKey String
@@ -373,11 +380,30 @@ class InventoryManagerViewModel : BaseViewModel() {
         MyApplication.getInstance()?.commodityManager?.queryDeliveryGoodsDetail(params) { isSuccess, respData, error ->
             if (isSuccess) {
                 wrStandardDataDetail.postValue(respData?.get(0))
+                setWrStandardAndBrand(respData?.get(0) ?: DeliveryGoodsDetailData())
             }
         }
     }
 
     /**
+     * 在获取现货品种详情后，如果品类列表只有一个或者品牌列表只有一个就自动填入
+     * @param data DeliveryGoodsDetailData
+     */
+    fun setWrStandardAndBrand(data: DeliveryGoodsDetailData){
+        data.gmlist?.let {
+            if (it.size == 1){
+                selectWrStandModel.postValue(SelectData(id = it.get(0).wrstandardid ?: "",value = it.get(0).wrstandardname ?: "",enumdicname = it.get(0).enumdicname ?: ""))
+            }
+        }
+        data.gblist?.let {
+            if (it.size == 1){
+                selectWrStandBrand.postValue(SelectData(id = it.get(0).brandid ?: "",value = it.get(0).brandname ?: ""))
+            }
+        }
+
+    }
+
+    /**
      * 根据选择控件进行数据重新组装（型号） 品类
      * @param data WrStandardDetail
      * @return ArrayList<SelectData>

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

@@ -503,7 +503,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                             }
                             /**
                              * 机构出入库申请请求
-                             * @param InOutType Int int32 出入库类型 - 1:采购入库 2:销售出库 3:生产入库 4:生产出库
+                             * @param InOutType Int int32 出入库类型 - 5:采购入库 6:销售出库 7:生产入库 8:生产出库
                              * @param WRStandardID Long uint64 现货商品ID
                              * @param SpotGoodsModelID Long uint64 现货型号ID/品类（暂时不传）
                              * @param SpotGoodsBrandID Long uint64 现货品牌ID
@@ -516,7 +516,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                              */
                             if (type == "1") {
                                 viewModel.areaInOutStockApply(
-                                    InOutType = 1,
+                                    InOutType = 5,
                                     WRStandardID = selectWrStandModel.value?.id?.toLong() ?: 0,
 //                                    SpotGoodsModelID = selectWrStandModel.value?.id?.toLong() ?: 0,
                                     SpotGoodsBrandID = selectWrStandBrand.value?.id?.toLong() ?: 0,
@@ -529,7 +529,7 @@ class WarehouseRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }
                             } else {
                                 viewModel.areaInOutStockApply(
-                                    InOutType = 2,
+                                    InOutType = 6,
                                     WRStandardID = selectWrStandModel.value?.id?.toLong() ?: 0,
 //                                    SpotGoodsModelID = selectWrStandModel.value?.id?.toLong() ?: 0,
                                     SpotGoodsBrandID = selectWrStandBrand.value?.id?.toLong() ?: 0,

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

@@ -50,6 +50,11 @@ class AddLoginRoleActivity : BaseActivity<RoleSetViewModel>() {
     val data by lazy { intent.getParcelableExtra<AccMgrLoginUserData>("data") as AccMgrLoginUserData }
 
     /**
+     * salesOrTraders
+     */
+    val salesOrTraders by lazy { intent.getStringExtra("salesOrTraders") }
+
+    /**
      * 当页面是详情 修改 锁定 注销时的数据回填用
      */
     val data1 by lazy { intent.getParcelableExtra<Userlist>("data1") as Userlist }
@@ -98,8 +103,16 @@ class AddLoginRoleActivity : BaseActivity<RoleSetViewModel>() {
     fun init() {
         if (type == "1") {
             viewModel.queryAccMgrTaaccount("1",data1)
-            isSalesman.postValue(SelectData(id = "0", value = "业务员"))
-            isMerchandiser.postValue(SelectData(id = "0", value = "跟单员"))
+            if (salesOrTraders == "22"){
+                isSalesman.postValue(SelectData(id = "22", value = "业务员"))
+            }else{
+                isSalesman.postValue(SelectData(id = "0", value = "业务员"))
+            }
+            if (salesOrTraders == "23"){
+                isMerchandiser.postValue(SelectData(id = "23", value = "跟单员"))
+            }else{
+                isMerchandiser.postValue(SelectData(id = "0", value = "跟单员"))
+            }
             isTraders.postValue(SelectData(id = "0", value = "交易员"))
         } else  {
             if (data1.roletype?.contains("22") == true){

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

@@ -61,7 +61,7 @@ class SettingActivity : BaseActivity<SettingViewModel>(){
                     marginStart = autoSize(30)
                 }
                 textView {
-                    text = "修改登陆密码"
+                    text = "修改登录密码"
                     textSizeAuto = 34
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent){
@@ -94,7 +94,7 @@ class SettingActivity : BaseActivity<SettingViewModel>(){
                     marginStart = autoSize(30)
                 }
                 textView {
-                    text = "重置登陆密码"
+                    text = "重置登录密码"
                     textSizeAuto = 34
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent){

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

@@ -277,7 +277,7 @@ class SpotMarketPriceViewModel : BaseViewModel(){
     fun getSelectCurreryIdData() : List<SelectData>{
         val selectDataList = arrayListOf<SelectData>()
         GlobalDataCollection.instance?.getEnumList(enumCode = "paycurrency")?.forEach {
-            selectDataList.add(SelectData(id = it.enumdicid.toString(),value = it.enumdicname))
+            selectDataList.add(SelectData(id = it.enumitemname.toString(),value = it.enumdicname))
         }
         return selectDataList
     }

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

@@ -0,0 +1,425 @@
+package cn.muchinfo.rma.view.base.main
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import cn.muchinfo.rma.R
+import cn.muchinfo.rma.lifecycle.bindOptional
+import cn.muchinfo.rma.view.autoWidget.autoSize
+import cn.muchinfo.rma.view.autoWidget.createRoundRectDrawable
+
+import cn.muchinfo.rma.view.autoWidget.textColorInt
+import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.base.BaseFragment
+import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.home.contract.emptyView
+
+import com.qmuiteam.qmui.kotlin.matchParent
+import org.jetbrains.anko.*
+import org.jetbrains.anko.support.v4.UI
+
+/**
+ * 千海金我的fragment
+ */
+class SeaKingMainFragment : BaseFragment<SeaKingMainViewModel>(){
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return UI {
+            verticalLayout {
+
+                scrollView {
+                    verticalLayout {
+                        verticalLayout {
+                            backgroundResource = R.mipmap.qhj_main_bg
+
+                            linearLayout {
+                                gravity = Gravity.CENTER
+                                textView {
+                                    text = "我的"
+                                    textColorInt = R.color.white
+                                    textSizeAuto = 43
+                                }.lparams(wrapContent, wrapContent)
+                            }.lparams(matchParent, autoSize(120))
+
+                            view {
+
+                            }.lparams(org.jetbrains.anko.matchParent,0,1f)
+
+                            linearLayout {
+                                backgroundResource = R.drawable.qhj_main_top_white_bg
+                                gravity = Gravity.CENTER_VERTICAL
+                                linearLayout {
+                                    gravity = Gravity.CENTER_VERTICAL
+                                    view {
+                                        backgroundResource = R.mipmap.qhj_main_portrait
+                                    }.lparams(autoSize(96), autoSize(96)){
+                                        marginStart = autoSize(43)
+                                    }
+
+                                    verticalLayout {
+                                        textView {
+                                            text = "周星星"
+                                            textSizeAuto = 36
+                                            textColorInt = R.color.rma_black_33
+                                        }.lparams(wrapContent, wrapContent){
+                                            topMargin = autoSize(15)
+                                            marginStart = autoSize(32)
+                                        }
+                                        textView {
+                                            text = "142141241"
+                                            textSizeAuto = 31
+                                            textColorInt = R.color.rma_hint_text_color_ccc
+                                        }.lparams(wrapContent, wrapContent){
+                                            topMargin = autoSize(5)
+                                            marginStart = autoSize(32)
+                                        }
+                                    }.lparams(0, autoSize(100),1f)
+
+                                    linearLayout {
+                                        backgroundResource = R.drawable.qhj_main_recommended_bg
+                                        gravity = Gravity.CENTER
+                                        textView {
+                                            text = "申请推广码"
+                                            textSizeAuto = 29
+                                            textColorInt = R.color.white
+                                        }.lparams(wrapContent, wrapContent)
+                                    }.lparams(autoSize(200), autoSize(60))
+
+                                }.lparams(matchParent, autoSize(100))
+                            }.lparams(matchParent, autoSize(213))
+
+                        }.lparams(matchParent, autoSize(360))
+
+                        verticalLayout {
+                            linearLayout {
+                                gravity = Gravity.CENTER_VERTICAL
+                                textView {
+                                    text = "总资产（元）"
+                                    textSizeAuto = 29
+                                    textColorInt = R.color.rma_hint_text_color_ccc
+                                }.lparams(wrapContent, wrapContent){
+                                    marginStart = autoSize(78)
+                                }
+                                imageView {
+                                    imageResource = R.mipmap.qhj_open_eye
+                                }.lparams(autoSize(38), autoSize(38)){
+                                    marginStart = autoSize(32)
+                                }
+                            }.lparams(matchParent, autoSize(60))
+
+                            textView {
+                                text = "1231241"
+                                textSizeAuto = 60
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(78)
+                                topMargin = autoSize(15)
+                            }
+
+                            linearLayout {
+                                //余额
+                                verticalLayout {
+                                    gravity = Gravity.CENTER_VERTICAL
+                                    textView {
+                                        text = "余额（元）"
+                                        textSizeAuto = 29
+                                        textColorInt =R.color.rma_hint_text_color_ccc
+                                    }.lparams(wrapContent, wrapContent){
+                                        marginStart = autoSize(78)
+                                    }
+                                    textView {
+                                        text = "35000.44"
+                                        textSizeAuto = 36
+                                        textColorInt = R.color.rma_green_color
+                                    }.lparams(wrapContent, wrapContent){
+                                        marginStart = autoSize(78)
+                                    }
+                                }.lparams(0, autoSize(110),1f)
+
+                                //持仓
+                                verticalLayout {
+                                    gravity = Gravity.CENTER_VERTICAL
+                                    textView {
+                                        text = "持仓（元）"
+                                        textSizeAuto = 29
+                                        textColorInt =R.color.rma_hint_text_color_ccc
+                                    }.lparams(wrapContent, wrapContent){
+
+                                    }
+                                    textView {
+                                        text = "35000.44"
+                                        textSizeAuto = 36
+                                        textColorInt = R.color.rma_red_color
+                                    }.lparams(wrapContent, wrapContent){
+
+                                    }
+                                }.lparams(0, autoSize(110),1f)
+
+                            }.lparams(matchParent, autoSize(110)){
+                                topMargin = autoSize(40)
+                            }
+
+                            linearLayout {
+                                linearLayout {
+                                    backgroundResource = R.drawable.qhj_withdraw_bg
+                                    gravity = Gravity.CENTER
+                                    textView {
+                                        text = "提现"
+                                        textColorInt = R.color.qhj_withdraw_color
+                                        textSizeAuto = 36
+                                    }.lparams(wrapContent, wrapContent)
+                                }.lparams(0, autoSize(100),1f){
+                                    marginStart = autoSize(78)
+                                    marginEnd = autoSize(36)
+                                }
+
+
+                                linearLayout {
+                                    backgroundResource = R.drawable.qhj_main_blue_bg
+                                    gravity = Gravity.CENTER
+                                    textView {
+                                        text = "充值"
+                                        textColorInt = R.color.white
+                                        textSizeAuto = 36
+                                    }.lparams(wrapContent, wrapContent)
+                                }.lparams(0, autoSize(100),1f){
+                                    marginStart = autoSize(36)
+                                    marginEnd = autoSize(78)
+                                }
+                            }.lparams(matchParent, autoSize(100)){
+                                topMargin = autoSize(45)
+                            }
+
+                        }.lparams(matchParent, autoSize(440))
+
+                        view {
+                            background = resources.getDrawable(R.color.rma_hint_text_color_ccc)
+                        }.lparams(matchParent, autoSize(20))
+
+                        linearLayout {
+
+                            //交易撤单
+                            verticalLayout {
+                                gravity = Gravity.CENTER_HORIZONTAL
+                                imageView {
+                                    imageResource = R.mipmap.qhj_trading_cancellations
+                                }.lparams(autoSize(60), autoSize(60)){
+                                    topMargin = autoSize(45)
+                                }
+
+                                textView {
+                                    text = "交易撤单"
+                                    textSizeAuto = 31
+                                    textColorInt = R.color.rma_black_33
+                                }.lparams(wrapContent, wrapContent){
+                                    topMargin = autoSize(10)
+                                }
+
+                            }.lparams(0, autoSize(200),1f)
+
+                            //成交记录
+                            verticalLayout {
+                                gravity = Gravity.CENTER_HORIZONTAL
+                                imageView {
+                                    imageResource = R.mipmap.qhj_deal_the_record
+                                }.lparams(autoSize(60), autoSize(60)){
+                                    topMargin = autoSize(45)
+                                }
+
+                                textView {
+                                    text = "成交记录"
+                                    textSizeAuto = 31
+                                    textColorInt = R.color.rma_black_33
+                                }.lparams(wrapContent, wrapContent){
+                                    topMargin = autoSize(10)
+                                }
+                            }.lparams(0, autoSize(200),1f)
+
+                            //资金流水
+                            verticalLayout {
+                                gravity = Gravity.CENTER_HORIZONTAL
+                                imageView {
+                                    imageResource = R.mipmap.qhj_money_flowing_water
+                                }.lparams(autoSize(60), autoSize(60)){
+                                    topMargin = autoSize(45)
+                                }
+
+                                textView {
+                                    text = "资金流水"
+                                    textSizeAuto = 31
+                                    textColorInt = R.color.rma_black_33
+                                }.lparams(wrapContent, wrapContent){
+                                    topMargin = autoSize(10)
+                                }
+                            }.lparams(0, autoSize(200),1f)
+
+                            //提货查询
+                            verticalLayout {
+                                gravity = Gravity.CENTER_HORIZONTAL
+                                imageView {
+                                    imageResource = R.mipmap.qhj_goods_query
+                                }.lparams(autoSize(60), autoSize(60)){
+                                    topMargin = autoSize(45)
+                                }
+
+                                textView {
+                                    text = "提货查询"
+                                    textSizeAuto = 31
+                                    textColorInt = R.color.rma_black_33
+                                }.lparams(wrapContent, wrapContent){
+                                    topMargin = autoSize(10)
+                                }
+                            }.lparams(0, autoSize(200),1f)
+                        }.lparams(matchParent, autoSize(200))
+
+                        view {
+                            background = resources.getDrawable(R.color.rma_hint_text_color_ccc)
+                        }.lparams(matchParent, autoSize(20))
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            imageView {
+                                imageResource = R.mipmap.qhj_cast_surely_management
+                            }.lparams(autoSize(50), autoSize(50)){
+                               marginStart = autoSize(60)
+                            }
+
+                            textView {
+                                text = "定投管理"
+                                textSizeAuto = 36
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(29)
+                            }
+
+                            emptyView()
+
+                            textView {
+                                visibility = View.GONE
+                                text = "99"
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
+                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#FFA127", 45)
+                            }.lparams(wrapContent, wrapContent)  {
+                                marginEnd = autoSize(20)
+                            }
+
+                            imageView {
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(40), autoSize(40)){
+                                marginEnd = autoSize(49)
+                            }
+                        }.lparams(matchParent, autoSize(140))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            imageView {
+                                imageResource = R.mipmap.qhj_account_manager
+                            }.lparams(autoSize(50), autoSize(50)){
+                                marginStart = autoSize(60)
+                            }
+
+                            textView {
+                                text = "提现账户管理"
+                                textSizeAuto = 36
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(29)
+                            }
+
+                            emptyView()
+
+                            textView {
+                                visibility = View.GONE
+                                text = "99"
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
+                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#FFA127", 45)
+                            }.lparams(wrapContent, wrapContent)  {
+                                marginEnd = autoSize(20)
+                            }
+
+                            imageView {
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(40), autoSize(40)){
+                                marginEnd = autoSize(49)
+                            }
+                        }.lparams(matchParent, autoSize(140))
+
+                        itemView()
+
+                        linearLayout {
+                            gravity = Gravity.CENTER_VERTICAL
+                            imageView {
+                                imageResource = R.mipmap.qhj_good_address
+                            }.lparams(autoSize(50), autoSize(50)){
+                                marginStart = autoSize(60)
+                            }
+
+                            textView {
+                                text = "收货地址管理"
+                                textSizeAuto = 36
+                                textColorInt = R.color.rma_black_33
+                            }.lparams(wrapContent, wrapContent){
+                                marginStart = autoSize(29)
+                            }
+
+                            emptyView()
+
+                            textView {
+                                visibility = View.GONE
+                                text = "99"
+                                textColorInt = R.color.p_global_write_color
+                                textSizeAuto = 15
+                                setPadding(
+                                    autoSize(10),
+                                    autoSize(6),
+                                    autoSize(10),
+                                    autoSize(6)
+                                )
+                                backgroundDrawable =
+                                    createRoundRectDrawable("#FFA127", 45)
+                            }.lparams(wrapContent, wrapContent)  {
+                                marginEnd = autoSize(20)
+                            }
+
+                            imageView {
+                                imageResource = R.mipmap.rma_more
+                            }.lparams(autoSize(40), autoSize(40)){
+                                marginEnd = autoSize(49)
+                            }
+                        }.lparams(matchParent, autoSize(140))
+
+
+
+                    }.lparams(matchParent, matchParent)
+                }.lparams(matchParent, matchParent)
+
+
+            }
+        }.view
+    }
+}

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

@@ -0,0 +1,11 @@
+package cn.muchinfo.rma.view.base.main
+
+import cn.muchinfo.rma.view.base.BaseViewModel
+
+/**
+ * 千海金我的页面viewmodel
+ */
+class SeaKingMainViewModel : BaseViewModel(){
+
+
+}

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

@@ -58,9 +58,9 @@ class ContractDetailActivity : BaseActivity<ProcurementViewModel>() {
 
     private val tabsArray: List<String> by lazy {
         if (type == "1") {
-            arrayListOf("合同详情", "点价记录", "结算记录", "款项记录", "发票记录", "入库记录", "变更记录")
+            arrayListOf("合同详情", "点价记录", "交收记录", "款项记录", "发票记录", "入库记录", "变更记录")
         } else {
-            arrayListOf("合同详情", "点价记录", "结算记录", "款项记录", "发票记录", "出库记录", "变更记录")
+            arrayListOf("合同详情", "点价记录", "交收记录", "款项记录", "发票记录", "出库记录", "变更记录")
         }
 
     }
@@ -71,7 +71,7 @@ class ContractDetailActivity : BaseActivity<ProcurementViewModel>() {
     //点价登记
     private val priceRecordUI by lazy { PriceRecordUI(this, viewModel, data) }
 
-    //结算登记
+    //交收登记
     private val settlementRecordUI by lazy { SettlementRecordUI(this, viewModel, data) }
 
     //款项登记
@@ -300,7 +300,7 @@ class ContractDetailsUI(
                     content = ViewEnumUtils.getProductType(data.producttype ?: "")
                 ),
                 ContractDetailsData(title = "产品规格", content = data.spotgoodsdesc ?: ""),
-                ContractDetailsData(title = "结算币种",content = data.currencyname?.isBlankString() ?: ""),
+                ContractDetailsData(title = "交收币种",content = data.currencyname?.isBlankString() ?: ""),
                 ContractDetailsData(
                     title = "定价类型",
                     content = ViewEnumUtils.getPriceType(data.pricetype ?: "")
@@ -460,7 +460,7 @@ class PriceRecordUI(
 }
 
 /**
- * 结算记录
+ * 交收记录
  * @property activity AppCompatActivity
  * @property viewModel ProcurementViewModel
  * @property data ContractData
@@ -793,7 +793,7 @@ class InvoiceRecordUI(
                 emptyView(hint = resources.getString(R.string.now_no_data))
             }).lparams(matchParent, matchParent)
 
-            viewModel.paymentList.bindOptional(context) {
+            viewModel.invoiceList.bindOptional(context) {
                 if (it?.isEmpty() == true || it?.size == 0) {
                     statusLayout.showEmpty()
                 } else {
@@ -898,7 +898,7 @@ class ChangeRecordUI(
 /**
  *
  * @receiver _LinearLayout
- * @param type String 1 点价记录 2 结算记录 3 款项记录 4 发票记录
+ * @param type String 1 点价记录 2 交收记录 3 款项记录 4 发票记录
  */
 fun _LinearLayout.creatContrctTitleUI(type: String) {
     linearLayout {
@@ -911,7 +911,7 @@ fun _LinearLayout.creatContrctTitleUI(type: String) {
                         text = "点价登记时间"
                     }
                     "2" -> {
-                        text = "结算登记时间"
+                        text = "交收登记时间"
                     }
                     "3" -> {
                         text = "款项登记时间"
@@ -931,7 +931,7 @@ fun _LinearLayout.creatContrctTitleUI(type: String) {
                         text = "点价审核时间"
                     }
                     "2" -> {
-                        text = "结算审核时间"
+                        text = "交收审核时间"
                     }
                     "3" -> {
                         text = "款项审核时间"
@@ -953,7 +953,7 @@ fun _LinearLayout.creatContrctTitleUI(type: String) {
                         text = "点价价格"
                     }
                     "2" -> {
-                        text = "结算项"
+                        text = "交收项"
                     }
                     "3" -> {
                         text = "款项类型"

RMA/app/src/main/res/drawable/qhj_main_blue_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/rma_blue_color"/>
+    <corners android:radius="25dp"
+       />
+</shape>

RMA/app/src/main/res/drawable/qhj_main_recommended_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/rma_blue_color"/>
+    <corners android:topLeftRadius="100px"
+        android:bottomLeftRadius="100px"/>
+</shape>

RMA/app/src/main/res/drawable/qhj_main_top_white_bg.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <corners android:topLeftRadius="40px"
+        android:topRightRadius="40px"/>
+</shape>

RMA/app/src/main/res/drawable/qhj_withdraw_bg.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--
+         使用layer-list
+             用Item包裹两层背景色
+               第一层使用渐变色背景
+                 第二层纯白背景 使用“android:bottom” 控制两层之间的间距
+          实现阴影效果
+    -->
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#ffffffff"
+                android:endColor="#FBFBFB"
+                android:centerX="0.5"
+                android:centerY="0.5"
+                android:angle="270"
+                android:gradientRadius="10dp"/>
+            <corners android:radius="30dp" />
+        </shape>
+    </item>
+
+
+    <item
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp">
+
+        <shape>
+            <solid android:color="#ffffffff" />
+            <corners android:radius="30dp" />
+        </shape>
+
+    </item>
+
+</layer-list>

RMA/app/src/main/res/values/colors.xml

@@ -42,6 +42,7 @@
     <color name="rma_item_bg">#F6F6F8</color>
     <color name="rma_item_yellow_color">#FE9344</color>
     <color name="add_role_bg_color">#224A97E1</color>
+    <color name="qhj_withdraw_color">#8497AF</color>
 
 
     <color name="pickerview_timebtn_nor">#057dff</color>