xiaoyong931011
2023-07-21 62678b39d136f6a92d5c99f31e633260db0a3570
订单支付后生成对应的课程单
8 files modified
119 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java 3 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 4 ●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html 63 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html 42 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -138,7 +138,8 @@
            e.printStackTrace();
        }
        String imageFuffix = ".png";
//        String imageFuffix = ".png";
        String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
        String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
        String imageName = "uploadeFile/" + imageNames;
        OssUtils.uploadFileWithBase64(base64EncoderImg, imageName);
src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
@@ -100,4 +100,6 @@
    //1:虚拟产品 2:实物
    private Integer isUnreal;
    private String videoUrl;
}
src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
@@ -104,4 +104,6 @@
    private String houseAddress;
    //1:虚拟产品 2:实物
    private Integer isUnreal;
    private String videoUrl;
}
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -132,6 +132,7 @@
    private String houseName;
    private String houseAddress;
    private String videoUrl;
    //1:虚拟产品 2:实物
    private Integer isUnreal;
}
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -444,7 +444,7 @@
            mallMemberClass.setOrderId(orderId);
            mallMemberClass.setClassName(goodsName);
            mallMemberClass.setClassPic(skuImage);
            mallMemberClass.setClassUrl(skuImage);
            mallMemberClass.setClassUrl(mallGoods.getVideoUrl());
            mallMemberClassMapper.insert(mallMemberClass);
            return;
        }else if(5 == isNormal){
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -416,9 +416,7 @@
        stringBuffer.append("@");
        stringBuffer.append(amountActualMsg);
        agentProducer.sendOrderGetMsg(stringBuffer.toString());
        if("4".equals(payOrderDto.getType())){
            agentProducer.sendRollSendMsg(orderInfo.getId());
        }
        agentProducer.sendRollSendMsg(orderInfo.getId());
//        OrderStateDto orderStateDto = new OrderStateDto();
//        orderStateDto.setOrderNo(orderInfo.getOrderNo());
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -115,6 +115,14 @@
                                            </div>
                                        </div>
                                        <div class="layui-form-item febs-hide class-set">
                                            <label class="layui-form-label">课程视频:</label>
                                            <div class="layui-input-block">
                                                <button type="button" class="layui-btn upload" id="uploadVideo" style="margin-bottom: 2px">上传文件</button>
                                                <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-form-item febs-hide house-set">
                                            <label class="layui-form-label">酒店名称:</label>
                                            <div class="layui-input-block">
@@ -639,6 +647,54 @@
            });
        }
        //图片上传
        // upload.render({
        //     elem: '#test2'
        //     ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
        //     ,multiple: true
        //     ,before: function(obj){
        //         //预读本地文件示例,不支持ie8
        //         layer.msg('上传中', {icon: 16, time: 0});
        //     }
        //     ,done: function(res){
        //         var item = this.item;
        //         //如果上传失败
        //         if(res.code !== 0){
        //             return layer.msg('上传失败');
        //         }
        //
        //         // $(item).parent().prev().find('input').val(res.data[0]);
        //         $("#videoUrl").val(res.data.src);
        //         layer.msg('上传完毕', {icon: 1});
        //     }
        // });
        upload.render({
            elem: '#uploadVideo'
            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
            // ,accept: 'file'
            ,multiple: true
            ,before: function(obj){
                layer.msg('上传中', {icon: 16, time: 0});
            }
            ,done: function(res){
                var item = this.item;
                //如果上传失败
                if(res.code !== 0){
                    return layer.msg('上传失败');
                }
                // $(item).parent().prev().find('input').val(res.data[0]);
                $("#videoUrl").val(res.data.src);
                layer.msg('上传完毕', {icon: 1});
            }
            ,error: function(err){
                return layer.msg('上传失败');
            }
        });
        //(下拉框)
        $.get(ctx + 'admin/goodsCategory/categorys/allTree', function (data) {
            for (var k in data)
@@ -778,6 +834,13 @@
                    $(this).hide();
                }
            })
            $('.class-set').each(function() {
                if (data.value == 4) {
                    $(this).show();
                } else {
                    $(this).hide();
                }
            })
            $('.house-set').each(function() {
                if (data.value == 5) {
                    $(this).show();
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -124,6 +124,14 @@
                                            </div>
                                        </div>
                                        <div class="layui-form-item febs-hide class-set">
                                            <label class="layui-form-label">课程视频:</label>
                                            <div class="layui-input-block">
                                                <button type="button" class="layui-btn upload" id="uploadVideo" style="margin-bottom: 2px">上传文件</button>
                                                <input type="text" name="videoUrl" autocomplete="off" value="" id="videoUrl" class="layui-input" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-form-item febs-hide house-set">
                                            <label class="layui-form-label">酒店名称:</label>
                                            <div class="layui-input-block">
@@ -778,6 +786,28 @@
                });
            })
        }
        upload.render({
            elem: '#uploadVideo'
            ,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
            ,accept: 'file'
            ,before: function(obj){
                layer.msg('上传中', {icon: 16, time: 0});
            }
            ,done: function(res){
                var item = this.item;
                //如果上传失败
                if(res.code !== 0){
                    return layer.msg('上传失败');
                }
                // $(item).parent().prev().find('input').val(res.data[0]);
                $("#videoUrl").val(res.data.src);
                layer.msg('上传完毕', {icon: 1});
            }
            ,error: function(err){
                return layer.msg('上传失败');
            }
        });
        function initValue() {
            var images = goodsInfo.images;
@@ -800,6 +830,7 @@
                "levelOnePrice": goodsInfo.levelOnePrice,
                "levelTwoPrice": goodsInfo.levelTwoPrice,
                "levelThreePrice": goodsInfo.levelThreePrice,
                "videoUrl": goodsInfo.videoUrl,
                "houseName": goodsInfo.houseName,
                "houseAddress": goodsInfo.houseAddress,
                "isUnreal": goodsInfo.isUnreal,
@@ -827,6 +858,10 @@
            if (goodsInfo.isNormal == 5) {
                $(".house-set").show();
            }
            if (goodsInfo.isNormal == 4) {
                $(".class-set").show();
            }
            if (goodsInfo.levelTwoPrice == 1) {
@@ -926,6 +961,13 @@
                    $(this).hide();
                }
            })
            $('.class-set').each(function() {
                if (data.value == 4) {
                    $(this).show();
                } else {
                    $(this).hide();
                }
            })
        });
        form.on('radio(hasRoll)', function(data){