20200702 代码提交

xiaoyong931011

2020-07-02 cf0cafca18197fc93083f43c19099dd3f84a09e5

20200702   代码提交

 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java

@@ -169,9 +169,9 @@
            memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
            // 计算佣金
            ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
            return Result.ok("提交成功"+spread+"id:"+id+"openingPrice"+openingPrice);
            return Result.ok("提交成功");
        }
        return Result.fail("提交失败"+spread+"id:"+id+"openingPrice"+openingPrice);
        return Result.fail("提交失败");
    }

    @Override

 src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java

@@ -19,6 +19,9 @@
    

    @ApiModelProperty(value = "收款方式1:有  0没有")

    private Integer memberPaymentMethod;

    
    @ApiModelProperty(value = "实名认证0：审核不通过 1：审核中 2： 审核通过 3：未提交")

    private Integer certifyStatus;



    @ApiModelProperty(value = "交易密码时效性设置1:一直需要输入密码  2不需要输入密码")

    private Integer tradeAgingSetting;


 src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java

@@ -734,6 +734,9 @@

        MemberPersonCenterInfoVo memberPersonCenterInfoVo = new MemberPersonCenterInfoVo();
        
        Integer certifyStatus = member.getCertifyStatus();
        memberPersonCenterInfoVo.setCertifyStatus(certifyStatus);
        
        Map<String, Object> columnMap = new HashMap<>();
        columnMap.put("member_id", memberId);
        List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);