fix payOrder isNormal judge

Helius

2022-05-13 65686b52de4f5838a133e2cfd6296d3d09915877

fix payOrder isNormal judge

 src/main/java/cc/mrbird/febs/mall/mapper/MallNewsCategoryMapper.java

New file
@@ -0,0 +1,2 @@
package cc.mrbird.febs.mall.mapper;public interface MallNewsCategoryMapper {
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -233,11 +233,13 @@
                    for (MallOrderItem orderItem : orderItems) {
                        MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());

                        MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
                        BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());
                        if (mallGoods.getIsNormal() == 2) {
                            MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
                            BigDecimal score = sku.getOriginalPrice().multiply(mallGoods.getStaticMulti());

                        memberWalletService.add(score, member.getId(), "score");
                        mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
                            memberWalletService.add(score, member.getId(), "score");
                            mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
                        }
                    }
                }


 src/main/resources/mapper/modules/MallNewsCategoryMapper.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="">

</mapper>

 src/main/resources/templates/febs/views/modules/news/newsCategory.html

New file
@@ -0,0 +1,147 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-newInfo" lay-title="新闻中心">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <form class="layui-form layui-table-form" lay-filter="user-table-form">
                        <div class="layui-row">
                            <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="add">
                                    新增
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query">
                                    <i class="layui-icon">&#xe848;</i>
                                </div>
                                <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                    <i class="layui-icon">&#xe79b;</i>
                                </div>
                            </div>
                        </div>
                    </form>
                    <table lay-filter="newInfoTable" lay-data="{id: 'newInfoTable'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<!-- 表格操作栏 start -->
<script type="text/html" id="user-option">
    <span shiro:lacksPermission="user:view,user:update,user:delete">
        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
    </span>
    <a lay-event="edit" shiro:hasPermission="user:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
    layui.use([ 'jquery', 'form', 'table', 'febs'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            $view = $('#febs-newInfo'),
            $query = $view.find('#query'),
            $add = $view.find('#add'),
            $reset = $view.find('#reset'),
            $searchForm = $view.find('form'),
            sortObject = {field: 'phone', type: null},
            tableIns;

        form.render();

        // 表格初始化
        initTable();

        // 初始化表格操作栏各个按钮功能
        table.on('tool(newInfoTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            if (layEvent === 'newsInfoUpdate') {
                febs.modal.open('编辑', 'modules/news/newsInfoUpdate/' + data.id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#systemPay-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'delNewsInfo') {
                febs.modal.confirm('删除', '确认删除？', function () {
                    delNewsInfo(data.id);
                });
            }
        });

        function delNewsInfo(id) {
            febs.get(ctx + 'admin/news/delNewsInfo/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }

        // 查询按钮
        $query.on('click', function () {
            var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
            tableIns.reload({where: params, page: {curr: 1}});
        });

        // 刷新按钮
        $reset.on('click', function () {
            $searchForm[0].reset();
            sortObject.type = 'null';
            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
        });

        $add.on('click', function () {
            febs.modal.open('新增', 'modules/news/newsInfoAdd/', {
                btn: ['提交', '取消'],
                yes: function (index, layero) {
                    $('#newsInfo-add').find('#submit').trigger('click');
                },
                btn2: function () {
                    layer.closeAll();
                }
            });
        });

        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'newInfoTable',
                url: ctx + 'admin/news/getNewInfoList',
                cols: [[
                    {field: 'title', title: '标题', minWidth: 120,align:'center'},
                    {field: 'content', title: '内容', minWidth: 120,align:'center'},
                    {field: 'createdTime', title: '创建时间', minWidth: 120,align:'center'},
                    {field: 'type', title: '类型',
                        templet: function (d) {
                            if(d.type === 1){
                                return '<span>文章</span>'
                            }else if(d.type === 2){
                                return '<span>跳转到产品</span>'
                            }else{
                                return ''
                            }
                        }, minWidth: 100,align:'center'},
                    {field: 'targetId', title: '跳转到目标ID', minWidth: 200,align:'center'},
                    {field: 'targetName', title: '跳转到目标', minWidth: 200,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="newsInfoUpdate" shiro:hasPermission="user:update">编辑</button>'
                                +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delNewsInfo" shiro:hasPermission="user:update">删除</button>'
                        },minWidth: 300,align:'center'}
                ]]
            });
        }

        // 获取查询参数
        function getQueryParams() {
            return {
            };
        }

    })
</script>