记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
ddf2754c
Commit
ddf2754c
authored
Jan 25, 2022
by
zhanggb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~API:商品管理:添加/编辑SKU:+更新商品价格区间逻辑;
parent
756133c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
24 deletions
+28
-24
category.html
...esources/templates/zhengzai/goblin/category/category.html
+24
-24
GoblinStoreMgtGoodsServiceImpl.java
...n/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
+4
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html
View file @
ddf2754c
...
@@ -83,30 +83,30 @@
...
@@ -83,30 +83,30 @@
<body
class=
"gray-bg"
>
<body
class=
"gray-bg"
>
<div
class=
"container-div"
>
<div
class=
"container-div"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-sm-12 search-collapse"
>
<!-- <div class="col-sm-12 search-collapse">--
>
<form
id=
"role-form"
>
<!-- <form id="role-form">--
>
<div
class=
"select-list"
>
<!-- <div class="select-list">--
>
<ul
>
<!-- <ul>--
>
<li
>
<!-- <li>--
>
名称:
<input
type=
"text"
name=
"tagName"
/
>
<!-- 名称:<input type="text" name="tagName"/>--
>
</li
>
<!-- </li>--
>
<li
>
<!-- <li>--
>
类型:
<select
name=
"tagType"
th:with=
"type=${@dict.getType('zhengzai_store_cert_type')}"
>
<!-- 类型:<select name="tagType" th:with="type=${@dict.getType('zhengzai_store_cert_type')}">--
>
<option
value=
""
>
全部
</option
>
<!-- <option value="">全部</option>--
>
<option
th:each=
"dict : ${type}"
th:text=
"${dict.dictLabel}"
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
th:value=
"${dict.dictValue}"
></option
>
<!-- th:value="${dict.dictValue}"></option>--
>
</select
>
<!-- </select>--
>
</li
>
<!-- </li>--
>
<li
>
<!-- <li>--
>
<a
class=
"btn btn-primary btn-rounded btn-sm"
onclick=
"$.table.search()"
><i
<!-- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i-->
class=
"fa fa-search"
></i>
搜索
</a
>
<!-- class="fa fa-search"></i> 搜索</a>--
>
<a
class=
"btn btn-warning btn-rounded btn-sm"
onclick=
"$.form.reset()"
><i
<!-- <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
class=
"fa fa-refresh"
></i>
重置
</a
>
<!-- class="fa fa-refresh"></i> 重置</a>--
>
</li
>
<!-- </li>--
>
</ul
>
<!-- </ul>--
>
</div
>
<!-- </div>--
>
</form
>
<!-- </form>--
>
</div
>
<!-- </div>--
>
<div
class=
"btn-group-sm"
id=
"toolbar"
role=
"group"
>
<div
class=
"btn-group-sm"
id=
"toolbar"
role=
"group"
>
<a
class=
"btn btn-success"
id=
"button-open-10"
shiro:hasPermission=
"goblin:extag:add"
>
<a
class=
"btn btn-success"
id=
"button-open-10"
shiro:hasPermission=
"goblin:extag:add"
>
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
View file @
ddf2754c
...
@@ -341,6 +341,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
...
@@ -341,6 +341,7 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
priceGe
=
priceGe
.
compareTo
(
BigDecimal
.
ZERO
)
==
0
?
skuInfoVo
.
getPrice
()
:
(
priceGe
.
compareTo
(
skuInfoVo
.
getPrice
())
>
0
?
skuInfoVo
.
getPrice
()
:
priceGe
);
priceGe
=
priceGe
.
compareTo
(
BigDecimal
.
ZERO
)
==
0
?
skuInfoVo
.
getPrice
()
:
(
priceGe
.
compareTo
(
skuInfoVo
.
getPrice
())
>
0
?
skuInfoVo
.
getPrice
()
:
priceGe
);
priceLe
=
priceLe
.
compareTo
(
skuInfoVo
.
getPrice
())
<
0
?
skuInfoVo
.
getPrice
()
:
priceLe
;
priceLe
=
priceLe
.
compareTo
(
skuInfoVo
.
getPrice
())
<
0
?
skuInfoVo
.
getPrice
()
:
priceLe
;
}
}
LinkedList
<
Object
[]>
updateGoodsObjs
=
CollectionUtil
.
linkedListObjectArr
();
LinkedList
<
Object
[]>
updateGoodsObjs
=
CollectionUtil
.
linkedListObjectArr
();
if
(
priceGe
.
compareTo
(
goodsInfoVo
.
getPriceGe
())
!=
0
||
priceLe
.
compareTo
(
goodsInfoVo
.
getPriceLe
())
!=
0
)
{
if
(
priceGe
.
compareTo
(
goodsInfoVo
.
getPriceGe
())
!=
0
||
priceLe
.
compareTo
(
goodsInfoVo
.
getPriceLe
())
!=
0
)
{
...
@@ -348,6 +349,9 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
...
@@ -348,6 +349,9 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
goodsInfoVo
.
setPriceLe
(
priceLe
);
goodsInfoVo
.
setPriceLe
(
priceLe
);
goodsInfoVo
.
setUpdatedBy
(
uid
);
goodsInfoVo
.
setUpdatedBy
(
uid
);
goodsInfoVo
.
setUpdatedAt
(
now
);
goodsInfoVo
.
setUpdatedAt
(
now
);
goblinMongoUtils
.
updateGoodsInfoVo
(
goodsInfoVo
);
updateGoodsObjs
.
add
(
new
Object
[]{
priceGe
,
priceLe
,
uid
,
now
,
spuId
});
updateGoodsObjs
.
add
(
new
Object
[]{
priceGe
,
priceLe
,
uid
,
now
,
spuId
});
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment