修改支付

src/main/resources/mapper/TbCashierCartMapper.xml

@@ -379,7 +379,11 @@
     </update>
 
     <select id="selectByOrderId" resultMap="BaseResultMap">
-        select * from tb_cashier_cart where order_id=#{orderId} and `status`=#{status}
+        select * from tb_cashier_cart where order_id=#{orderId}
+        <if test="status != null">
+            and `status`=#{status}
+        </if>
+
     </select>
     <select id="selectAllByMarketId" resultType="com.chaozhanggui.system.cashierservice.entity.TbCashierCart">
         select * from tb_cashier_cart where master_id = #{masterId} and trade_day = #{day} and shop_id = #{shopId} and status = 'create'

src/main/resources/mapper/TbShopUserMapper.xml

@@ -372,5 +372,9 @@
     order by id desc
 
 
+    </select>
+
+  <select id="selectByUserIdAndShopId" resultMap="BaseResultMap">
+    select * from tb_shop_user where user_id=#{userId} and shop_id =#{shopId}
     </select>
 </mapper>