Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

Merge remote-tracking branch 'origin/2.0' into 2.0

 cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml

@@ -105,7 +105,7 @@
            and userPopulation = #{query.userPopulation}
        </if>
        <if test="query.state != null">
            and `state` = #{query.state}
            and `shelves` = #{query.state}
        </if>
        and `type` = 3
        order by sort desc

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java

@@ -1,6 +1,7 @@
package com.dsh.guns.modular.system.controller.code;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.VipPaymentClient;
import com.dsh.course.feignClient.account.model.QueryByNamePhone;
@@ -44,7 +45,7 @@
    @Autowired
    private CouponClient couponClient;
    @Autowired
    private IStoreService storeService;
    private IRelationService relationService;
    @Autowired
    private AppUserClient appUserClient;
    @Autowired
@@ -78,6 +79,9 @@
            , Integer isRefund
            , String time
            ) {
        // 判断当前是否有权限
        String roleid = UserExt.getUser().getRoleid();
        int count = relationService.count(new LambdaQueryWrapper<Relation>().eq(Relation::getRoleid, roleid).eq(Relation::getMenuid, 646));
        VipPaymentDto vipPaymentDto = new VipPaymentDto();
        if (StringUtils.hasLength(vipName)){
            List<Integer> vipIds = vipService.lambdaQuery().like(Vip::getVipName, vipName)
@@ -151,7 +155,12 @@
                re.setAppUserName(appUser.getName());
                re.setAppUserPhone(appUser.getPhone());
            }
            if (count>0){
                re.setMenuShow(1);
            }

        }

        return res;
    }
    /**

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/vo/VipPaymentListVO.java

@@ -67,5 +67,8 @@
    @TableField("state")
    private Integer state;

    @ApiModelProperty(value = "菜单显示 1显示 2不显示")
    private Integer menuShow=2;


}

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_img.html

@@ -40,5 +40,8 @@
<script>
</script>
<script type="application/javascript">
    var welfarePicture = new $WebUpload("welfarePicture");
    welfarePicture.setUploadBarId("progressBar");
    welfarePicture.init();
</script>
@}

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js

@@ -651,9 +651,9 @@
    var carPhoto = new $WebUpload("img");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var carPhoto = new $WebUpload("welfarePicture");
    carPhoto.setUploadBarId("progressBar");
    carPhoto.init();
    var welfarePicture = new $WebUpload("welfarePicture");
    welfarePicture.setUploadBarId("progressBar");
    welfarePicture.init();
    var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto");
    drivingLicensePhoto.setUploadBarId("progressBar");
    drivingLicensePhoto.init();

 cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js

@@ -28,17 +28,25 @@
                return {0:"否",1:"是"}[data]
            }
        },
        {title: '权限展示', field: 'menuShow', visible: false, align: 'center', valign: 'middle',
            formatter:function (data) {
                return {2:"否",1:"是"}[data]
            }
        },
        {title: '备注', field: 'remark', visible: true, align: 'center', valign: 'middle'},
        { title: '操作', field: 'remark', visible: true, align: 'center', valign: 'middle',
            formatter: function (data,row) {
                // row.redCode存储的设备二维码连接
                var temp = row.isRefund;
                var menuShow = row.menuShow;
                var id = row.id;
                // 已退费不展示按钮
                if (temp==0){
                if (temp==0 && menuShow==1){
                    var str = '<button class="btn btn-outline btn-primary" onclick="TCompetition.refund(\'' + id + '\')" >'+'会员退费'+'</button>'
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="" onfocus="TUser.tooltip()">' + str + '</p>']
                    return btn;
                }else if (temp==0 && menuShow==2){
                    return "-";
                }else{
                    return '已退费';
                }

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java

@@ -75,6 +75,7 @@
                vo.setSort(homeModule.getSort());
                vo.setBackgroundImage(homeModule.getBackgroundImage());
                vo.setDisplayType(homeModule.getDisplayType());
                vo.setId(homeModule.getId());
                listVo.add(vo);
            }
            for (StoreConfig storeConfig : list) {

 cloud-server-other/src/main/java/com/dsh/other/controller/TVipController.java

@@ -58,6 +58,9 @@
            List<TicketVipResp> ticketVipRespList = new ArrayList<>();
            String couponJson = vip.getCouponJson();
            JSONArray couponJsonArray = JSONArray.parseArray(couponJson);
            if(couponJsonArray==null){
                continue;
            }
            for (Object o : couponJsonArray) {
                JSONObject couponJsonObject = (JSONObject) o;
                // 优惠券id