fix meidu some req

Helius

2021-12-29 1975ada3e42a06d4e3ff1cc36b3613020208ce1b

fix meidu some req

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -124,9 +124,28 @@
        List<SysBeauticianState> beauticianStateList = beauticianStateDao.selectBySerIds(id);
        if (CollUtil.isNotEmpty(beauticianStateList)) {
            for (SysBeauticianState sysBeauticianState : beauticianStateList) {
                SysProjUse item = sysBeauticianState.getProjUse();

                // 若项目/套餐无效，则打印时，不显示余次
                if ("无效".equals(item.getStatus())) {
                    item.setRemainCount(item.getSurplusCount());
                } else {
                    item.setRemainCount(null);
                }

                if (sysBeauticianState.getProjUse().getTaocanId() != null) {
                    SysProjUse sysProjUse = projUseService.findById(sysBeauticianState.getProjUse().getTaocanId());
                    if ("无效".equals(sysProjUse.getStatus())) {
                        item.setRemainCount(sysProjUse.getSurplusCount());
                    } else {
                        item.setRemainCount(null);
                    }

                    sysBeauticianState.getProjInfo().setName(sysProjUse.getProjName()+"--"+sysBeauticianState.getProjInfo().getName());
                    if ("Y".equals(sysProjUse.getIsCourse()) && "Y".equals(sysProjUse.getIsInfinite())) {
                        int count = projUseService.findTaocanCountForCourseAndInfinite(sysBeauticianState.getProjUse().getTaocanId(), projServices.getVipId());
                        item.setRemainCount(count);
                    }
                }
            }
        }

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java

@@ -143,6 +143,18 @@
    @Extend
    private String updateRemark;

    /**
     * 套餐/项目剩余次数
     */
    private Integer remainCount;

    public Integer getRemainCount() {
        return remainCount;
    }

    public void setRemainCount(Integer remainCount) {
        this.remainCount = remainCount;
    }

    public Long getOrderId() {
        return orderId;

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java

@@ -134,4 +134,6 @@
    Integer selectProjUseFlowTotal(@Param("record") SysProjUseFlow projUseFlow);

    List<SysProjUse> selectTaoCanListWithProj(@Param("record") SysProjUse sysProjUse);

    int selectTaocanCountForCourseAndInfinite(@Param("taocanId") Long taocanId, @Param("vipId") Long vipId);
}

 zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java

@@ -143,4 +143,6 @@
    public List<SysProjUse> selectTaocanProjUse(Long id, String status);

    public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse);

    int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId);
}

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java

@@ -608,4 +608,9 @@
    public List<SysProjUse> findTaocaoProjUseWithProj(SysProjUse sysProjUse) {
        return sysProjUseDao.selectTaoCanListWithProj(sysProjUse);
    }

    @Override
    public int findTaocanCountForCourseAndInfinite(Long taocanId, Long vipId) {
        return sysProjUseDao.selectTaocanCountForCourseAndInfinite(taocanId, vipId);
    }
}

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml

@@ -944,4 +944,8 @@
        </if>
    </select>

    <select id="selectTaocanCountForCourseAndInfinite" resultType="java.lang.Integer">
        select count(1) from sys_proj_use
        where taocan_id=#{taocanId} and vip_id=#{vipId}
    </select>
</mapper>

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html

@@ -218,6 +218,7 @@
            userList: [],
            treeSelect : [],
            payMoneys : [],
            order:{},
            printPaper : false,
        },
        created : function() {
@@ -324,8 +325,19 @@
                        data: _this.cardInfo,
                        url: url,
                        callback: function (data) {
                            _this.order.id = data.mapInfo.orderId;

                            if (_this.printPaper) {
                                _this.$message.success(data.info);
                                _this.print();
                            } else {
                                _this.$message.success({
                                    message : data.info,
                                    duration : 1000,
                                    onClose() {
                                        _this.closeFrame();
                                    }
                                });
                            }

                            if(parent.myGrid) {
@@ -336,7 +348,7 @@
                                parent.app.vipInfoFn();
                            }

                            _this.closeFrame();
                            // _this.closeFrame();
                        }
                    });
                }
@@ -354,7 +366,7 @@
                        maxmin: true,
                        content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
                        cancel: function (index, layero) {
                            _this.closeFram();
                            _this.closeFrame();
                        }
                    });
                } else {

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -1103,6 +1103,7 @@
                                //结算打印提示
                                if (submitType == 1) {
                                    if (_this.printPaper) {
                                        _this.$message.success(data.info);
                                        _this.print();
                                    } else {
                                        _this.$message.success({

 zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html

@@ -32,7 +32,7 @@
        <h1   style="text-align: center;font-size: 18px;margin: 20px auto;">
            {{order.shopName}}
        </h1>
        <table style="width: 100%; font-size:12px;line-height: 20px;">
        <table style="width: 100%; font-size:12px;">

            <tr>
                <td colspan="2">
@@ -56,7 +56,7 @@
            </tr>
        </table>
        <p>--------------------------------</p>
        <table style="width: 80%;font-size:12px;margin-top: 20px;text-align: left">
        <table style="width: 80%;font-size:12px;margin-top: 10px;text-align: left; margin-bottom: 5px;">

            <tr>
                <th style="text-align: left;"  colspan="4">产品</th>
@@ -89,7 +89,7 @@
            </tr>
        </table>
        <p>--------------------------------</p>
        <table style="width: 100%;font-size: 10px;line-height: 30px;">
        <table style="width: 100%;font-size: 10px; margin-bottom: 5px;">
            <tr  >
                <td>
                    <b  >储值卡余额:</b><span >{{totalMoney}}</span>

 zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/print-service-meidu.html

@@ -30,7 +30,7 @@
        <h1   style="text-align: center;font-size:18px;margin: 20px auto;">
            {{projService.shopName}}
        </h1>
        <table style="width: 100%; font-size:10px;line-height: 20px;">
        <table style="width: 100%; font-size:10px;">

            <tr>
                <td colspan="2">
@@ -53,7 +53,7 @@
                </td>
            </tr>
        </table>
        <table style="width: 80%;font-size:10px;margin-top: 20px;text-align: left">
        <table style="width: 80%;font-size:10px;margin-top: 10px;text-align: left; margin-bottom: 5px;">
            <tr>
                <th style="text-align: left;"  colspan="4">产品</th>
            </tr>
@@ -70,12 +70,12 @@
                <tr  >
                    <td>{{item.count }}</td>
                    <td>{{item.projUse.price }}</td>
                    <td >{{item.projUse.surplusCount }}</td>
                    <td >{{item.projUse.remainCount == null ? "-" : item.projUse.remainCount}}</td>
                    <td>{{item.beautiStaffInfo?item.beautiStaffInfo.suName:''}}</td>
                </tr>
            </template>
        </table>
        <table style="width: 100%;font-size: 10px;line-height: 30px;">
        <table style="width: 100%;font-size: 10px; margin-bottom: 5px;">
            <tr>
                <td>
                    <b>本次划扣:</b> <span >{{projService.money}}</span>