1.修改产品列表排除内置产品信息 2.修改计算分配额不符的bug

houruijun

2020-09-28 af851a31fa077b9ad5e4efbac15e4d8eb8259695

1.修改产品列表排除内置产品信息
2.修改计算分配额不符的bug

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java

@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUser;
@@ -19,6 +20,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -74,7 +76,9 @@
                        break;
                }
            }
            list=list.stream().filter(f->(f.getId()!= CommonConstant.PAY_USER_PRODUCT_ID&&f.getId()!= CommonConstant.REG_USER_PRODUCT_ID)).collect(Collectors.toList());
        }

        return PageResult.<ProductAllVo>builder().data(list).code(0).count(0L).build();
    }


 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_pay.html

@@ -102,7 +102,7 @@
            } else {
                data.field.enabled = false;
            }
            if (parseInt(data.field.payPrice) - parseInt(data.field.payCustom) == parseInt(data.field
            if (parseFloat(data.field.payPrice) - parseFloat(data.field.payCustom) == parseFloat(data.field
                    .payKidgrow)) {
                admin.req('api-opration/paymanager', JSON.stringify(data.field), function (data) {
                    if (data.code === 0) {

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html

@@ -278,7 +278,6 @@
            admin.req('api-user/sysdepartment/getPayMes?departmentId=' + hospitalData.departmentId, {},
                function (data) {
                    layer.closeAll('loading');
                    debugger
                    if (0 === data.code) {
                        queryData = data.data;
                        if (queryData === true) {