1

zyy

yesterday a6c07a0526befbbd8194c97eb8f64b84b1a477a1

1

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java

@@ -235,6 +235,24 @@
        return Result.ok(null);
    }

    @ApiOperation(value = "设置交割合约赢率")
    @PostMapping("updateFuturesMostPrfitLevel")
    @SysLog("设置交割合约赢率")
    public Result updateFuturesMostPrfitLevel(@Valid @RequestBody FuturesMostPrfitLevelModel model) {
        User user= userService.getById(model.getUserId());
        user.setFuturesMostPrfitLevel(model.getFuturesMostPrfitLevel());
        userService.updateById(user);

        Log log = new Log();
        log.setCategory(Constants.LOG_CATEGORY_OPERATION);
        log.setUsername(user.getUserName());
        log.setUserId(user.getUserId());
        log.setOperator(SecurityUtils.getSysUser().getUsername());
        log.setLog("修改["+user.getUserName()+"]交割合约赢率,ip:[" + IPHelper.getIpAddr() + "]");
        logService.save(log);
        return Result.ok(null);
    }

    @ApiOperation(value = "重置登录密码")
    @PostMapping("restLoginPasswrod")
    @SysLog("重置登录密码")

 trading-order-admin/src/main/java/com/yami/trading/admin/model/FuturesMostPrfitLevelModel.java

New file
@@ -0,0 +1,21 @@
package com.yami.trading.admin.model;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;

@Data
@ApiModel
public class FuturesMostPrfitLevelModel {

    @ApiModelProperty("交割合约赢率")
    private Double futuresMostPrfitLevel;


    @ApiModelProperty("userid")
    @NotBlank
    private  String userId;
}

 trading-order-bean/src/main/java/com/yami/trading/bean/model/User.java

@@ -204,6 +204,10 @@
    @ApiModelProperty("信用分")
    private Integer creditScore = 100;

    @ApiModelProperty("用户交割盈利")
    private Double futuresMostPrfitLevel;


    public BigDecimal getWithdrawLimitAmount() {
        return withdrawLimitAmount == null ? new BigDecimal(0) : withdrawLimitAmount;
    }

 trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java

@@ -60,5 +60,7 @@
    @ApiModelProperty("注册时间")
    private Date createTime;//create_time  createTimeTs

    @ApiModelProperty("用户交割盈利")
    private Double futuresMostPrfitLevel;

}

 trading-order-service/src/main/java/com/yami/trading/service/future/FuturesOrderService.java

@@ -677,7 +677,12 @@

        // 24小时内交割合约客户最高赢率（正式用户交割盈利/正式用户交割金额），高于设定的值时客户必亏，低于时则不限制（范例：10，为最高赢10%），为空则不限制
        double futures_most_prfit_level = 0;
        User party = userService.getById(order.getPartyId());
        if (party != null && party.getFuturesMostPrfitLevel() != null) {
            futures_most_prfit_level =  party.getFuturesMostPrfitLevel();
        } else {
        futures_most_prfit_level = Double.valueOf(sysparaService.find("futures_most_prfit_level").getSvalue());
        }
        if (futures_most_prfit_level > 0) {
            List<FuturesOrder> futuresOrders24Hour = new ArrayList();
            futuresOrders24Hour = findByHourAndSate("created", Constants.SECURITY_ROLE_MEMBER);
@@ -873,7 +878,7 @@
         //删除提示
        // tipService.deleteTip(order.getUuid());

        User party = userService.getById(order.getPartyId());
        //User party = userService.getById(order.getPartyId());
        party.setWithdrawLimitNowAmount(new BigDecimal(Arith.add(party.getWithdrawLimitNowAmount().doubleValue(), volume)));
        userService.updateById(party);
        // if (Constants.SECURITY_ROLE_MEMBER.equals(party.getRoleName())) {