From 999f3781c03c643003cb9008587a2038eaff55d9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Feb 2023 10:39:05 +0800
Subject: [PATCH] 商品排序
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 4 +-
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java | 2 +
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 9 ++++
src/main/resources/templates/febs/views/modules/order/orderRefundList.html | 32 ++++++++-------
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 14 +++++-
src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java | 2 +
src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java | 2 +
7 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
index c58fe35..ffba2f7 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
@@ -89,5 +89,7 @@
private Long carriageRuleId;
//重量
private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
index 9c2a08e..c7dea0b 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/MallGoodsUpdateDto.java
@@ -94,4 +94,6 @@
private Long carriageRuleId;
//重量
private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
index c104dda..4a19adf 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -124,5 +124,7 @@
private Long carriageRuleId;
//重量
private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
}
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index a9d26b9..b5bf405 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -115,7 +115,7 @@
</if>
</where>
group by a.id
- order by a.id desc
+ order by a.order_number ASC
) a
<if test="record.sortType != null">
<if test="record.sortType == 1">
@@ -348,7 +348,7 @@
</if>
</where>
group by a.id
- order by a.id desc
+ order by a.order_number ASC
) a
<if test="record.sortType != null">
<if test="record.sortType == 1">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
index 1693b97..1a299d2 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -36,13 +36,20 @@
</div>
</div>
- <div class="layui-col-lg6">
+ <div class="layui-col-lg3">
<label class="layui-form-label">是否主推：</label>
<div class="layui-input-block">
<input type="radio" name="isHot" value="1" title="是" />
<input type="radio" name="isHot" value="2" title="否" checked />
</div>
</div>
+
+ <div class="layui-col-lg3">
+ <label class="layui-form-label febs-form-item-require">序号：</label>
+ <div class="layui-input-block">
+ <input type="number" name="orderNumber" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
+ </div>
+ </div>
</div>
<div class="layui-form-item">
diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
index 6de6d6b..c2026ed 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -40,11 +40,18 @@
</div>
</div>
- <div class="layui-col-lg6">
+ <div class="layui-col-lg3">
<label class="layui-form-label">是否主推：</label>
<div class="layui-input-block">
- <input type="radio" name="isHot" value="1" title="是" />
- <input type="radio" name="isHot" value="2" title="否" checked />
+ <input type="radio" name="isHot" value="1" title="是" />
+ <input type="radio" name="isHot" value="2" title="否" checked />
+ </div>
+ </div>
+
+ <div class="layui-col-lg3">
+ <label class="layui-form-label febs-form-item-require">序号：</label>
+ <div class="layui-input-block">
+ <input type="number" name="orderNumber" lay-verify="required" placeholder="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -722,6 +729,7 @@
"carriageType": goodsInfo.carriageType,
"carriageAmount": goodsInfo.carriageAmount,
"goodsWeight": goodsInfo.goodsWeight,
+ "orderNumber": goodsInfo.orderNumber,
"thumbs": thumbs
});
diff --git a/src/main/resources/templates/febs/views/modules/order/orderRefundList.html b/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
index d1c000c..d10c207 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderRefundList.html
@@ -7,25 +7,27 @@
<div class="layui-form-item">
<div class="layui-col-md10">
<div class="layui-inline">
+ <label class="layui-form-label">退款人：</label>
<div class="layui-input-inline">
<input type="text" placeholder="退款人" name="refundMemberName" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">手机号码：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="退款人手机号码" name="refundMemberPhone" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="手机号码" name="refundMemberPhone" autocomplete="off" class="layui-input">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="团长" name="leaderName" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" placeholder="团长手机号码" name="leaderPhone" autocomplete="off" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input type="text" placeholder="团长" name="leaderName" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input type="text" placeholder="团长手机号码" name="leaderPhone" autocomplete="off" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<label class="layui-form-label layui-form-label-sm">退款状态</label>
<div class="layui-input-inline">
@@ -146,8 +148,8 @@
{field: 'refundMemberPhone', title: '退款人手机号码', minWidth: 150,align:'left'},
{field: 'goodsName', title: '商品名称', minWidth: 150,align:'left'},
{field: 'amount', title: '退款金额', minWidth: 100,align:'left'},
- {field: 'leaderName', title: '团长', minWidth: 100,align:'left'},
- {field: 'leaderPhone', title: '团长手机号码', minWidth: 150,align:'left'},
+ // {field: 'leaderName', title: '团长', minWidth: 100,align:'left'},
+ // {field: 'leaderPhone', title: '团长手机号码', minWidth: 150,align:'left'},
{field: 'state', title: '退款状态',
templet: function (d) {
if (d.state === 1) {
@@ -172,8 +174,8 @@
return {
refundMemberName: $searchForm.find('input[name="refundMemberName"]').val().trim(),
refundMemberPhone: $searchForm.find('input[name="refundMemberPhone"]').val().trim(),
- leaderName: $searchForm.find('input[name="leaderName"]').val().trim(),
- leaderPhone: $searchForm.find('input[name="leaderPhone"]').val().trim(),
+ // leaderName: $searchForm.find('input[name="leaderName"]').val().trim(),
+ // leaderPhone: $searchForm.find('input[name="leaderPhone"]').val().trim(),
state: $searchForm.find("select[name='state']").val(),
};
}
--
Gitblit v1.9.1