记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 939f47de authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

完善 admin list

parent ac02a567
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 27 deletions
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityDrawListSearchParam.java
View file @ 939f47de
......@@ -24,6 +24,21 @@ public class SweetIntegralActivityDrawListSearchParam implements Serializable {
@ApiModelProperty(value = "integralActivityId", example = "0")
private String integralActivityId;
@ApiModelProperty(value = "奖品名称")
private String prizeTitle;
@ApiModelProperty(value = "奖品类型")
private Integer prizeType;
@ApiModelProperty(value = "用户昵称")
private String nickname;
@ApiModelProperty(value = "发放状态")
private Integer receivingStatus;
@ApiModelProperty(value = "是否中奖")
private Integer isWin;
@ApiModelProperty(value = "页数", example = "0")
private Integer pageSize;
......
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeFormParam.java
View file @ 939f47de
......@@ -43,7 +43,7 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
@NotBlank(message = "prizeImgSelect不能为空")
private String prizeImgSelect;
@ApiModelProperty(required = true, value = "奖品类型 1谢谢惠顾 2积分 3优惠券 4实物", example = "1")
@ApiModelProperty(required = true, value = "奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物", example = "1")
@NotNull(message = "prizeType不能为空")
private Integer prizeType;
......
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityDrawVo.java
View file @ 939f47de
......@@ -29,7 +29,7 @@ public class IntegralActivityDrawVo implements Serializable, Cloneable {
@ApiModelProperty(value = "奖品名称")
private String prizeTitle;
@ApiModelProperty(value = "奖品类型 1谢谢惠顾 2积分 3优惠券 4实物")
@ApiModelProperty(value = "奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物")
private Integer prizeType;
@ApiModelProperty(value = "关联id 如商品id 券id")
......
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/admin/SweetIntegralActivityPrizeVo.java
View file @ 939f47de
......@@ -41,7 +41,7 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
@ApiModelProperty(required = true, value = "中奖选中奖品图片")
private String prizeImgSelect;
@ApiModelProperty(value = "奖品类型 1谢谢惠顾 2积分 3优惠券 4实物")
@ApiModelProperty(value = "奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物")
private Integer prizeType;
@ApiModelProperty(value = "单次奖励数量如积分 中奖给多少物")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html
View file @ 939f47de
......@@ -11,16 +11,48 @@
<div class="select-list">
<ul>
<input hidden type="text" name="integralActivityId" th:value="${integralActivityId}">
<!--<li>
<label>活动名称：</label>
<input type="text" name="activityTitle"/>
</li>-->
<!--<li>
<li>
<label>奖品名称：</label>
<input type="text" name="prizeTitle"/>
</li>
<li>
<label>奖品类型：</label>
<select name="prizeType">
<option value="">全部</option>
<option value="1">谢谢惠顾</option>
<option value="2">积分</option>
<option value="3">代金券</option>
<option value="4">满减券</option>
<option value="5">优先购买券</option>
<option value="6">实物</option>
</select>
</li>
<li>
<label>用户昵称：</label>
<input type="text" name="nickname"/>
</li>
<li>
<label>发放状态：</label>
<select name="receivingStatus">
<option value="">全部</option>
<option value="1">未发放</option>
<option value="2">已发放</option>
</select>
</li>
<li>
<label>是否中奖：</label>
<select name="isWin">
<option value="">全部</option>
<option value="1">未中奖</option>
<option value="2">已中奖</option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>-->
</li>
</ul>
</div>
</form>
......@@ -44,32 +76,53 @@
checkbox: true
},
{
field: 'prizeId',
title: 'prize_id'
field: 'prizeTitle',
title: '奖品名称'
},
{
field: 'userId',
title: 'user_id'
field: 'prizeType',
title: '奖品类型',
formatter: function (value, row) {
var prizeType = row.prizeType;
switch (prizeType) {
case 1:
break;
}
return prizeType;
}
},
{
field: 'prizeTypeNum',
title: '数量'
},
{
field: 'receivingAddressesId',
title: 'receiving_addresses_id'
field: 'nickname',
title: '用户昵称'
},
{
field: 'receivingName',
title: 'receiving_name'
title: '收货人姓名'
},
{
field: 'receivingPhone',
title: 'receiving_phone'
title: '收货人电话'
},
{
field: 'receivingAddress',
title: 'receiving_address'
title: '收货人姓名地址'
},
{
field: 'receivingStatus',
title: 'receiving_status'
title: '发放状态',
formatter: function (value, row) {
var receivingStatus = row.receivingStatus;
if (row.receivingStatus == 1) {
receivingStatus = "未发放";
} else {
receivingStatus = "已发放";
}
return receivingStatus;
}
},
{
field: 'createdAt',
......@@ -80,7 +133,7 @@
align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-danger btn-xs ' + receivingStatusFlag + '" href="javascript:void(0)" onclick="openModal(\'' + row.drawId + '\')"></i>发货</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + receivingStatusFlag + '" href="javascript:void(0)" onclick="openModal(\'' + row.drawId + '\')"></i>发放</a> ');
return actions.join('');
}
}]
......@@ -90,7 +143,7 @@
});
function openModal(id) {
$.modal.confirm(`确定要发货吗？`, function() {
$.modal.confirm(`确定要发放吗？`, function() {
$.ajax({
type: 'put',
url: '/sweet/IntegralActivityDraw/receivingStatus',
......@@ -98,7 +151,7 @@
success:function(e) {
console.log(e)
if (e.code == 0) {
layer.msg('发货成功！')
layer.msg('发放成功！')
$("button[name=refresh]").click();
}
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java
View file @ 939f47de
package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -47,8 +48,32 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
@Override
public PageInfo<SweetIntegralActivityDraw> drawList(SweetIntegralActivityDrawListSearchParam listParam) {
PageHelper.startPage(listParam.getPageNum(), listParam.getPageSize());
LambdaQueryWrapper<SweetIntegralActivityDraw> queryWrapper = Wrappers.lambdaQuery(SweetIntegralActivityDraw.class)
.eq(SweetIntegralActivityDraw::getIntegralActivityId, listParam.getIntegralActivityId());
if (!listParam.getNickname().isEmpty()) {
queryWrapper.like(SweetIntegralActivityDraw::getNickname, listParam.getNickname());
}
if (!listParam.getPrizeTitle().isEmpty()) {
queryWrapper.like(SweetIntegralActivityDraw::getPrizeTitle, listParam.getPrizeTitle());
}
Integer prizeType = listParam.getPrizeType();
if (null != prizeType && prizeType > 0) {
queryWrapper.like(SweetIntegralActivityDraw::getPrizeType, prizeType);
}
Integer receivingStatus = listParam.getReceivingStatus();
if (null != receivingStatus && receivingStatus > 0) {
queryWrapper.like(SweetIntegralActivityDraw::getReceivingStatus, receivingStatus);
}
Integer isWin = listParam.getIsWin();
if (null != isWin && isWin > 0) {
if (isWin == 1) {
queryWrapper.eq(SweetIntegralActivityDraw::getPrizeType, 1);
} else if (isWin == 2) {
queryWrapper.ne(SweetIntegralActivityDraw::getPrizeType, 1);
}
}
List<SweetIntegralActivityDraw> sweetIntegralActivityDraws = sweetIntegralActivityDrawMapper.selectList(
Wrappers.lambdaQuery(SweetIntegralActivityDraw.class).eq(SweetIntegralActivityDraw::getIntegralActivityId, listParam.getIntegralActivityId())
queryWrapper
);
return new PageInfo(sweetIntegralActivityDraws);
}
......
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityDraw.java
View file @ 939f47de
......@@ -53,7 +53,7 @@ public class SweetIntegralActivityDraw implements Serializable, Cloneable {
private String prizeTitle;
/**
* 奖品类型 1谢谢惠顾 2积分 3优惠券 4实物
* 奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
*/
private Integer prizeType;
......
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityPrize.java
View file @ 939f47de
......@@ -54,7 +54,7 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
private String prizeImgSelect;
/**
* 奖品类型 1谢谢惠顾 2积分 3优惠券 4实物
* 奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物
*/
private Integer prizeType;
......
liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql
View file @ 939f47de
......@@ -38,7 +38,7 @@ CREATE TABLE `sweet_integral_activity_prize`
`prize_title` varchar(255) NOT NULL DEFAULT '' COMMENT '奖品名称',
`prize_img_init` varchar(255) NOT NULL DEFAULT '' COMMENT '初始展示奖品图片',
`prize_img_select` varchar(255) NOT NULL DEFAULT '' COMMENT '中奖选中奖品图片',
`prize_type` tinyint NOT NULL DEFAULT 0 COMMENT '奖品类型 1谢谢惠顾 2积分 3优惠券 4实物',
`prize_type` tinyint NOT NULL DEFAULT 0 COMMENT '奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物',
`relation_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联id 如商品id 券id',
`prize_type_num` int NOT NULL DEFAULT 0 COMMENT '单次奖励数量如积分 中奖给多少',
`prize_num` int NOT NULL DEFAULT 0 COMMENT '奖品数量',
......@@ -64,7 +64,7 @@ CREATE TABLE `sweet_integral_activity_draw`
`activity_num` int NOT NULL DEFAULT 0 COMMENT '活动玩一次所需积分',
`prize_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联奖品id',
`prize_title` varchar(255) NOT NULL DEFAULT '' COMMENT '奖品名称',
`prize_type` tinyint NOT NULL DEFAULT 0 COMMENT '奖品类型 1谢谢惠顾 2积分 3优惠券 4实物',
`prize_type` tinyint NOT NULL DEFAULT 0 COMMENT '奖品类型 1谢谢惠顾 2积分 3代金券 4满减券 5优先购买券 6实物',
`prize_type_num` int NOT NULL DEFAULT 0 COMMENT '单次奖励数量如积分 中奖给多少',
`relation_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联id 如商品id 券id',
`user_id` varchar(255) NOT NULL DEFAULT '' COMMENT '关联用户id',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment