netty

src/main/resources/mapper/TbCashierCartMapper.xml

@@ -37,7 +37,7 @@
     <sql id="Base_Column_List">
     id, master_id, order_id, ref_order_id, total_amount, product_id, cover_img, is_sku,pack_fee,is_pack,is_gift,pending_at,
     sku_id, name, sale_price, number, total_number, refund_number, category_id, status,
-    type, merchant_id, shop_id, created_at, updated_at, user_id, table_id,pack_fee,trade_day,uuid,,sku_name
+    type, merchant_id, shop_id, created_at, updated_at, user_id, table_id,pack_fee,trade_day,uuid,sku_name
   </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -46,6 +46,11 @@
         from tb_cashier_cart
         where id = #{id,jdbcType=INTEGER}
     </select>
+    <select id="selectByShopIdAndTableId" resultType="com.chaozhanggui.system.cashierservice.entity.TbCashierCart">
+        select
+        <include refid="Base_Column_List"/>
+        from tb_cashier_cart where shop_id = #{shopId} and table_id = #{tableId} and status='create'
+    </select>
     <select id="selectALlByMasterId" resultType="com.chaozhanggui.system.cashierservice.entity.TbCashierCart">
         select
         <include refid="Base_Column_List"/>
@@ -351,6 +356,11 @@
         update tb_cashier_cart set status = #{status} where table_id = #{tableId} and status = 'create'
     </update>
 
+    <update id="updateStatusById">
+        update tb_cashier_cart set status = #{status} where id = #{id}
+    </update>
+
+
     <select id="selectByOrderId" resultMap="BaseResultMap">
         select * from tb_cashier_cart where order_id=#{orderId}
         <if test="status != null">

src/main/resources/mapper/TbProductMapper.xml

@@ -891,7 +891,7 @@
   <select id="selectByIdIn" resultMap="BaseResultMap">
     select *
     from tb_product
-    where id in (${ids}) and is_show_mall =1 order by  low_price asc
+    where id in (${ids}) and is_show_mall =1 order by  sort asc
     </select>
   <select id="selectById" resultType="com.chaozhanggui.system.cashierservice.entity.TbProduct">
     select
@@ -961,7 +961,7 @@
       <where>
           info.`status`='1'
           AND pro.is_combo = '1'
-          AND info.cities = #{cities}
+          AND (info.cities = #{cities} or info.districts = #{cities})
           <if test="proName != null and proName != ''">
               AND pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%')
           </if>
@@ -974,13 +974,13 @@
           </if>
       </where>
       <choose>
-          <when test="orderBy == '1'">
+          <when test="orderBy == 1">
               ORDER BY (ABS(info.lat - #{lat}) + ABS(info.lng - #{lng})) ASC
           </when>
-          <when test="orderBy == '2'">
+          <when test="orderBy == 2">
               ORDER BY pro.real_sales_number desc
           </when>
-          <when test="orderBy == '3'">
+          <when test="orderBy == 3">
               ORDER BY pro.low_price ASC
           </when>
           <otherwise>
@@ -1008,7 +1008,7 @@
     LEFT JOIN tb_shop_info AS info ON info.id =  `order`.shop_id
     <where>
       info.`status`='1'
-      AND info.cities = #{cities}
+      AND (info.cities = #{cities} or info.districts = #{cities})
       <if test="proName != null and proName != ''">
         AND  pro.`name` LIKE concat('%',#{proName,jdbcType=VARCHAR},'%')
       </if>

src/main/resources/mapper/TbProductSkuMapper.xml

@@ -339,7 +339,7 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
     <update id="updateStockById">
-      update tb_product_sku set stock_number = stock_number - #{num} where id = #{skuId}
+      update tb_product_sku set stock_number = stock_number + #{num} where id = #{skuId}
     </update>
   <update id="updateAddStockById">
     update tb_product_sku set stock_number = stock_number + #{num} where id = #{skuId}