商品查询修改

src/main/resources/mapper/TbOrderDetailMapper.xml

@@ -228,6 +228,10 @@
     <select id="selectByOrderId" resultType="java.math.BigDecimal">
         select IFNULL(sum(price_amount),0) from tb_order_detail where order_id=#{orderId} and `status`='refund'
     </select>
+    <select id="selectByOrderIdAndSkuId"
+            resultType="com.chaozhanggui.system.cashierservice.entity.TbOrderDetail">
+        select * from tb_order_detail where order_id = #{orderId} and product_sku_id = #{skuId}
+    </select>
 
     <update id="updateStatusByOrderIdAndStatus">
         update tb_order_detail set status = #{status} where order_id = #{orderId} and  status='unpaid'

src/main/resources/mapper/TbOrderInfoMapper.xml

@@ -537,4 +537,9 @@
     <select id="selectAllByStatus" resultMap="BaseResultMap">
         select * from tb_order_info where `status`=#{status} and order_type !='miniapp'
     </select>
+    <select id="selectByTradeAndMasterId"
+            resultType="com.chaozhanggui.system.cashierservice.entity.TbOrderInfo">
+
+select * from tb_order_info where trade_day = #{day} and table_id = #{masterId} and shop_id = #{shopId}
+    </select>
 </mapper>

src/main/resources/mapper/TbProductMapper.xml

@@ -883,7 +883,7 @@
   </update>
 
   <select id="selectByShopId" resultMap="ResultMapWithBLOBs">
-    select * from tb_product where shop_id=#{shopId} and status=1 and is_show_cash = 1
+    select * from tb_product where shop_id=#{shopId} and status=1 and is_show_cash = 1 and type_enum in ('normal','sku','currentPrice','weight')
     <if test="commdityName != null and commdityName!='' ">
       and name like CONCAT('%',#{commdityName},'%')
     </if>
@@ -893,7 +893,7 @@
 
   <select id="selectByShopIdAndShopType" resultMap="ResultMapWithBLOBs">
 
-    select * from tb_product where shop_id=#{shopId} and status=1 and category_id=#{categoryId} and is_show_cash = 1
+    select * from tb_product where shop_id=#{shopId} and status=1 and category_id=#{categoryId} and is_show_cash = 1  and type_enum in ('normal','sku','currentPrice','weight')
 
     <if test="commdityName != null and commdityName!='' ">
       and name like CONCAT('%',#{commdityName},'%')