Merge branch 'dev-增加商铺分类' of https://e.coding.net/chuanghaikeji/moxuanyunshangwaimai/backend into dev-测试环境分支不要从这拉代码

src/main/resources/mapper/order/OrderMapper.xml

@@ -151,10 +151,10 @@
         <if test="query.shopTypeId!=null and query.shopTypeId!=''">
             and gs.shop_type_id=#{query.shopTypeId}
         </if>
-        <if test="query.couponType== 0 ">
+        <if test='query.couponType== "0" '>
             and tcu.shop_id =0
         </if>
-        <if test="query.couponType== 1 ">
+        <if test='query.couponType== "1"'>
             and tcu.shop_id !=0
         </if>
         order by tor.pay_time desc, tor.create_time desc
@@ -232,10 +232,10 @@
         <if test="query.shopTypeId!=null and query.shopTypeId!=''">
             and gs.shop_type_id=#{query.shopTypeId}
         </if>
-        <if test="query.couponType== 0 ">
+        <if test='query.couponType== "0" '>
             and tcu.shop_id =0
         </if>
-        <if test="query.couponType== 1 ">
+        <if test='query.couponType== "1"'>
             and tcu.shop_id !=0
         </if>
         order by tor.pay_time desc, tor.create_time desc
@@ -300,10 +300,10 @@
         <if test="query.shopTypeId!=null and query.shopTypeId!=''">
             and gs.shop_type_id=#{query.shopTypeId}
         </if>
-        <if test="query.couponType== 0 ">
+        <if test='query.couponType== "0" '>
             and tcu.shop_id =0
         </if>
-        <if test="query.couponType== 1 ">
+        <if test='query.couponType== "1"'>
             and tcu.shop_id !=0
         </if>
         order by tor.pay_time desc, tor.create_time desc