KKSU
2024-05-30 2b05185ea72d3250d0952e94083dc868ab192f2c
图片上传
5 files modified
104 ■■■■ changed files
src/main/java/cc/mrbird/febs/mall/dto/ShopApplyDto.java 32 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 6 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java 3 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/shopApply.html 26 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/shopApplyInfo.html 37 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/ShopApplyDto.java
@@ -14,39 +14,19 @@
@ApiModel(value = "ShopApplyDto", description = "申请通道接口参数接收类")
public class ShopApplyDto {
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "商店名称")
    private String shopName;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "经度")
    private String longitude;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "纬度")
    private String latitude;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "姓名", example = "123")
    private String name;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "联系方式", example = "15712341234")
    @ApiModelProperty(value = "电话", example = "15712341234")
    private String phone;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "身份证")
    private String idcard;
    @ApiModelProperty(value = "店铺名称")
    private String shopName;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "营业执照")
    private String businessLicense;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "经营场地")
    private String saleArea;
    @NotBlank(message = "参数错误")
    @ApiModelProperty(value = "地址")
    private String address;
    @ApiModelProperty(value = "营业执照")
    private String businessLicense;
}
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -94,8 +94,12 @@
    public Long createOrder(AddOrderDto addOrderDto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMember member = mallMemberMapper.selectById(memberId);
        Integer storeMaster = member.getStoreMaster();
        if(1 != storeMaster){
            throw new FebsException("请先认证店铺信息");
        }
                //验证用户的等级
        //验证用户的等级
//        if(AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())){
//            throw new FebsException("请先申请成为代理人");
//        }
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -99,4 +99,7 @@
    @ApiModelProperty(value = "会员信息")
    private MallVipConfig vipInfo;
    @ApiModelProperty(value = "是否验证店铺信息")
    private Integer storeMaster;
}
src/main/resources/templates/febs/views/modules/mallMember/shopApply.html
@@ -52,27 +52,9 @@
    <a lay-event="edit" shiro:hasPermission="user:update"><i
            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
</script>
<script type="text/html" id="card-url">
    {{#
        var imgUrl = d.idcard;
        if(imgUrl) {
            imgUrl = imgUrl.substring(imgUrl.indexOf(',') + 1);
        }
    }}
    <img src="{{ imgUrl }}" alt="" />
</script>
<script type="text/html" id="license-url">
    {{#
        var imgUrl = d.businessLicense;
        if(imgUrl) {
            imgUrl = imgUrl.substring(imgUrl.indexOf(',') + 1);
        }
    }}
    <img src="{{ imgUrl }}" alt="" />
</script>
<script type="text/html" id="area-url">
    {{#
        var imgUrl = d.saleArea;
        if(imgUrl) {
            imgUrl = imgUrl.substring(imgUrl.indexOf(',') + 1);
        }
@@ -149,11 +131,11 @@
                cols: [[
                    {field: 'vipName', title: '会员名称', minWidth: 100},
                    {field: 'inviteId', title: '邀请码', minWidth: 100},
                    {field: 'name', title: '法人姓名', minWidth: 100},
                    {field: 'phone', title: '联系方式', minWidth: 100},
                    {templet: '#card-url', title: '身份证', minWidth: 100},
                    {field: 'name', title: '姓名', minWidth: 100},
                    {field: 'phone', title: '电话', minWidth: 100},
                    {field: 'shopName', title: '店铺名称', minWidth: 100},
                    {field: 'address', title: '店铺地址', minWidth: 100},
                    {templet: '#license-url', title: '营业执照', minWidth: 100},
                    {templet: '#area-url', title: '经营场地', minWidth: 100},
                    {templet: '#apply-status', title: '状态', minWidth: 100},
                    {title: '操作',
                        templet: function (d) {
src/main/resources/templates/febs/views/modules/mallMember/shopApplyInfo.html
@@ -26,21 +26,15 @@
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">法人名称:</label>
            <label class="layui-form-label febs-form-item-require">姓名:</label>
            <div class="layui-input-block">
                <input type="text" name="name" data-th-id="${apply.name}" autocomplete="off" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">联系方式:</label>
            <label class="layui-form-label febs-form-item-require">电话:</label>
            <div class="layui-input-block">
                <input type="text" name="phone" data-th-id="${apply.phone}" autocomplete="off" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">身份证:</label>
            <div class="layui-input-block">
                <blockquote id="cardUrl"></blockquote>
            </div>
        </div>
        <div class="layui-form-item">
@@ -50,9 +44,15 @@
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">经营场地:</label>
            <label class="layui-form-label febs-form-item-require">店铺名称:</label>
            <div class="layui-input-block">
                <blockquote id="areaUrl"></blockquote>
                <blockquote id="shopName"></blockquote>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">店铺地址:</label>
            <div class="layui-input-block">
                <blockquote id="address"></blockquote>
            </div>
        </div>
@@ -82,13 +82,6 @@
        form.render();
        initUrl();
        function initUrl() {
            var cardUrl = apply.idcard;
            if (cardUrl) {
                var list = cardUrl.split(",")
                laytpl(templateHtml).render(list, function(html) {
                    $('#cardUrl').append(html);
                })
            }
            var businessUrl = apply.businessLicense;
            if (businessUrl) {
@@ -97,20 +90,14 @@
                    $('#businessLicense').append(html);
                })
            }
            var areaUrl = apply.saleArea;
            if (areaUrl) {
                var areaList = areaUrl.split(",")
                laytpl(templateHtml).render(areaList, function(html) {
                    $('#areaUrl').append(html);
                })
            }
        }
        initUserValue();
        function initUserValue() {
            form.val("shop-apply-detail-form", {
                "name": apply.name,
                "phone": apply.phone,
                "shopName": apply.shopName,
                "address": apply.address,
            });
        }