20210528

xiaoyong931011

2021-05-28 5b4b266dce808935d58a04d8f2190d3dc773fde9

20210528

 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java

@@ -110,6 +110,14 @@
                if(ydProductVo.getSurplusT().compareTo(BigDecimal.ZERO) < 1) {
                    ydProductVo.setStatus(2);
                }

                Integer shelvesDays = ydProductVo.getShelvesDays();
                String proUnit = ydProductVo.getProUnit();
                if(shelvesDays == 0){
                    ydProductVo.setShelvesDaysStr("待定");
                }else{
                    ydProductVo.setShelvesDaysStr(proUnit+"+"+shelvesDays);
                }
            }
        }

@@ -135,10 +143,19 @@
        /**
         *产出规则
         */
        Date date = DateUtil.date();
        ydProductVo.setNowTime(date);
        //上架天数
        Integer shelvesDays = ydProductVo.getShelvesDays();
        String proUnit = ydProductVo.getProUnit();
        if(shelvesDays == 0){
            ydProductVo.setGetType(2);
            ydProductVo.setShelvesDaysStr("待定");
        }else{
            ydProductVo.setGetType(1);
            ydProductVo.setShelvesDaysStr(proUnit+"+"+shelvesDays);
        }

        Date date = DateUtil.date();
        ydProductVo.setNowTime(date);
        Date workTime = DateUtil.offsetDay(date, shelvesDays);
        ydProductVo.setWorkTime(workTime);
        //服务周期

 src/main/java/com/xcong/excoin/modules/yunding/vo/YdProductVo.java

@@ -68,6 +68,8 @@
     */
    @ApiModelProperty("上架天数")
    private Integer shelvesDays;
    @ApiModelProperty("新上架天数")
    private String shelvesDaysStr;

    /**
     * 单位
@@ -99,6 +101,10 @@
    @ApiModelProperty("产品类型 1:期货 2：现货")
    private Integer typeCoin;


    @ApiModelProperty("产出规则 1:显示 2：不显示")
    private Integer getType;

    /**
     * 优惠 1：免除电费
     */