Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
soss
Overview
Overview
Details
Activity
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
hooloo
ms
soss
Commits
5ba97db2
Commit
5ba97db2
authored
Apr 25, 2023
by
weijiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
2dd34db7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
3 deletions
+1
-3
soss-system/src/main/java/com/soss/system/service/impl/OrderTakingServiceImpl.java
+0
-2
soss-system/src/main/resources/mapper/system/ShopGoodsMapper.xml
+1
-1
No files found.
soss-system/src/main/java/com/soss/system/service/impl/OrderTakingServiceImpl.java
View file @
5ba97db2
...
@@ -56,8 +56,6 @@ public class OrderTakingServiceImpl {
...
@@ -56,8 +56,6 @@ public class OrderTakingServiceImpl {
throw
new
ServiceException
(
"该机器没有绑定店铺"
);
throw
new
ServiceException
(
"该机器没有绑定店铺"
);
}
}
return
this
.
getOrderTakingInfo
(
machine
.
getShopId
());
return
this
.
getOrderTakingInfo
(
machine
.
getShopId
());
}
}
public
OrderTakingVo
getInfoByShop
(
Long
shopId
)
{
public
OrderTakingVo
getInfoByShop
(
Long
shopId
)
{
...
...
soss-system/src/main/resources/mapper/system/ShopGoodsMapper.xml
View file @
5ba97db2
...
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN shop_goods sg ON g.id = sg.goods_id
LEFT JOIN shop_goods sg ON g.id = sg.goods_id
LEFT JOIN shop_recommend sr ON g.id = sr.goods_id and sr.`type` = 2
LEFT JOIN shop_recommend sr ON g.id = sr.goods_id and sr.`type` = 2
where g.state ='3' and g.is_deleted = 0 and sg.shop_id = #{shopId} and category like concat('%,', #{categoryId}, ',%')
where g.state ='3' and g.is_deleted = 0 and sg.shop_id = #{shopId} and category like concat('%,', #{categoryId}, ',%')
order by
sr.recommend_price
DESC,sg.turn
order by
isRecommend
DESC,sg.turn
</select>
</select>
<select
id=
"selectShopNoAddGoods"
resultType=
"com.soss.system.domain.Goods"
>
<select
id=
"selectShopNoAddGoods"
resultType=
"com.soss.system.domain.Goods"
>
select id, name, category, price, discount, take_time, spec, pics, `desc`, remarks, state, is_deleted, created_at, updated_at, code,shelf_at from goods
select id, name, category, price, discount, take_time, spec, pics, `desc`, remarks, state, is_deleted, created_at, updated_at, code,shelf_at from goods
...
...
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