Commit 5ba97db2 by weijiguang

.

parent 2dd34db7
......@@ -56,8 +56,6 @@ public class OrderTakingServiceImpl {
throw new ServiceException("该机器没有绑定店铺");
}
return this.getOrderTakingInfo(machine.getShopId());
}
public OrderTakingVo getInfoByShop(Long shopId) {
......
......@@ -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_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}, ',%')
order by sr.recommend_price DESC,sg.turn
order by isRecommend DESC,sg.turn
</select>
<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
......
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