Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

liujie

2 天以前 f75496139d661ee4c0550e4e10a86b899371637a

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

 cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java

@@ -118,16 +118,23 @@
        List<VipPaymentListVO> vipPaymentListVOS = new ArrayList<>();

        List<Integer> payStatus = new ArrayList<>();
        payStatus.add(2);
        LambdaQueryWrapper<VipPayment> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
        vipPaymentLambdaQueryWrapper.in(vipPaymentDto.getUserIds()!=null&&!vipPaymentDto.getUserIds().isEmpty(),VipPayment::getAppUserId, vipPaymentDto.getUserIds());
        vipPaymentLambdaQueryWrapper.in(vipPaymentDto.getVipIds()!=null&&!vipPaymentDto.getVipIds().isEmpty(),VipPayment::getVipId, vipPaymentDto.getVipIds());
        vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);
        vipPaymentLambdaQueryWrapper.ge(StringUtils.hasLength(vipPaymentDto.getStartTime()), VipPayment::getInsertTime, vipPaymentDto.getStartTime());
        vipPaymentLambdaQueryWrapper.le(StringUtils.hasLength(vipPaymentDto.getEndTime()), VipPayment::getInsertTime, vipPaymentDto.getEndTime());
        if (vipPaymentDto.getIsRefund()==null){
            payStatus.add(3);
            payStatus.add(2);
        }
        if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==1){
            payStatus.add(3);
        }
        if (vipPaymentDto.getIsRefund()!=null&&vipPaymentDto.getIsRefund()==2){
            payStatus.add(2);
        }
        vipPaymentLambdaQueryWrapper.in(VipPayment::getPayStatus,payStatus);

        vipPaymentLambdaQueryWrapper.orderByDesc(VipPayment::getInsertTime);
        List<VipPayment> list = vipPaymentService.list(vipPaymentLambdaQueryWrapper);
        // 使用 Stream + 手动拷贝提升性能和可读性（或使用 MapStruct）

 cloud-server-account/src/main/java/com/dsh/account/model/vo/VipPaymentListVO.java

@@ -41,7 +41,7 @@
    @ApiModelProperty(value = "是否退款 0否1时")
    private Integer isRefund;
    @ApiModelProperty(value = "备注")
    private Integer remark;
    private String remark;

    /**
     * 支付方式（1=微信，2=支付宝）

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -125,7 +125,10 @@
                .le(StringUtils.hasLength(vipDetailDto.getUseEndTime()), VipDetail::getUseTime, vipDetailDto.getUseEndTime())
                .eq(vipDetailDto.getOperatorId() != null, VipDetail::getOperatorId, vipDetailDto.getOperatorId())
                .eq(vipDetailDto.getType() != null, VipDetail::getType, vipDetailDto.getType())
                .eq(vipDetailDto.getStatus() != null, VipDetail::getStatus, vipDetailDto.getStatus()).list();
                .eq(vipDetailDto.getStatus() != null, VipDetail::getStatus, vipDetailDto.getStatus())
                .orderByDesc(VipDetail::getInsertTime)
                .list();


        // 使用 Stream + 手动拷贝提升性能和可读性（或使用 MapStruct）
        vipDetailVOS = list.stream().map(vipDetail -> {
@@ -952,6 +955,7 @@
            VipDetail vipDetailServiceById = vipDetailService.getById(userCoupon.getVipDetailId());
            vipDetailServiceById.setUseTime(new Date());
            vipDetailServiceById.setStatus(2);
            vipDetailService.updateById(vipDetailServiceById);
        }

    }

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

@@ -39,7 +39,7 @@
    @ApiModelProperty(value = "是否退款 0否1时")
    private Integer isRefund;
    @ApiModelProperty(value = "备注")
    private Integer remark;
    private String remark;

    /**
     * 支付方式（1=微信，2=支付宝）

 cloud-server-management/src/main/webapp/WEB-INF/view/system/vipPayment/vip_payment.html

@@ -26,7 +26,7 @@
                                            是否退费
                                        </button>
                                    </div>
                                    <select class="form-control" id="type" >
                                    <select class="form-control" id="isRefund" >
                                        <option value="">全部</option>
                                        <option value="1">是</option>
                                        <option value="2">否</option>

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

@@ -77,7 +77,7 @@
        var index = layer.load(1,{
            type: 1
            , title: '会员退费'
            , area: ['800px', '600px']
            , area: ['600px', '550px']
            , offset: 'auto' //具体配置参考：http://www.layui.com/doc/modules/layer.html#offset
            , id: 'layerDemo' //防止重复弹出cge
            , content: '<div class="form-horizontal" style="padding-top: 20px;">' +
@@ -88,14 +88,15 @@
    '<div class="col-sm-9">'+
        '<input style="width: 300px" class="form-control" id="vipEndTime" name="vipEndTime" type="date">'+
    '</div>'+

                '                       </div>' +
                '                   </div>' +
                '                        <div class="form-group refusal" >\n' +
                '                            <label class="col-sm-3 control-label">备注：</label>\n' +
                '                            <div class="col-sm-9">\n' +
                '                     <textarea id="refusal" class="form-control" style="width: 100%;height: 200px"></textarea>'+
                '                     <textarea id="refusal" class="form-control" style="width: 100%;height: 120px"></textarea>'+
                '                            </div>\n' +
                '                        </div>\n' +
                '                       </div>' +
                '                   </div>' +
                '</div>'
            , btn: ['保存', '关闭']
            , btnAlign: 'c' //按钮居中